Patch to ir-gen user-defined conversions used in expressions
[12.3.2-p3]
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@80436 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CodeGenFunction.cpp b/lib/CodeGen/CodeGenFunction.cpp
index 68ab6df..e3511ed 100644
--- a/lib/CodeGen/CodeGenFunction.cpp
+++ b/lib/CodeGen/CodeGenFunction.cpp
@@ -324,6 +324,17 @@
llvm::BasicBlock *FalseBlock) {
if (const ParenExpr *PE = dyn_cast<ParenExpr>(Cond))
return EmitBranchOnBoolExpr(PE->getSubExpr(), TrueBlock, FalseBlock);
+ if (const CastExpr *E = dyn_cast<CastExpr>(Cond))
+ if (E->getCastKind() == CastExpr::CK_UserDefinedConversion) {
+ if (const CXXFunctionalCastExpr *CXXFExpr =
+ dyn_cast<CXXFunctionalCastExpr>(E)) {
+ EmitCXXFunctionalCastExpr(CXXFExpr);
+ return;
+ }
+ else if (isa<CStyleCastExpr>(E))
+ return EmitBranchOnBoolExpr(E->getSubExpr(), TrueBlock, FalseBlock);
+ assert(false && "EmitBranchOnBoolExpr - Expected CStyleCastExpr");
+ }
if (const BinaryOperator *CondBOp = dyn_cast<BinaryOperator>(Cond)) {
// Handle X && Y in a condition.