[llvm-commits] [llvm] r75213 - in /llvm/trunk/include/llvm: Analysis/ScalarEvolutionExpander.h Support/ConstantFolder.h Support/IRBuilder.h Support/TargetFolder.h
Owen Anderson
resistor at mac.com
Thu Jul 9 17:49:54 PDT 2009
Author: resistor
Date: Thu Jul 9 19:49:53 2009
New Revision: 75213
URL: http://llvm.org/viewvc/llvm-project?rev=75213&view=rev
Log:
Finish pushing LLVMContext through the IRBuilder/ConstantFolder interface.
Modified:
llvm/trunk/include/llvm/Analysis/ScalarEvolutionExpander.h
llvm/trunk/include/llvm/Support/ConstantFolder.h
llvm/trunk/include/llvm/Support/IRBuilder.h
llvm/trunk/include/llvm/Support/TargetFolder.h
Modified: llvm/trunk/include/llvm/Analysis/ScalarEvolutionExpander.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/ScalarEvolutionExpander.h?rev=75213&r1=75212&r2=75213&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Analysis/ScalarEvolutionExpander.h (original)
+++ llvm/trunk/include/llvm/Analysis/ScalarEvolutionExpander.h Thu Jul 9 19:49:53 2009
@@ -38,7 +38,7 @@
public:
explicit SCEVExpander(ScalarEvolution &se)
: SE(se), Builder(*se.getContext(),
- TargetFolder(se.TD, se.getContext())) {}
+ TargetFolder(se.TD, *se.getContext())) {}
/// clear - Erase the contents of the InsertedExpressions map so that users
/// trying to expand the same expression into multiple BasicBlocks or
Modified: llvm/trunk/include/llvm/Support/ConstantFolder.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/ConstantFolder.h?rev=75213&r1=75212&r2=75213&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/ConstantFolder.h (original)
+++ llvm/trunk/include/llvm/Support/ConstantFolder.h Thu Jul 9 19:49:53 2009
@@ -18,75 +18,79 @@
#define LLVM_SUPPORT_CONSTANTFOLDER_H
#include "llvm/Constants.h"
+#include "llvm/LLVMContext.h"
namespace llvm {
-
+
/// ConstantFolder - Create constants with minimum, target independent, folding.
class ConstantFolder {
+ LLVMContext &Context;
+
public:
+ ConstantFolder(LLVMContext &C) : Context(C) { }
//===--------------------------------------------------------------------===//
// Binary Operators
//===--------------------------------------------------------------------===//
Constant *CreateAdd(Constant *LHS, Constant *RHS) const {
- return ConstantExpr::getAdd(LHS, RHS);
+ return Context.getConstantExprAdd(LHS, RHS);
}
Constant *CreateFAdd(Constant *LHS, Constant *RHS) const {
- return ConstantExpr::getFAdd(LHS, RHS);
+ return Context.getConstantExprFAdd(LHS, RHS);
}
Constant *CreateSub(Constant *LHS, Constant *RHS) const {
- return ConstantExpr::getSub(LHS, RHS);
+ return Context.getConstantExprSub(LHS, RHS);
}
Constant *CreateFSub(Constant *LHS, Constant *RHS) const {
- return ConstantExpr::getFSub(LHS, RHS);
+ return Context.getConstantExprFSub(LHS, RHS);
}
Constant *CreateMul(Constant *LHS, Constant *RHS) const {
- return ConstantExpr::getMul(LHS, RHS);
+ return Context.getConstantExprMul(LHS, RHS);
}
Constant *CreateFMul(Constant *LHS, Constant *RHS) const {
- return ConstantExpr::getFMul(LHS, RHS);
+ return Context.getConstantExprFMul(LHS, RHS);
}
Constant *CreateUDiv(Constant *LHS, Constant *RHS) const {
- return ConstantExpr::getUDiv(LHS, RHS);
+ return Context.getConstantExprUDiv(LHS, RHS);
}
Constant *CreateSDiv(Constant *LHS, Constant *RHS) const {
- return ConstantExpr::getSDiv(LHS, RHS);
+ return Context.getConstantExprSDiv(LHS, RHS);
}
Constant *CreateFDiv(Constant *LHS, Constant *RHS) const {
- return ConstantExpr::getFDiv(LHS, RHS);
+ return Context.getConstantExprFDiv(LHS, RHS);
}
Constant *CreateURem(Constant *LHS, Constant *RHS) const {
- return ConstantExpr::getURem(LHS, RHS);
+ return Context.getConstantExprURem(LHS, RHS);
}
Constant *CreateSRem(Constant *LHS, Constant *RHS) const {
- return ConstantExpr::getSRem(LHS, RHS);
+ return Context.getConstantExprSRem(LHS, RHS);
}
Constant *CreateFRem(Constant *LHS, Constant *RHS) const {
- return ConstantExpr::getFRem(LHS, RHS);
+ return Context.getConstantExprFRem(LHS, RHS);
}
Constant *CreateShl(Constant *LHS, Constant *RHS) const {
- return ConstantExpr::getShl(LHS, RHS);
+ return Context.getConstantExprShl(LHS, RHS);
}
Constant *CreateLShr(Constant *LHS, Constant *RHS) const {
- return ConstantExpr::getLShr(LHS, RHS);
+ return Context.getConstantExprLShr(LHS, RHS);
}
Constant *CreateAShr(Constant *LHS, Constant *RHS) const {
- return ConstantExpr::getAShr(LHS, RHS);
+ return Context.getConstantExprAShr(LHS, RHS);
}
Constant *CreateAnd(Constant *LHS, Constant *RHS) const {
- return ConstantExpr::getAnd(LHS, RHS);
+ return Context.getConstantExprAnd(LHS, RHS);
}
Constant *CreateOr(Constant *LHS, Constant *RHS) const {
- return ConstantExpr::getOr(LHS, RHS);
+ return Context.getConstantExprOr(LHS, RHS);
}
Constant *CreateXor(Constant *LHS, Constant *RHS) const {
- return ConstantExpr::getXor(LHS, RHS);
+ return Context.getConstantExprXor(LHS, RHS);
}
Constant *CreateBinOp(Instruction::BinaryOps Opc,
Constant *LHS, Constant *RHS) const {
- return ConstantExpr::get(Opc, LHS, RHS);
+ return Context.getConstantExpr(Opc, LHS, RHS);
}
//===--------------------------------------------------------------------===//
@@ -94,13 +98,13 @@
//===--------------------------------------------------------------------===//
Constant *CreateNeg(Constant *C) const {
- return ConstantExpr::getNeg(C);
+ return Context.getConstantExprNeg(C);
}
Constant *CreateFNeg(Constant *C) const {
- return ConstantExpr::getFNeg(C);
+ return Context.getConstantExprFNeg(C);
}
Constant *CreateNot(Constant *C) const {
- return ConstantExpr::getNot(C);
+ return Context.getConstantExprNot(C);
}
//===--------------------------------------------------------------------===//
@@ -109,11 +113,11 @@
Constant *CreateGetElementPtr(Constant *C, Constant* const *IdxList,
unsigned NumIdx) const {
- return ConstantExpr::getGetElementPtr(C, IdxList, NumIdx);
+ return Context.getConstantExprGetElementPtr(C, IdxList, NumIdx);
}
Constant *CreateGetElementPtr(Constant *C, Value* const *IdxList,
unsigned NumIdx) const {
- return ConstantExpr::getGetElementPtr(C, IdxList, NumIdx);
+ return Context.getConstantExprGetElementPtr(C, IdxList, NumIdx);
}
//===--------------------------------------------------------------------===//
@@ -122,11 +126,11 @@
Constant *CreateCast(Instruction::CastOps Op, Constant *C,
const Type *DestTy) const {
- return ConstantExpr::getCast(Op, C, DestTy);
+ return Context.getConstantExprCast(Op, C, DestTy);
}
Constant *CreateIntCast(Constant *C, const Type *DestTy,
bool isSigned) const {
- return ConstantExpr::getIntegerCast(C, DestTy, isSigned);
+ return Context.getConstantExprIntegerCast(C, DestTy, isSigned);
}
Constant *CreateBitCast(Constant *C, const Type *DestTy) const {
@@ -139,7 +143,7 @@
return CreateCast(Instruction::PtrToInt, C, DestTy);
}
Constant *CreateTruncOrBitCast(Constant *C, const Type *DestTy) const {
- return ConstantExpr::getTruncOrBitCast(C, DestTy);
+ return Context.getConstantExprTruncOrBitCast(C, DestTy);
}
//===--------------------------------------------------------------------===//
@@ -148,11 +152,11 @@
Constant *CreateICmp(CmpInst::Predicate P, Constant *LHS,
Constant *RHS) const {
- return ConstantExpr::getCompare(P, LHS, RHS);
+ return Context.getConstantExprCompare(P, LHS, RHS);
}
Constant *CreateFCmp(CmpInst::Predicate P, Constant *LHS,
Constant *RHS) const {
- return ConstantExpr::getCompare(P, LHS, RHS);
+ return Context.getConstantExprCompare(P, LHS, RHS);
}
//===--------------------------------------------------------------------===//
@@ -160,31 +164,31 @@
//===--------------------------------------------------------------------===//
Constant *CreateSelect(Constant *C, Constant *True, Constant *False) const {
- return ConstantExpr::getSelect(C, True, False);
+ return Context.getConstantExprSelect(C, True, False);
}
Constant *CreateExtractElement(Constant *Vec, Constant *Idx) const {
- return ConstantExpr::getExtractElement(Vec, Idx);
+ return Context.getConstantExprExtractElement(Vec, Idx);
}
Constant *CreateInsertElement(Constant *Vec, Constant *NewElt,
Constant *Idx) const {
- return ConstantExpr::getInsertElement(Vec, NewElt, Idx);
+ return Context.getConstantExprInsertElement(Vec, NewElt, Idx);
}
Constant *CreateShuffleVector(Constant *V1, Constant *V2,
Constant *Mask) const {
- return ConstantExpr::getShuffleVector(V1, V2, Mask);
+ return Context.getConstantExprShuffleVector(V1, V2, Mask);
}
Constant *CreateExtractValue(Constant *Agg, const unsigned *IdxList,
unsigned NumIdx) const {
- return ConstantExpr::getExtractValue(Agg, IdxList, NumIdx);
+ return Context.getConstantExprExtractValue(Agg, IdxList, NumIdx);
}
Constant *CreateInsertValue(Constant *Agg, Constant *Val,
const unsigned *IdxList, unsigned NumIdx) const {
- return ConstantExpr::getInsertValue(Agg, Val, IdxList, NumIdx);
+ return Context.getConstantExprInsertValue(Agg, Val, IdxList, NumIdx);
}
};
Modified: llvm/trunk/include/llvm/Support/IRBuilder.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/IRBuilder.h?rev=75213&r1=75212&r2=75213&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/IRBuilder.h (original)
+++ llvm/trunk/include/llvm/Support/IRBuilder.h Thu Jul 9 19:49:53 2009
@@ -42,19 +42,31 @@
template <bool preserveNames=true, typename T = ConstantFolder> class IRBuilder{
BasicBlock *BB;
BasicBlock::iterator InsertPt;
- T Folder;
LLVMContext &Context;
+ T Folder;
public:
- IRBuilder(LLVMContext &C, const T& F = T()) :
- Folder(F), Context(C) { ClearInsertionPoint(); }
+ IRBuilder(LLVMContext &C, const T& F) :
+ Context(C), Folder(F) { ClearInsertionPoint(); }
+
+ IRBuilder(LLVMContext &C) : Context(C), Folder(C) { ClearInsertionPoint(); }
- explicit IRBuilder(BasicBlock *TheBB, const T& F = T())
- : Folder(F), Context(*TheBB->getParent()->getContext()) {
+ explicit IRBuilder(BasicBlock *TheBB, const T& F)
+ : Context(*TheBB->getParent()->getContext()), Folder(F) {
SetInsertPoint(TheBB);
}
- IRBuilder(BasicBlock *TheBB, BasicBlock::iterator IP, const T& F = T())
- : Folder(F), Context(*TheBB->getParent()->getContext()) {
+ explicit IRBuilder(BasicBlock *TheBB)
+ : Context(*TheBB->getParent()->getContext()), Folder(Context) {
+ SetInsertPoint(TheBB);
+ }
+
+ IRBuilder(BasicBlock *TheBB, BasicBlock::iterator IP, const T& F)
+ : Context(*TheBB->getParent()->getContext()), Folder(F) {
+ SetInsertPoint(TheBB, IP);
+ }
+
+ IRBuilder(BasicBlock *TheBB, BasicBlock::iterator IP)
+ : Context(*TheBB->getParent()->getContext()), Folder(Context) {
SetInsertPoint(TheBB, IP);
}
Modified: llvm/trunk/include/llvm/Support/TargetFolder.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/TargetFolder.h?rev=75213&r1=75212&r2=75213&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/TargetFolder.h (original)
+++ llvm/trunk/include/llvm/Support/TargetFolder.h Thu Jul 9 19:49:53 2009
@@ -30,18 +30,18 @@
/// TargetFolder - Create constants with target dependent folding.
class TargetFolder {
const TargetData *TD;
- LLVMContext *Context;
+ LLVMContext &Context;
/// Fold - Fold the constant using target specific information.
Constant *Fold(Constant *C) const {
if (ConstantExpr *CE = dyn_cast<ConstantExpr>(C))
- if (Constant *CF = ConstantFoldConstantExpression(CE, Context, TD))
+ if (Constant *CF = ConstantFoldConstantExpression(CE, &Context, TD))
return CF;
return C;
}
public:
- explicit TargetFolder(const TargetData *TheTD, LLVMContext *C) :
+ explicit TargetFolder(const TargetData *TheTD, LLVMContext &C) :
TD(TheTD), Context(C) {}
//===--------------------------------------------------------------------===//
@@ -49,63 +49,63 @@
//===--------------------------------------------------------------------===//
Constant *CreateAdd(Constant *LHS, Constant *RHS) const {
- return Fold(ConstantExpr::getAdd(LHS, RHS));
+ return Fold(Context.getConstantExprAdd(LHS, RHS));
}
Constant *CreateFAdd(Constant *LHS, Constant *RHS) const {
- return Fold(ConstantExpr::getFAdd(LHS, RHS));
+ return Fold(Context.getConstantExprFAdd(LHS, RHS));
}
Constant *CreateSub(Constant *LHS, Constant *RHS) const {
- return Fold(ConstantExpr::getSub(LHS, RHS));
+ return Fold(Context.getConstantExprSub(LHS, RHS));
}
Constant *CreateFSub(Constant *LHS, Constant *RHS) const {
- return Fold(ConstantExpr::getFSub(LHS, RHS));
+ return Fold(Context.getConstantExprFSub(LHS, RHS));
}
Constant *CreateMul(Constant *LHS, Constant *RHS) const {
- return Fold(ConstantExpr::getMul(LHS, RHS));
+ return Fold(Context.getConstantExprMul(LHS, RHS));
}
Constant *CreateFMul(Constant *LHS, Constant *RHS) const {
- return Fold(ConstantExpr::getFMul(LHS, RHS));
+ return Fold(Context.getConstantExprFMul(LHS, RHS));
}
Constant *CreateUDiv(Constant *LHS, Constant *RHS) const {
- return Fold(ConstantExpr::getUDiv(LHS, RHS));
+ return Fold(Context.getConstantExprUDiv(LHS, RHS));
}
Constant *CreateSDiv(Constant *LHS, Constant *RHS) const {
- return Fold(ConstantExpr::getSDiv(LHS, RHS));
+ return Fold(Context.getConstantExprSDiv(LHS, RHS));
}
Constant *CreateFDiv(Constant *LHS, Constant *RHS) const {
- return Fold(ConstantExpr::getFDiv(LHS, RHS));
+ return Fold(Context.getConstantExprFDiv(LHS, RHS));
}
Constant *CreateURem(Constant *LHS, Constant *RHS) const {
- return Fold(ConstantExpr::getURem(LHS, RHS));
+ return Fold(Context.getConstantExprURem(LHS, RHS));
}
Constant *CreateSRem(Constant *LHS, Constant *RHS) const {
- return Fold(ConstantExpr::getSRem(LHS, RHS));
+ return Fold(Context.getConstantExprSRem(LHS, RHS));
}
Constant *CreateFRem(Constant *LHS, Constant *RHS) const {
- return Fold(ConstantExpr::getFRem(LHS, RHS));
+ return Fold(Context.getConstantExprFRem(LHS, RHS));
}
Constant *CreateShl(Constant *LHS, Constant *RHS) const {
- return Fold(ConstantExpr::getShl(LHS, RHS));
+ return Fold(Context.getConstantExprShl(LHS, RHS));
}
Constant *CreateLShr(Constant *LHS, Constant *RHS) const {
- return Fold(ConstantExpr::getLShr(LHS, RHS));
+ return Fold(Context.getConstantExprLShr(LHS, RHS));
}
Constant *CreateAShr(Constant *LHS, Constant *RHS) const {
- return Fold(ConstantExpr::getAShr(LHS, RHS));
+ return Fold(Context.getConstantExprAShr(LHS, RHS));
}
Constant *CreateAnd(Constant *LHS, Constant *RHS) const {
- return Fold(ConstantExpr::getAnd(LHS, RHS));
+ return Fold(Context.getConstantExprAnd(LHS, RHS));
}
Constant *CreateOr(Constant *LHS, Constant *RHS) const {
- return Fold(ConstantExpr::getOr(LHS, RHS));
+ return Fold(Context.getConstantExprOr(LHS, RHS));
}
Constant *CreateXor(Constant *LHS, Constant *RHS) const {
- return Fold(ConstantExpr::getXor(LHS, RHS));
+ return Fold(Context.getConstantExprXor(LHS, RHS));
}
Constant *CreateBinOp(Instruction::BinaryOps Opc,
Constant *LHS, Constant *RHS) const {
- return Fold(ConstantExpr::get(Opc, LHS, RHS));
+ return Fold(Context.getConstantExpr(Opc, LHS, RHS));
}
//===--------------------------------------------------------------------===//
@@ -113,13 +113,13 @@
//===--------------------------------------------------------------------===//
Constant *CreateNeg(Constant *C) const {
- return Fold(ConstantExpr::getNeg(C));
+ return Fold(Context.getConstantExprNeg(C));
}
Constant *CreateFNeg(Constant *C) const {
- return Fold(ConstantExpr::getFNeg(C));
+ return Fold(Context.getConstantExprFNeg(C));
}
Constant *CreateNot(Constant *C) const {
- return Fold(ConstantExpr::getNot(C));
+ return Fold(Context.getConstantExprNot(C));
}
//===--------------------------------------------------------------------===//
@@ -128,11 +128,11 @@
Constant *CreateGetElementPtr(Constant *C, Constant* const *IdxList,
unsigned NumIdx) const {
- return Fold(ConstantExpr::getGetElementPtr(C, IdxList, NumIdx));
+ return Fold(Context.getConstantExprGetElementPtr(C, IdxList, NumIdx));
}
Constant *CreateGetElementPtr(Constant *C, Value* const *IdxList,
unsigned NumIdx) const {
- return Fold(ConstantExpr::getGetElementPtr(C, IdxList, NumIdx));
+ return Fold(Context.getConstantExprGetElementPtr(C, IdxList, NumIdx));
}
//===--------------------------------------------------------------------===//
@@ -143,13 +143,13 @@
const Type *DestTy) const {
if (C->getType() == DestTy)
return C; // avoid calling Fold
- return Fold(ConstantExpr::getCast(Op, C, DestTy));
+ return Fold(Context.getConstantExprCast(Op, C, DestTy));
}
Constant *CreateIntCast(Constant *C, const Type *DestTy,
bool isSigned) const {
if (C->getType() == DestTy)
return C; // avoid calling Fold
- return Fold(ConstantExpr::getIntegerCast(C, DestTy, isSigned));
+ return Fold(Context.getConstantExprIntegerCast(C, DestTy, isSigned));
}
Constant *CreateBitCast(Constant *C, const Type *DestTy) const {
@@ -164,7 +164,7 @@
Constant *CreateTruncOrBitCast(Constant *C, const Type *DestTy) const {
if (C->getType() == DestTy)
return C; // avoid calling Fold
- return Fold(ConstantExpr::getTruncOrBitCast(C, DestTy));
+ return Fold(Context.getConstantExprTruncOrBitCast(C, DestTy));
}
//===--------------------------------------------------------------------===//
@@ -173,11 +173,11 @@
Constant *CreateICmp(CmpInst::Predicate P, Constant *LHS,
Constant *RHS) const {
- return Fold(ConstantExpr::getCompare(P, LHS, RHS));
+ return Fold(Context.getConstantExprCompare(P, LHS, RHS));
}
Constant *CreateFCmp(CmpInst::Predicate P, Constant *LHS,
Constant *RHS) const {
- return Fold(ConstantExpr::getCompare(P, LHS, RHS));
+ return Fold(Context.getConstantExprCompare(P, LHS, RHS));
}
//===--------------------------------------------------------------------===//
@@ -185,31 +185,31 @@
//===--------------------------------------------------------------------===//
Constant *CreateSelect(Constant *C, Constant *True, Constant *False) const {
- return Fold(ConstantExpr::getSelect(C, True, False));
+ return Fold(Context.getConstantExprSelect(C, True, False));
}
Constant *CreateExtractElement(Constant *Vec, Constant *Idx) const {
- return Fold(ConstantExpr::getExtractElement(Vec, Idx));
+ return Fold(Context.getConstantExprExtractElement(Vec, Idx));
}
Constant *CreateInsertElement(Constant *Vec, Constant *NewElt,
Constant *Idx) const {
- return Fold(ConstantExpr::getInsertElement(Vec, NewElt, Idx));
+ return Fold(Context.getConstantExprInsertElement(Vec, NewElt, Idx));
}
Constant *CreateShuffleVector(Constant *V1, Constant *V2,
Constant *Mask) const {
- return Fold(ConstantExpr::getShuffleVector(V1, V2, Mask));
+ return Fold(Context.getConstantExprShuffleVector(V1, V2, Mask));
}
Constant *CreateExtractValue(Constant *Agg, const unsigned *IdxList,
unsigned NumIdx) const {
- return Fold(ConstantExpr::getExtractValue(Agg, IdxList, NumIdx));
+ return Fold(Context.getConstantExprExtractValue(Agg, IdxList, NumIdx));
}
Constant *CreateInsertValue(Constant *Agg, Constant *Val,
const unsigned *IdxList, unsigned NumIdx) const {
- return Fold(ConstantExpr::getInsertValue(Agg, Val, IdxList, NumIdx));
+ return Fold(Context.getConstantExprInsertValue(Agg, Val, IdxList, NumIdx));
}
};
More information about the llvm-commits
mailing list