diff options
| -rw-r--r-- | lib/CodeGen/CGExprScalar.cpp | 6 | ||||
| -rw-r--r-- | test/CodeGen/conditional.c | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp index bdd7975fa0..8442b8174e 100644 --- a/lib/CodeGen/CGExprScalar.cpp +++ b/lib/CodeGen/CGExprScalar.cpp @@ -1050,7 +1050,8 @@ VisitConditionalOperator(const ConditionalOperator *E) { // Handle the GNU extension for missing LHS. Value *LHS; if (E->getLHS()) - LHS = Visit(E->getLHS()); + LHS = EmitScalarConversion(Visit(E->getLHS()), E->getLHS()->getType(), + E->getType()); else // Perform promotions, to handle cases like "short ?: int" LHS = EmitScalarConversion(CondVal, E->getCond()->getType(), E->getType()); @@ -1059,7 +1060,8 @@ VisitConditionalOperator(const ConditionalOperator *E) { CGF.EmitBlock(RHSBlock); - Value *RHS = Visit(E->getRHS()); + Value *RHS = EmitScalarConversion(Visit(E->getRHS()), E->getRHS()->getType(), + E->getType()); Builder.CreateBr(ContBlock); RHSBlock = Builder.GetInsertBlock(); diff --git a/test/CodeGen/conditional.c b/test/CodeGen/conditional.c index ae44207115..d3e5c0b938 100644 --- a/test/CodeGen/conditional.c +++ b/test/CodeGen/conditional.c @@ -25,3 +25,8 @@ void test5() { void* vp; cip = 0 ? vp : cip; } + +void test6(); +void test7(int); +void* test8() {return 1 ? test6 : test7;} + |