diff options
| -rw-r--r-- | lib/CodeGen/CGExprConstant.cpp | 4 | ||||
| -rw-r--r-- | test/CodeGenCXX/static-init-2.cpp | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lib/CodeGen/CGExprConstant.cpp b/lib/CodeGen/CGExprConstant.cpp index b80a9416f5..40b845dba0 100644 --- a/lib/CodeGen/CGExprConstant.cpp +++ b/lib/CodeGen/CGExprConstant.cpp @@ -821,9 +821,7 @@ llvm::Constant *CodeGenModule::EmitConstantExpr(const Expr *E, else Success = E->Evaluate(Result, Context); - if (Success) { - assert(!Result.HasSideEffects && - "Constant expr should not have any side effects!"); + if (Success && !Result.HasSideEffects) { switch (Result.Val.getKind()) { case APValue::Uninitialized: assert(0 && "Constant expressions should be initialized."); diff --git a/test/CodeGenCXX/static-init-2.cpp b/test/CodeGenCXX/static-init-2.cpp new file mode 100644 index 0000000000..e229dd4aa7 --- /dev/null +++ b/test/CodeGenCXX/static-init-2.cpp @@ -0,0 +1,6 @@ +// RUN: clang-cc -emit-llvm-only -verify %s + +// Make sure we don't crash generating y; its value is constant, but the +// initializer has side effects, so EmitConstantExpr should fail. +int x(); +int y = x() && 0; |