mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-06-21 02:24:22 +00:00
Push LLVMContexts through the IntegerType APIs.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@78948 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@ -582,7 +582,7 @@ Function *ArgPromotion::DoPromotion(Function *F,
|
||||
bool ExtraArgHack = false;
|
||||
if (Params.empty() && FTy->isVarArg()) {
|
||||
ExtraArgHack = true;
|
||||
Params.push_back(Type::Int32Ty);
|
||||
Params.push_back(Type::getInt32Ty(F->getContext()));
|
||||
}
|
||||
|
||||
// Construct the new function type using the new arguments.
|
||||
@ -637,9 +637,10 @@ Function *ArgPromotion::DoPromotion(Function *F,
|
||||
// Emit a GEP and load for each element of the struct.
|
||||
const Type *AgTy = cast<PointerType>(I->getType())->getElementType();
|
||||
const StructType *STy = cast<StructType>(AgTy);
|
||||
Value *Idxs[2] = { ConstantInt::get(Type::Int32Ty, 0), 0 };
|
||||
Value *Idxs[2] = {
|
||||
ConstantInt::get(Type::getInt32Ty(F->getContext()), 0), 0 };
|
||||
for (unsigned i = 0, e = STy->getNumElements(); i != e; ++i) {
|
||||
Idxs[1] = ConstantInt::get(Type::Int32Ty, i);
|
||||
Idxs[1] = ConstantInt::get(Type::getInt32Ty(F->getContext()), i);
|
||||
Value *Idx = GetElementPtrInst::Create(*AI, Idxs, Idxs+2,
|
||||
(*AI)->getName()+"."+utostr(i),
|
||||
Call);
|
||||
@ -663,7 +664,9 @@ Function *ArgPromotion::DoPromotion(Function *F,
|
||||
IE = SI->end(); II != IE; ++II) {
|
||||
// Use i32 to index structs, and i64 for others (pointers/arrays).
|
||||
// This satisfies GEP constraints.
|
||||
const Type *IdxTy = (isa<StructType>(ElTy) ? Type::Int32Ty : Type::Int64Ty);
|
||||
const Type *IdxTy = (isa<StructType>(ElTy) ?
|
||||
Type::getInt32Ty(F->getContext()) :
|
||||
Type::getInt64Ty(F->getContext()));
|
||||
Ops.push_back(ConstantInt::get(IdxTy, *II));
|
||||
// Keep track of the type we're currently indexing
|
||||
ElTy = cast<CompositeType>(ElTy)->getTypeAtIndex(*II);
|
||||
@ -680,7 +683,7 @@ Function *ArgPromotion::DoPromotion(Function *F,
|
||||
}
|
||||
|
||||
if (ExtraArgHack)
|
||||
Args.push_back(Constant::getNullValue(Type::Int32Ty));
|
||||
Args.push_back(Constant::getNullValue(Type::getInt32Ty(F->getContext())));
|
||||
|
||||
// Push any varargs arguments on the list
|
||||
for (; AI != CS.arg_end(); ++AI, ++ArgIndex) {
|
||||
@ -757,10 +760,11 @@ Function *ArgPromotion::DoPromotion(Function *F,
|
||||
const Type *AgTy = cast<PointerType>(I->getType())->getElementType();
|
||||
Value *TheAlloca = new AllocaInst(AgTy, 0, "", InsertPt);
|
||||
const StructType *STy = cast<StructType>(AgTy);
|
||||
Value *Idxs[2] = { ConstantInt::get(Type::Int32Ty, 0), 0 };
|
||||
Value *Idxs[2] = {
|
||||
ConstantInt::get(Type::getInt32Ty(F->getContext()), 0), 0 };
|
||||
|
||||
for (unsigned i = 0, e = STy->getNumElements(); i != e; ++i) {
|
||||
Idxs[1] = ConstantInt::get(Type::Int32Ty, i);
|
||||
Idxs[1] = ConstantInt::get(Type::getInt32Ty(F->getContext()), i);
|
||||
Value *Idx =
|
||||
GetElementPtrInst::Create(TheAlloca, Idxs, Idxs+2,
|
||||
TheAlloca->getName()+"."+Twine(i),
|
||||
@ -844,7 +848,8 @@ Function *ArgPromotion::DoPromotion(Function *F,
|
||||
|
||||
// Notify the alias analysis implementation that we inserted a new argument.
|
||||
if (ExtraArgHack)
|
||||
AA.copyValue(Constant::getNullValue(Type::Int32Ty), NF->arg_begin());
|
||||
AA.copyValue(Constant::getNullValue(Type::getInt32Ty(F->getContext())),
|
||||
NF->arg_begin());
|
||||
|
||||
|
||||
// Tell the alias analysis that the old function is about to disappear.
|
||||
|
Reference in New Issue
Block a user