summaryrefslogtreecommitdiffstats
path: root/clang/lib/StaticAnalyzer/Core/SValBuilder.cpp
diff options
context:
space:
mode:
authorHans Wennborg <hans@hanshq.net>2018-11-28 14:04:12 +0000
committerHans Wennborg <hans@hanshq.net>2018-11-28 14:04:12 +0000
commit48ee4ad3251d3e9998811e4a7bf85bf522b0e0d6 (patch)
tree9edab9060fcf90ca80bad874af9694abf7742bf8 /clang/lib/StaticAnalyzer/Core/SValBuilder.cpp
parent1208240ac9d5eb00f7d6fe26d134081d5283e52c (diff)
downloadbcm5719-llvm-48ee4ad3251d3e9998811e4a7bf85bf522b0e0d6.tar.gz
bcm5719-llvm-48ee4ad3251d3e9998811e4a7bf85bf522b0e0d6.zip
Re-commit r347417 "Re-Reinstate 347294 with a fix for the failures."
This was reverted in r347656 due to me thinking it caused a miscompile of Chromium. Turns out it was the Chromium code that was broken. llvm-svn: 347756
Diffstat (limited to 'clang/lib/StaticAnalyzer/Core/SValBuilder.cpp')
-rw-r--r--clang/lib/StaticAnalyzer/Core/SValBuilder.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/StaticAnalyzer/Core/SValBuilder.cpp b/clang/lib/StaticAnalyzer/Core/SValBuilder.cpp
index ef3d5b76659..8c39b798946 100644
--- a/clang/lib/StaticAnalyzer/Core/SValBuilder.cpp
+++ b/clang/lib/StaticAnalyzer/Core/SValBuilder.cpp
@@ -362,9 +362,9 @@ Optional<SVal> SValBuilder::getConstantVal(const Expr *E) {
return None;
ASTContext &Ctx = getContext();
- llvm::APSInt Result;
+ Expr::EvalResult Result;
if (E->EvaluateAsInt(Result, Ctx))
- return makeIntVal(Result);
+ return makeIntVal(Result.Val.getInt());
if (Loc::isLocType(E->getType()))
if (E->isNullPointerConstant(Ctx, Expr::NPC_ValueDependentIsNotNull))
OpenPOWER on IntegriCloud