aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Analysis/ValueState.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/Analysis/ValueState.cpp b/Analysis/ValueState.cpp
index 7cd89fdd7e..3cbcd88d25 100644
--- a/Analysis/ValueState.cpp
+++ b/Analysis/ValueState.cpp
@@ -236,7 +236,15 @@ RVal ValueStateManager::GetRVal(ValueState St, Expr* E, bool* hasVal) {
// already has persistent storage? We do this because we
// are comparing states using pointer equality. Perhaps there is
// a better way, since APInts are fairly lightweight.
- return nonlval::ConcreteInt(ValMgr.getValue(ED->getInitVal()));
+ llvm::APSInt X = ED->getInitVal();
+
+ // FIXME: This is a hack. The APSInt inside the EnumConstantDecl
+ // might not match the signedness of the DeclRefExpr. We hack
+ // a workaround here. Should be fixed elsewhere.
+ if (E->getType()->isUnsignedIntegerType() != X.isUnsigned())
+ X.setIsUnsigned(!X.isUnsigned());
+
+ return nonlval::ConcreteInt(ValMgr.getValue(X));
}
else if (FunctionDecl* FD = dyn_cast<FunctionDecl>(D))
return lval::FuncVal(FD);