diff options
| author | Bill Wendling <isanbard@gmail.com> | 2018-11-20 23:24:16 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2018-11-20 23:24:16 +0000 |
| commit | 91549ed15f97f21de8770196e66da3d228820cdc (patch) | |
| tree | a4a3c5ffe121d9c0fdcce151e96eba612d3c7ded /clang/lib/CodeGen/CodeGenFunction.cpp | |
| parent | 8eb65cb25e67a2b426b94152f9c9bb3c1025b701 (diff) | |
| download | bcm5719-llvm-91549ed15f97f21de8770196e66da3d228820cdc.tar.gz bcm5719-llvm-91549ed15f97f21de8770196e66da3d228820cdc.zip | |
Reinstate 347294 with a fix for the failures.
EvaluateAsInt() is sometimes called in a constant context. When that's the
case, we need to specify it as so.
llvm-svn: 347364
Diffstat (limited to 'clang/lib/CodeGen/CodeGenFunction.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CodeGenFunction.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/CodeGenFunction.cpp b/clang/lib/CodeGen/CodeGenFunction.cpp index 7250bbc64d1..600640f78c1 100644 --- a/clang/lib/CodeGen/CodeGenFunction.cpp +++ b/clang/lib/CodeGen/CodeGenFunction.cpp @@ -1513,10 +1513,11 @@ bool CodeGenFunction::ConstantFoldsToSimpleInteger(const Expr *Cond, bool AllowLabels) { // FIXME: Rename and handle conversion of other evaluatable things // to bool. - llvm::APSInt Int; - if (!Cond->EvaluateAsInt(Int, getContext())) + Expr::EvalResult Result; + if (!Cond->EvaluateAsInt(Result, getContext())) return false; // Not foldable, not integer or not fully evaluatable. + llvm::APSInt Int = Result.Val.getInt(); if (!AllowLabels && CodeGenFunction::ContainsLabel(Cond)) return false; // Contains a label. |
