diff options
| -rw-r--r-- | lib/CodeGen/CGExprScalar.cpp | 5 | ||||
| -rw-r--r-- | test/CodeGen/conditional.c | 21 |
2 files changed, 22 insertions, 4 deletions
diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp index 556dbf54ec..d4463c17a3 100644 --- a/lib/CodeGen/CGExprScalar.cpp +++ b/lib/CodeGen/CGExprScalar.cpp @@ -2401,9 +2401,8 @@ static bool isCheapEnoughToEvaluateUnconditionally(const Expr *E, CodeGenFunction &CGF) { E = E->IgnoreParens(); - // TODO: Allow anything we can constant fold to an integer or fp constant. - if (isa<IntegerLiteral>(E) || isa<CharacterLiteral>(E) || - isa<FloatingLiteral>(E)) + // Anything that is an integer or floating point constant is fine. + if (E->isConstantInitializer(CGF.getContext(), false)) return true; // Non-volatile automatic variables too, to get "cond ? X : Y" where diff --git a/test/CodeGen/conditional.c b/test/CodeGen/conditional.c index d079aafd78..15e15f11e3 100644 --- a/test/CodeGen/conditional.c +++ b/test/CodeGen/conditional.c @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -emit-llvm %s -o %t +// RUN: %clang_cc1 -emit-llvm %s -o - | FileCheck %s float test1(int cond, float a, float b) { return cond ? a : b; @@ -47,3 +47,22 @@ void test9(struct test9 *p) { p ? p : test9spare(); } +// CHECK: @test10 +// CHECK: select i1 {{.*}}, i32 4, i32 5 +int test10(int c) { + return c ? 4 : 5; +} +enum { Gronk = 5 }; + +// rdar://9289603 +// CHECK: @test11 +// CHECK: select i1 {{.*}}, i32 4, i32 5 +int test11(int c) { + return c ? 4 : Gronk; +} + +// CHECK: @test12 +// CHECK: select i1 {{.*}}, double 4.0{{.*}}, double 2.0 +double test12(int c) { + return c ? 4.0 : 2.0; +} |