[llvm-commits] [poolalloc] r75466 - in /poolalloc/trunk/lib: DSA/DataStructureOpt.cpp DSA/Local.cpp PoolAllocate/AccessTrace.cpp PoolAllocate/Heuristic.cpp PoolAllocate/PAMultipleGlobalPool.cpp PoolAllocate/PASimple.cpp PoolAllocate/PointerCompress.cpp PoolAllocate/PoolAllocate.cpp PoolAllocate/PoolOptimize.cpp PoolAllocate/TransformFunctionBody.cpp
John Criswell
criswell at uiuc.edu
Mon Jul 13 07:01:54 PDT 2009
Author: criswell
Date: Mon Jul 13 09:01:51 2009
New Revision: 75466
URL: http://llvm.org/viewvc/llvm-project?rev=75466&view=rev
Log:
Updated to the latest LLVM API.
This time, we changed Constant::getNullValue() to ConstantAggregateZero::get().
Modified:
poolalloc/trunk/lib/DSA/DataStructureOpt.cpp
poolalloc/trunk/lib/DSA/Local.cpp
poolalloc/trunk/lib/PoolAllocate/AccessTrace.cpp
poolalloc/trunk/lib/PoolAllocate/Heuristic.cpp
poolalloc/trunk/lib/PoolAllocate/PAMultipleGlobalPool.cpp
poolalloc/trunk/lib/PoolAllocate/PASimple.cpp
poolalloc/trunk/lib/PoolAllocate/PointerCompress.cpp
poolalloc/trunk/lib/PoolAllocate/PoolAllocate.cpp
poolalloc/trunk/lib/PoolAllocate/PoolOptimize.cpp
poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp
Modified: poolalloc/trunk/lib/DSA/DataStructureOpt.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/DataStructureOpt.cpp?rev=75466&r1=75465&r2=75466&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/DataStructureOpt.cpp (original)
+++ poolalloc/trunk/lib/DSA/DataStructureOpt.cpp Mon Jul 13 09:01:51 2009
@@ -17,6 +17,7 @@
#include "llvm/Analysis/Passes.h"
#include "llvm/Module.h"
#include "llvm/Constant.h"
+#include "llvm/Constants.h"
#include "llvm/Type.h"
#include "llvm/ADT/Statistic.h"
#include "llvm/Support/Debug.h"
@@ -78,7 +79,8 @@
// remove anything that references the global: later passes will take
// care of nuking it.
if (!I->use_empty()) {
- I->replaceAllUsesWith(Constant::getNullValue((Type*)I->getType()));
+ Type * Ty = (Type *) I->getType();
+ I->replaceAllUsesWith(ConstantAggregateZero::get(Ty));
++NumGlobalsIsolated;
}
} else if (GNode && GNode->isCompleteNode()) {
@@ -87,7 +89,8 @@
// visible, kill any references to it so it can be DCE'd.
if (!GNode->isModifiedNode() && !GNode->isReadNode() &&I->hasInternalLinkage()){
if (!I->use_empty()) {
- I->replaceAllUsesWith(Constant::getNullValue((Type*)I->getType()));
+ Type * Ty = (Type *) I->getType();
+ I->replaceAllUsesWith(ConstantAggregateZero::get(Ty));
++NumGlobalsIsolated;
}
}
Modified: poolalloc/trunk/lib/DSA/Local.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/Local.cpp?rev=75466&r1=75465&r2=75466&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/Local.cpp (original)
+++ poolalloc/trunk/lib/DSA/Local.cpp Mon Jul 13 09:01:51 2009
@@ -375,7 +375,7 @@
bool AllZeros = true;
for (unsigned i = 1, e = GEP.getNumOperands(); i != e; ++i)
if (GEP.getOperand(i) !=
- Constant::getNullValue(GEP.getOperand(i)->getType())) {
+ ConstantAggregateZero::get(GEP.getOperand(i)->getType())) {
AllZeros = false;
break;
}
Modified: poolalloc/trunk/lib/PoolAllocate/AccessTrace.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/AccessTrace.cpp?rev=75466&r1=75465&r2=75466&view=diff
==============================================================================
--- poolalloc/trunk/lib/PoolAllocate/AccessTrace.cpp (original)
+++ poolalloc/trunk/lib/PoolAllocate/AccessTrace.cpp Mon Jul 13 09:01:51 2009
@@ -91,7 +91,7 @@
if (PD)
PD = CastInst::CreatePointerCast (PD, VoidPtrTy, PD->getName(), I);
else
- PD = Constant::getNullValue(VoidPtrTy);
+ PD = ConstantAggregateZero::get(VoidPtrTy);
// Insert the trace call.
Value *Opts[2] = {Ptr, PD};
Modified: poolalloc/trunk/lib/PoolAllocate/Heuristic.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/Heuristic.cpp?rev=75466&r1=75465&r2=75466&view=diff
==============================================================================
--- poolalloc/trunk/lib/PoolAllocate/Heuristic.cpp (original)
+++ poolalloc/trunk/lib/PoolAllocate/Heuristic.cpp Mon Jul 13 09:01:51 2009
@@ -443,7 +443,7 @@
NullGlobal = new GlobalVariable(*M,
PoolAllocate::PoolDescPtrTy, false,
GlobalValue::ExternalLinkage,
- Constant::getNullValue(PoolAllocate::PoolDescPtrTy),
+ ConstantAggregateZero::get(PoolAllocate::PoolDescPtrTy),
"llvm-poolalloc-null-init");
}
while (isa<AllocaInst>(I)) ++I;
Modified: poolalloc/trunk/lib/PoolAllocate/PAMultipleGlobalPool.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/PAMultipleGlobalPool.cpp?rev=75466&r1=75465&r2=75466&view=diff
==============================================================================
--- poolalloc/trunk/lib/PoolAllocate/PAMultipleGlobalPool.cpp (original)
+++ poolalloc/trunk/lib/PoolAllocate/PAMultipleGlobalPool.cpp Mon Jul 13 09:01:51 2009
@@ -365,7 +365,7 @@
new GlobalVariable
(M,
getPoolType(), false, GlobalValue::ExternalLinkage,
- Constant::getNullValue(getPoolType()),
+ ConstantAggregateZero::get(getPoolType()),
"__poolalloc_GlobalPool");
Value *ElSize = ConstantInt::get(Type::Int32Ty, RecSize);
Modified: poolalloc/trunk/lib/PoolAllocate/PASimple.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/PASimple.cpp?rev=75466&r1=75465&r2=75466&view=diff
==============================================================================
--- poolalloc/trunk/lib/PoolAllocate/PASimple.cpp (original)
+++ poolalloc/trunk/lib/PoolAllocate/PASimple.cpp Mon Jul 13 09:01:51 2009
@@ -355,7 +355,7 @@
GlobalVariable *GV =
new GlobalVariable(M,
getPoolType(), false, GlobalValue::ExternalLinkage,
- Constant::getNullValue(getPoolType()),
+ ConstantAggregateZero::get(getPoolType()),
"__poolalloc_GlobalPool");
Function *InitFunc = Function::Create
Modified: poolalloc/trunk/lib/PoolAllocate/PointerCompress.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/PointerCompress.cpp?rev=75466&r1=75465&r2=75466&view=diff
==============================================================================
--- poolalloc/trunk/lib/PoolAllocate/PointerCompress.cpp (original)
+++ poolalloc/trunk/lib/PoolAllocate/PointerCompress.cpp Mon Jul 13 09:01:51 2009
@@ -287,7 +287,7 @@
assert(PoolBase == 0 && "Mixing and matching optimized vs not!");
// Get the pool base pointer.
- Constant *Zero = Constant::getNullValue(Type::Int32Ty);
+ Constant *Zero = ConstantAggregateZero::get(Type::Int32Ty);
Value *Opts[2] = {Zero, Zero};
Value *BasePtrPtr = GetElementPtrInst::Create(getPoolDesc(), Opts, Opts + 2,
"poolbaseptrptr", &I);
@@ -299,7 +299,7 @@
isa<GlobalVariable>(PoolDesc))) {
BasicBlock::iterator IP = I.getParent()->getParent()->begin()->begin();
while (isa<AllocaInst>(IP)) ++IP;
- Constant *Zero = Constant::getNullValue(Type::Int32Ty);
+ Constant *Zero = ConstantAggregateZero::get(Type::Int32Ty);
Value *Opts[2] = {Zero, Zero};
Value *BasePtrPtr = GetElementPtrInst::Create(getPoolDesc(), Opts, Opts + 2,
"poolbaseptrptr", IP);
@@ -383,7 +383,7 @@
/// value, creating a new forward ref value as needed.
Value *getTransformedValue(Value *V) {
if (isa<ConstantPointerNull>(V)) // null -> uint 0
- return Constant::getNullValue(SCALARUINTTYPE);
+ return ConstantAggregateZero::get(SCALARUINTTYPE);
if (isa<UndefValue>(V)) // undef -> uint undef
return UndefValue::get(SCALARUINTTYPE);
@@ -828,7 +828,7 @@
}
} else {
// FIXME: This assumes that all null pointers are compressed!
- SrcVal = Constant::getNullValue(MEMUINTTYPE);
+ SrcVal = ConstantAggregateZero::get(MEMUINTTYPE);
}
// Get the pool base pointer.
Modified: poolalloc/trunk/lib/PoolAllocate/PoolAllocate.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/PoolAllocate.cpp?rev=75466&r1=75465&r2=75466&view=diff
==============================================================================
--- poolalloc/trunk/lib/PoolAllocate/PoolAllocate.cpp (original)
+++ poolalloc/trunk/lib/PoolAllocate/PoolAllocate.cpp Mon Jul 13 09:01:51 2009
@@ -587,7 +587,7 @@
// Any unallocated DSNodes get null pool descriptor pointers.
for (hash_set<const DSNode*>::iterator I = GlobalHeapNodes.begin(),
E = GlobalHeapNodes.end(); I != E; ++I) {
- GlobalNodes[*I] = Constant::getNullValue(PointerType::getUnqual(PoolDescType));
+ GlobalNodes[*I] = ConstantAggregateZero::get(PointerType::getUnqual(PoolDescType));
++NumNonprofit;
}
@@ -602,7 +602,7 @@
GlobalVariable *GV =
new GlobalVariable(*CurModule,
PoolDescType, false, GlobalValue::InternalLinkage,
- Constant::getNullValue(PoolDescType), "GlobalPool");
+ ConstantAggregateZero::get(PoolDescType), "GlobalPool");
// Update the global DSGraph to include this.
DSNode *GNode = Graphs->getGlobalsGraph()->addObjectToGraph(GV);
@@ -686,7 +686,7 @@
// Any unallocated DSNodes get null pool descriptor pointers.
for (std::set<const DSNode*>::iterator I = UnallocatedNodes.begin(),
E = UnallocatedNodes.end(); I != E; ++I) {
- PoolDescriptors[*I] =Constant::getNullValue(PointerType::getUnqual(PoolDescType));
+ PoolDescriptors[*I] =ConstantAggregateZero::get(PointerType::getUnqual(PoolDescType));
++NumNonprofit;
}
}
Modified: poolalloc/trunk/lib/PoolAllocate/PoolOptimize.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/PoolOptimize.cpp?rev=75466&r1=75465&r2=75466&view=diff
==============================================================================
--- poolalloc/trunk/lib/PoolAllocate/PoolOptimize.cpp (original)
+++ poolalloc/trunk/lib/PoolAllocate/PoolOptimize.cpp Mon Jul 13 09:01:51 2009
@@ -130,7 +130,7 @@
// poolrealloc(PD, X, 0) -> poolfree(PD, X)
Value* Opts[2] = {CI->getOperand(1), CI->getOperand(2)};
CallInst::Create(PoolFree, Opts, Opts + 2, "", CI);
- CI->replaceAllUsesWith(Constant::getNullValue(CI->getType()));
+ CI->replaceAllUsesWith(ConstantAggregateZero::get(CI->getType()));
CI->eraseFromParent();
} else if (isa<ConstantPointerNull>(CI->getOperand(1))) {
// poolrealloc(null, X, Y) -> realloc(X, Y)
Modified: poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp?rev=75466&r1=75465&r2=75466&view=diff
==============================================================================
--- poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp (original)
+++ poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp Mon Jul 13 09:01:51 2009
@@ -446,7 +446,7 @@
PH = getPoolHandle(I);
// Return success always.
- Value *RetVal = Constant::getNullValue(I->getType());
+ Value *RetVal = ConstantAggregateZero::get(I->getType());
I->replaceAllUsesWith(RetVal);
static const Type *PtrPtr=PointerType::getUnqual(PointerType::getUnqual(Type::Int8Ty));
@@ -727,7 +727,7 @@
// pool descriptors to pass in...
std::vector<Value*> Args;
for (unsigned i = 0, e = ArgNodes.size(); i != e; ++i) {
- Value *ArgVal = Constant::getNullValue(PoolAllocate::PoolDescPtrTy);
+ Value *ArgVal = ConstantAggregateZero::get(PoolAllocate::PoolDescPtrTy);
if (NodeMapping.count(ArgNodes[i]))
if (DSNode *LocalNode = NodeMapping[ArgNodes[i]].getNode())
if (FI.PoolDescriptors.count(LocalNode))
More information about the llvm-commits
mailing list