diff options
| -rw-r--r-- | lib/CodeGen/CGExprScalar.cpp | 5 | ||||
| -rw-r--r-- | test/CodeGen/conditional.c | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp index 3fc5c7b015..d556cdfd46 100644 --- a/lib/CodeGen/CGExprScalar.cpp +++ b/lib/CodeGen/CGExprScalar.cpp @@ -2566,6 +2566,11 @@ VisitAbstractConditionalOperator(const AbstractConditionalOperator *E) { llvm::Value *CondV = CGF.EvaluateExprAsBool(condExpr); llvm::Value *LHS = Visit(lhsExpr); llvm::Value *RHS = Visit(rhsExpr); + if (!LHS) { + // If the conditional has void type, make sure we return a null Value*. + assert(!RHS && "LHS and RHS types must match"); + return 0; + } return Builder.CreateSelect(CondV, LHS, RHS, "cond"); } diff --git a/test/CodeGen/conditional.c b/test/CodeGen/conditional.c index 15e15f11e3..88538a2042 100644 --- a/test/CodeGen/conditional.c +++ b/test/CodeGen/conditional.c @@ -66,3 +66,9 @@ int test11(int c) { double test12(int c) { return c ? 4.0 : 2.0; } +// CHECK: @test13 +// CHECK: call {{.*}} @f2( +int f2(void); +void test13() { + f2() ? (void)0 : (void)0; +} |