replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Handle constant int -> ptr casts of lvalue results. 

- PR3463 (again).

llvm-svn: 65133
This commit is contained in:
Daniel Dunbar 2009-02-20 18:22:23 +00:00
parent f5b77513b0
commit ce39954d5d
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
clang/lib/AST/ExprConstant.cpp
View File

@ -54,6 +54,7 @@ struct EvalInfo {
static bool EvaluateLValue(const Expr *E, APValue &Result, EvalInfo &Info); static bool EvaluateLValue(const Expr *E, APValue &Result, EvalInfo &Info);
static bool EvaluatePointer(const Expr *E, APValue &Result, EvalInfo &Info); static bool EvaluatePointer(const Expr *E, APValue &Result, EvalInfo &Info);
static bool EvaluateInteger(const Expr *E, APSInt &Result, EvalInfo &Info); static bool EvaluateInteger(const Expr *E, APSInt &Result, EvalInfo &Info);
static bool EvaluateIntegerOrLValue(const Expr *E, APValue &Result, EvalInfo &Info);
static bool EvaluateFloat(const Expr *E, APFloat &Result, EvalInfo &Info); static bool EvaluateFloat(const Expr *E, APFloat &Result, EvalInfo &Info);
static bool EvaluateComplex(const Expr *E, APValue &Result, EvalInfo &Info); static bool EvaluateComplex(const Expr *E, APValue &Result, EvalInfo &Info);
@ -351,11 +352,17 @@ APValue PointerExprEvaluator::VisitCastExpr(const CastExpr* E) {
} }
if (SubExpr->getType()->isIntegralType()) { if (SubExpr->getType()->isIntegralType()) {
llvm::APSInt Result(32); APValue Result;
if (EvaluateInteger(SubExpr, Result, Info)) { if (!EvaluateIntegerOrLValue(SubExpr, Result, Info))
Result.extOrTrunc((unsigned)Info.Ctx.getTypeSize(E->getType())); return APValue();
return APValue(0, Result.getZExtValue());
if (Result.isInt()) {
Result.getInt().extOrTrunc((unsigned)Info.Ctx.getTypeSize(E->getType()));
return APValue(0, Result.getInt().getZExtValue());
} }
// Cast is of an lvalue, no need to change value.
return Result;
} }
if (SubExpr->getType()->isFunctionType() || if (SubExpr->getType()->isFunctionType() ||
@ -587,15 +594,17 @@ private:
}; };
} // end anonymous namespace } // end anonymous namespace
static bool EvaluateInteger(const Expr* E, APSInt &Result, EvalInfo &Info) { static bool EvaluateIntegerOrLValue(const Expr* E, APValue &Result, EvalInfo &Info) {
if (!E->getType()->isIntegralType()) if (!E->getType()->isIntegralType())
return false; return false;
APValue Val; return IntExprEvaluator(Info, Result).Visit(const_cast<Expr*>(E));
if (!IntExprEvaluator(Info, Val).Visit(const_cast<Expr*>(E)) || }
!Val.isInt())
return false;
static bool EvaluateInteger(const Expr* E, APSInt &Result, EvalInfo &Info) {
APValue Val;
if (!EvaluateIntegerOrLValue(E, Val, Info) || !Val.isInt())
return false;
Result = Val.getInt(); Result = Val.getInt();
return true; return true;
} }

3
clang/test/CodeGen/const-init.c
View File

@ -76,4 +76,7 @@ int g15 = (int) (char) ((void*) 0 + 255);
// RUN: grep '@g16 = global i64 4294967295' %t && // RUN: grep '@g16 = global i64 4294967295' %t &&
long long g16 = (long long) ((void*) 0xFFFFFFFF); long long g16 = (long long) ((void*) 0xFFFFFFFF);
// RUN: grep '@g17 = global i32\* @g15' %t &&
int *g17 = (int *) ((long) &g15);
// RUN: true // RUN: true