[llvm-commits] [llvm] r74973 - in /llvm/trunk: include/llvm/Intrinsics.h lib/VMCore/AutoUpgrade.cpp lib/VMCore/BasicBlock.cpp lib/VMCore/Function.cpp
Owen Anderson
resistor at mac.com
Tue Jul 7 16:43:39 PDT 2009
Author: resistor
Date: Tue Jul 7 18:43:39 2009
New Revision: 74973
URL: http://llvm.org/viewvc/llvm-project?rev=74973&view=rev
Log:
LLVMContext-ification.
Modified:
llvm/trunk/include/llvm/Intrinsics.h
llvm/trunk/lib/VMCore/AutoUpgrade.cpp
llvm/trunk/lib/VMCore/BasicBlock.cpp
llvm/trunk/lib/VMCore/Function.cpp
Modified: llvm/trunk/include/llvm/Intrinsics.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Intrinsics.h?rev=74973&r1=74972&r2=74973&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Intrinsics.h (original)
+++ llvm/trunk/include/llvm/Intrinsics.h Tue Jul 7 18:43:39 2009
@@ -23,6 +23,7 @@
class Type;
class FunctionType;
class Function;
+class LLVMContext;
class Module;
class AttrListPtr;
@@ -47,7 +48,8 @@
/// Intrinsic::getType(ID) - Return the function type for an intrinsic.
///
- const FunctionType *getType(ID id, const Type **Tys = 0, unsigned numTys = 0);
+ const FunctionType *getType(LLVMContext &Context, ID id,
+ const Type **Tys = 0, unsigned numTys = 0);
/// Intrinsic::isOverloaded(ID) - Returns true if the intrinsic can be
/// overloaded.
Modified: llvm/trunk/lib/VMCore/AutoUpgrade.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/AutoUpgrade.cpp?rev=74973&r1=74972&r2=74973&view=diff
==============================================================================
--- llvm/trunk/lib/VMCore/AutoUpgrade.cpp (original)
+++ llvm/trunk/lib/VMCore/AutoUpgrade.cpp Tue Jul 7 18:43:39 2009
@@ -14,6 +14,7 @@
#include "llvm/AutoUpgrade.h"
#include "llvm/Constants.h"
#include "llvm/Function.h"
+#include "llvm/LLVMContext.h"
#include "llvm/Module.h"
#include "llvm/Instructions.h"
#include "llvm/Intrinsics.h"
@@ -25,6 +26,8 @@
static bool UpgradeIntrinsicFunction1(Function *F, Function *&NewFn) {
assert(F && "Illegal to upgrade a non-existent Function.");
+ LLVMContext* Context = F->getContext();
+
// Get the Function's name.
const std::string& Name = F->getName();
@@ -162,7 +165,8 @@
Name.compare(13,4,"psra", 4) == 0 ||
Name.compare(13,4,"psrl", 4) == 0) && Name[17] != 'i') {
- const llvm::Type *VT = VectorType::get(IntegerType::get(64), 1);
+ const llvm::Type *VT =
+ Context->getVectorType(Context->getIntegerType(64), 1);
// We don't have to do anything if the parameter already has
// the correct type.
@@ -227,6 +231,8 @@
// order to seamlessly integrate with existing context.
void llvm::UpgradeIntrinsicCall(CallInst *CI, Function *NewFn) {
Function *F = CI->getCalledFunction();
+ LLVMContext* Context = F->getContext();
+
assert(F && "CallInst has no function associated with it.");
if (!NewFn) {
@@ -259,59 +265,60 @@
Value *Op0 = CI->getOperand(1);
ShuffleVectorInst *SI = NULL;
if (isLoadH || isLoadL) {
- Value *Op1 = UndefValue::get(Op0->getType());
+ Value *Op1 = Context->getUndef(Op0->getType());
Value *Addr = new BitCastInst(CI->getOperand(2),
- PointerType::getUnqual(Type::DoubleTy),
+ Context->getPointerTypeUnqual(Type::DoubleTy),
"upgraded.", CI);
Value *Load = new LoadInst(Addr, "upgraded.", false, 8, CI);
- Value *Idx = ConstantInt::get(Type::Int32Ty, 0);
+ Value *Idx = Context->getConstantInt(Type::Int32Ty, 0);
Op1 = InsertElementInst::Create(Op1, Load, Idx, "upgraded.", CI);
if (isLoadH) {
- Idxs.push_back(ConstantInt::get(Type::Int32Ty, 0));
- Idxs.push_back(ConstantInt::get(Type::Int32Ty, 2));
+ Idxs.push_back(Context->getConstantInt(Type::Int32Ty, 0));
+ Idxs.push_back(Context->getConstantInt(Type::Int32Ty, 2));
} else {
- Idxs.push_back(ConstantInt::get(Type::Int32Ty, 2));
- Idxs.push_back(ConstantInt::get(Type::Int32Ty, 1));
+ Idxs.push_back(Context->getConstantInt(Type::Int32Ty, 2));
+ Idxs.push_back(Context->getConstantInt(Type::Int32Ty, 1));
}
- Value *Mask = ConstantVector::get(Idxs);
+ Value *Mask = Context->getConstantVector(Idxs);
SI = new ShuffleVectorInst(Op0, Op1, Mask, "upgraded.", CI);
} else if (isMovL) {
- Constant *Zero = ConstantInt::get(Type::Int32Ty, 0);
+ Constant *Zero = Context->getConstantInt(Type::Int32Ty, 0);
Idxs.push_back(Zero);
Idxs.push_back(Zero);
Idxs.push_back(Zero);
Idxs.push_back(Zero);
- Value *ZeroV = ConstantVector::get(Idxs);
+ Value *ZeroV = Context->getConstantVector(Idxs);
Idxs.clear();
- Idxs.push_back(ConstantInt::get(Type::Int32Ty, 4));
- Idxs.push_back(ConstantInt::get(Type::Int32Ty, 5));
- Idxs.push_back(ConstantInt::get(Type::Int32Ty, 2));
- Idxs.push_back(ConstantInt::get(Type::Int32Ty, 3));
- Value *Mask = ConstantVector::get(Idxs);
+ Idxs.push_back(Context->getConstantInt(Type::Int32Ty, 4));
+ Idxs.push_back(Context->getConstantInt(Type::Int32Ty, 5));
+ Idxs.push_back(Context->getConstantInt(Type::Int32Ty, 2));
+ Idxs.push_back(Context->getConstantInt(Type::Int32Ty, 3));
+ Value *Mask = Context->getConstantVector(Idxs);
SI = new ShuffleVectorInst(ZeroV, Op0, Mask, "upgraded.", CI);
} else if (isMovSD ||
isUnpckhPD || isUnpcklPD || isPunpckhQPD || isPunpcklQPD) {
Value *Op1 = CI->getOperand(2);
if (isMovSD) {
- Idxs.push_back(ConstantInt::get(Type::Int32Ty, 2));
- Idxs.push_back(ConstantInt::get(Type::Int32Ty, 1));
+ Idxs.push_back(Context->getConstantInt(Type::Int32Ty, 2));
+ Idxs.push_back(Context->getConstantInt(Type::Int32Ty, 1));
} else if (isUnpckhPD || isPunpckhQPD) {
- Idxs.push_back(ConstantInt::get(Type::Int32Ty, 1));
- Idxs.push_back(ConstantInt::get(Type::Int32Ty, 3));
+ Idxs.push_back(Context->getConstantInt(Type::Int32Ty, 1));
+ Idxs.push_back(Context->getConstantInt(Type::Int32Ty, 3));
} else {
- Idxs.push_back(ConstantInt::get(Type::Int32Ty, 0));
- Idxs.push_back(ConstantInt::get(Type::Int32Ty, 2));
+ Idxs.push_back(Context->getConstantInt(Type::Int32Ty, 0));
+ Idxs.push_back(Context->getConstantInt(Type::Int32Ty, 2));
}
- Value *Mask = ConstantVector::get(Idxs);
+ Value *Mask = Context->getConstantVector(Idxs);
SI = new ShuffleVectorInst(Op0, Op1, Mask, "upgraded.", CI);
} else if (isShufPD) {
Value *Op1 = CI->getOperand(2);
unsigned MaskVal = cast<ConstantInt>(CI->getOperand(3))->getZExtValue();
- Idxs.push_back(ConstantInt::get(Type::Int32Ty, MaskVal & 1));
- Idxs.push_back(ConstantInt::get(Type::Int32Ty, ((MaskVal >> 1) & 1)+2));
- Value *Mask = ConstantVector::get(Idxs);
+ Idxs.push_back(Context->getConstantInt(Type::Int32Ty, MaskVal & 1));
+ Idxs.push_back(Context->getConstantInt(Type::Int32Ty,
+ ((MaskVal >> 1) & 1)+2));
+ Value *Mask = Context->getConstantVector(Idxs);
SI = new ShuffleVectorInst(Op0, Op1, Mask, "upgraded.", CI);
}
Modified: llvm/trunk/lib/VMCore/BasicBlock.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/BasicBlock.cpp?rev=74973&r1=74972&r2=74973&view=diff
==============================================================================
--- llvm/trunk/lib/VMCore/BasicBlock.cpp (original)
+++ llvm/trunk/lib/VMCore/BasicBlock.cpp Tue Jul 7 18:43:39 2009
@@ -14,6 +14,7 @@
#include "llvm/BasicBlock.h"
#include "llvm/Constants.h"
#include "llvm/Instructions.h"
+#include "llvm/LLVMContext.h"
#include "llvm/Type.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/Support/CFG.h"
@@ -202,7 +203,7 @@
PN->replaceAllUsesWith(PN->getOperand(0));
else
// We are left with an infinite loop with no entries: kill the PHI.
- PN->replaceAllUsesWith(UndefValue::get(PN->getType()));
+ PN->replaceAllUsesWith(getContext()->getUndef(PN->getType()));
getInstList().pop_front(); // Remove the PHI node
}
Modified: llvm/trunk/lib/VMCore/Function.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Function.cpp?rev=74973&r1=74972&r2=74973&view=diff
==============================================================================
--- llvm/trunk/lib/VMCore/Function.cpp (original)
+++ llvm/trunk/lib/VMCore/Function.cpp Tue Jul 7 18:43:39 2009
@@ -14,6 +14,7 @@
#include "llvm/Module.h"
#include "llvm/DerivedTypes.h"
#include "llvm/IntrinsicInst.h"
+#include "llvm/LLVMContext.h"
#include "llvm/CodeGen/ValueTypes.h"
#include "llvm/Support/LeakDetector.h"
#include "llvm/Support/ManagedStatic.h"
@@ -336,7 +337,8 @@
return Result;
}
-const FunctionType *Intrinsic::getType(ID id, const Type **Tys,
+const FunctionType *Intrinsic::getType(LLVMContext &Context,
+ ID id, const Type **Tys,
unsigned numTys) {
const Type *ResultTy = NULL;
std::vector<const Type*> ArgTys;
@@ -346,7 +348,7 @@
#include "llvm/Intrinsics.gen"
#undef GET_INTRINSIC_GENERATOR
- return FunctionType::get(ResultTy, ArgTys, IsVarArg);
+ return Context.getFunctionType(ResultTy, ArgTys, IsVarArg);
}
bool Intrinsic::isOverloaded(ID id) {
@@ -370,7 +372,8 @@
// because intrinsics must be a specific type.
return
cast<Function>(M->getOrInsertFunction(getName(id, Tys, numTys),
- getType(id, Tys, numTys)));
+ getType(M->getContext(),
+ id, Tys, numTys)));
}
// This defines the "Intrinsic::getIntrinsicForGCCBuiltin()" method.
More information about the llvm-commits
mailing list