maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Remove IRgen constant emission assumption that LValue APValue results 

only occur for pointer types; they are also possible for integer types
now.
 - No intended functionality change, IntExprEvaluate doesn't return
   LValue results yet.

llvm-svn: 65066
This commit is contained in:
Daniel Dunbar 2009-02-19 21:44:24 +00:00
parent df78dcc0b2
commit 18e1444f82
1 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
clang/lib/CodeGen/CGExprConstant.cpp
View File

@ -637,28 +637,44 @@ llvm::Constant *CodeGenModule::EmitConstantExpr(const Expr *E,
assert(0 && "Constant expressions should be initialized."); assert(0 && "Constant expressions should be initialized.");
return 0; return 0;
case APValue::LValue: { case APValue::LValue: {
const llvm::Type *DestType = getTypes().ConvertTypeForMem(E->getType());
llvm::Constant *Offset = llvm::Constant *Offset =
llvm::ConstantInt::get(llvm::Type::Int64Ty, llvm::ConstantInt::get(llvm::Type::Int64Ty,
Result.Val.getLValueOffset()); Result.Val.getLValueOffset());
llvm::Constant *C;
if (const Expr *LVBase = Result.Val.getLValueBase()) { if (const Expr *LVBase = Result.Val.getLValueBase()) {
llvm::Constant *C = C = ConstExprEmitter(*this, CGF).EmitLValue(const_cast<Expr*>(LVBase));
ConstExprEmitter(*this, CGF).EmitLValue(const_cast<Expr*>(LVBase));
// Apply offset if necessary.
if (!Offset->isNullValue()) {
const llvm::Type *Type = const llvm::Type *Type =
llvm::PointerType::getUnqual(llvm::Type::Int8Ty); llvm::PointerType::getUnqual(llvm::Type::Int8Ty);
const llvm::Type *DestType = getTypes().ConvertTypeForMem(E->getType()); llvm::Constant *Casted = llvm::ConstantExpr::getBitCast(C, Type);
Casted = llvm::ConstantExpr::getGetElementPtr(Casted, &Offset, 1);
// FIXME: It's a little ugly that we need to cast to a pointer, C = llvm::ConstantExpr::getBitCast(Casted, C->getType());
// apply the GEP and then cast back.
C = llvm::ConstantExpr::getBitCast(C, Type);
C = llvm::ConstantExpr::getGetElementPtr(C, &Offset, 1);
return llvm::ConstantExpr::getBitCast(C, DestType);
} }
return llvm::ConstantExpr::getIntToPtr(Offset, // Convert to the appropriate type; this could be an lvalue for
getTypes().ConvertType(E->getType())); // an integer.
if (isa<llvm::PointerType>(DestType))
return llvm::ConstantExpr::getBitCast(C, DestType);
return llvm::ConstantExpr::getPtrToInt(C, DestType);
} else {
C = Offset;
// Convert to the appropriate type; this could be an lvalue for
// an integer.
if (isa<llvm::PointerType>(DestType))
return llvm::ConstantExpr::getIntToPtr(C, DestType);
// If the types don't match this should only be a truncate.
if (C->getType() != DestType)
return llvm::ConstantExpr::getTrunc(C, DestType);
return C;
}
} }
case APValue::Int: { case APValue::Int: {
llvm::Constant *C = llvm::ConstantInt::get(Result.Val.getInt()); llvm::Constant *C = llvm::ConstantInt::get(Result.Val.getInt());