[llvm-commits] CVS: llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp ExtractFunction.cpp FunctionResolution.cpp GlobalDCE.cpp GlobalOpt.cpp IPConstantPropagation.cpp IndMemRemoval.cpp Inliner.cpp Internalize.cpp PruneEH.cpp RaiseAllocations.cpp SimplifyLibCalls.cpp
Reid Spencer
reid at x10sys.com
Tue Jan 30 12:10:05 PST 2007
Changes in directory llvm/lib/Transforms/IPO:
DeadArgumentElimination.cpp updated: 1.35 -> 1.36
ExtractFunction.cpp updated: 1.16 -> 1.17
FunctionResolution.cpp updated: 1.65 -> 1.66
GlobalDCE.cpp updated: 1.40 -> 1.41
GlobalOpt.cpp updated: 1.88 -> 1.89
IPConstantPropagation.cpp updated: 1.21 -> 1.22
IndMemRemoval.cpp updated: 1.11 -> 1.12
Inliner.cpp updated: 1.35 -> 1.36
Internalize.cpp updated: 1.41 -> 1.42
PruneEH.cpp updated: 1.27 -> 1.28
RaiseAllocations.cpp updated: 1.35 -> 1.36
SimplifyLibCalls.cpp updated: 1.89 -> 1.90
---
Log message:
For PR1136: http://llvm.org/PR1136 : Rename GlobalVariable::isExternal as isDeclaration to avoid
confusion with external linkage types.
---
Diffs of the changes: (+30 -30)
DeadArgumentElimination.cpp | 2 +-
ExtractFunction.cpp | 4 ++--
FunctionResolution.cpp | 18 +++++++++---------
GlobalDCE.cpp | 6 +++---
GlobalOpt.cpp | 4 ++--
IPConstantPropagation.cpp | 2 +-
IndMemRemoval.cpp | 4 ++--
Inliner.cpp | 4 ++--
Internalize.cpp | 6 +++---
PruneEH.cpp | 4 ++--
RaiseAllocations.cpp | 4 ++--
SimplifyLibCalls.cpp | 2 +-
12 files changed, 30 insertions(+), 30 deletions(-)
Index: llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp
diff -u llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp:1.35 llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp:1.36
--- llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp:1.35 Sun Jan 28 07:31:35 2007
+++ llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp Tue Jan 30 14:08:38 2007
@@ -114,7 +114,7 @@
/// llvm.vastart is never called, the varargs list is dead for the function.
bool DAE::DeleteDeadVarargs(Function &Fn) {
assert(Fn.getFunctionType()->isVarArg() && "Function isn't varargs!");
- if (Fn.isExternal() || !Fn.hasInternalLinkage()) return false;
+ if (Fn.isDeclaration() || !Fn.hasInternalLinkage()) return false;
// Ensure that the function is only directly called.
for (Value::use_iterator I = Fn.use_begin(), E = Fn.use_end(); I != E; ++I) {
Index: llvm/lib/Transforms/IPO/ExtractFunction.cpp
diff -u llvm/lib/Transforms/IPO/ExtractFunction.cpp:1.16 llvm/lib/Transforms/IPO/ExtractFunction.cpp:1.17
--- llvm/lib/Transforms/IPO/ExtractFunction.cpp:1.16 Sun Jan 28 07:31:35 2007
+++ llvm/lib/Transforms/IPO/ExtractFunction.cpp Tue Jan 30 14:08:38 2007
@@ -63,7 +63,7 @@
Named->setLinkage(GlobalValue::ExternalLinkage);
Named->deleteBody();
- assert(Named->isExternal() && "This didn't make the function external!");
+ assert(Named->isDeclaration() && "This didn't make the function external!");
return true;
}
@@ -73,7 +73,7 @@
// Mark all global variables internal
for (Module::global_iterator I = M.global_begin(), E = M.global_end(); I != E; ++I)
- if (!I->isExternal()) {
+ if (!I->isDeclaration()) {
I->setInitializer(0); // Make all variables external
I->setLinkage(GlobalValue::ExternalLinkage);
}
Index: llvm/lib/Transforms/IPO/FunctionResolution.cpp
diff -u llvm/lib/Transforms/IPO/FunctionResolution.cpp:1.65 llvm/lib/Transforms/IPO/FunctionResolution.cpp:1.66
--- llvm/lib/Transforms/IPO/FunctionResolution.cpp:1.65 Tue Dec 19 16:09:18 2006
+++ llvm/lib/Transforms/IPO/FunctionResolution.cpp Tue Jan 30 14:08:38 2007
@@ -174,13 +174,13 @@
// to 'int (int)' or 'int ()' or whatever else is not completely generic.
//
Function *F = cast<Function>(Globals[i]);
- if (!F->isExternal()) {
- if (Concrete && !Concrete->isExternal())
+ if (!F->isDeclaration()) {
+ if (Concrete && !Concrete->isDeclaration())
return false; // Found two different functions types. Can't choose!
Concrete = Globals[i];
} else if (Concrete) {
- if (Concrete->isExternal()) // If we have multiple external symbols...
+ if (Concrete->isDeclaration()) // If we have multiple external symbols...
if (F->getFunctionType()->getNumParams() >
cast<Function>(Concrete)->getFunctionType()->getNumParams())
Concrete = F; // We are more concrete than "Concrete"!
@@ -190,7 +190,7 @@
}
} else {
GlobalVariable *GV = cast<GlobalVariable>(Globals[i]);
- if (!GV->isExternal()) {
+ if (!GV->isDeclaration()) {
if (Concrete) {
cerr << "WARNING: Two global variables with external linkage"
<< " exist with the same name: '" << GV->getName()
@@ -211,7 +211,7 @@
unsigned NumInstancesWithExternalLinkage = 0;
for (unsigned i = 0, e = Globals.size(); i != e; ++i) {
- if (Globals[i]->isExternal())
+ if (Globals[i]->isDeclaration())
HasExternal = true;
else if (!Globals[i]->hasInternalLinkage())
NumInstancesWithExternalLinkage++;
@@ -306,7 +306,7 @@
bool Changed = false;
for (Module::iterator I = M.begin(), E = M.end(); I != E; ) {
Function *F = I++;
- if (F->use_empty() && F->isExternal()) {
+ if (F->use_empty() && F->isDeclaration()) {
M.getFunctionList().erase(F);
Changed = true;
} else if (!F->hasInternalLinkage() && !F->getName().empty() &&
@@ -317,7 +317,7 @@
for (Module::global_iterator I = M.global_begin(), E = M.global_end();
I != E; ) {
GlobalVariable *GV = I++;
- if (GV->use_empty() && GV->isExternal()) {
+ if (GV->use_empty() && GV->isDeclaration()) {
M.getGlobalList().erase(GV);
Changed = true;
} else if (!GV->hasInternalLinkage() && !GV->getName().empty())
@@ -337,7 +337,7 @@
// dead. If so, remove them now.
for (Module::iterator I = M.begin(), E = M.end(); I != E; )
- if (I->isExternal() && I->use_empty()) {
+ if (I->isDeclaration() && I->use_empty()) {
Function *F = I;
++I;
M.getFunctionList().erase(F);
@@ -349,7 +349,7 @@
for (Module::global_iterator I = M.global_begin(), E = M.global_end();
I != E; )
- if (I->isExternal() && I->use_empty()) {
+ if (I->isDeclaration() && I->use_empty()) {
GlobalVariable *GV = I;
++I;
M.getGlobalList().erase(GV);
Index: llvm/lib/Transforms/IPO/GlobalDCE.cpp
diff -u llvm/lib/Transforms/IPO/GlobalDCE.cpp:1.40 llvm/lib/Transforms/IPO/GlobalDCE.cpp:1.41
--- llvm/lib/Transforms/IPO/GlobalDCE.cpp:1.40 Tue Dec 19 16:09:18 2006
+++ llvm/lib/Transforms/IPO/GlobalDCE.cpp Tue Jan 30 14:08:38 2007
@@ -57,7 +57,7 @@
Changed |= RemoveUnusedGlobalValue(*I);
// Functions with external linkage are needed if they have a body
if ((!I->hasInternalLinkage() && !I->hasLinkOnceLinkage()) &&
- !I->isExternal())
+ !I->isDeclaration())
GlobalIsNeeded(I);
}
@@ -66,7 +66,7 @@
// Externally visible & appending globals are needed, if they have an
// initializer.
if ((!I->hasInternalLinkage() && !I->hasLinkOnceLinkage()) &&
- !I->isExternal())
+ !I->isDeclaration())
GlobalIsNeeded(I);
}
@@ -89,7 +89,7 @@
for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I)
if (!AliveGlobals.count(I)) {
DeadFunctions.push_back(I); // Keep track of dead globals
- if (!I->isExternal())
+ if (!I->isDeclaration())
I->deleteBody();
}
Index: llvm/lib/Transforms/IPO/GlobalOpt.cpp
diff -u llvm/lib/Transforms/IPO/GlobalOpt.cpp:1.88 llvm/lib/Transforms/IPO/GlobalOpt.cpp:1.89
--- llvm/lib/Transforms/IPO/GlobalOpt.cpp:1.88 Sat Jan 20 18:29:25 2007
+++ llvm/lib/Transforms/IPO/GlobalOpt.cpp Tue Jan 30 14:08:38 2007
@@ -1553,7 +1553,7 @@
if (GlobalVariable *GV = dyn_cast<GlobalVariable>(C)) {
if (!GV->hasExternalLinkage() && !GV->hasInternalLinkage())
return false; // do not allow weak/linkonce/dllimport/dllexport linkage.
- return !GV->isExternal(); // reject external globals.
+ return !GV->isDeclaration(); // reject external globals.
}
if (ConstantExpr *CE = dyn_cast<ConstantExpr>(C))
// Handle a constantexpr gep.
@@ -1773,7 +1773,7 @@
for (unsigned i = 1, e = CI->getNumOperands(); i != e; ++i)
Formals.push_back(getVal(Values, CI->getOperand(i)));
- if (Callee->isExternal()) {
+ if (Callee->isDeclaration()) {
// If this is a function we can constant fold, do it.
if (Constant *C = ConstantFoldCall(Callee, Formals)) {
InstResult = C;
Index: llvm/lib/Transforms/IPO/IPConstantPropagation.cpp
diff -u llvm/lib/Transforms/IPO/IPConstantPropagation.cpp:1.21 llvm/lib/Transforms/IPO/IPConstantPropagation.cpp:1.22
--- llvm/lib/Transforms/IPO/IPConstantPropagation.cpp:1.21 Tue Dec 19 16:09:18 2006
+++ llvm/lib/Transforms/IPO/IPConstantPropagation.cpp Tue Jan 30 14:08:38 2007
@@ -51,7 +51,7 @@
while (LocalChange) {
LocalChange = false;
for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I)
- if (!I->isExternal()) {
+ if (!I->isDeclaration()) {
// Delete any klingons.
I->removeDeadConstantUsers();
if (I->hasInternalLinkage())
Index: llvm/lib/Transforms/IPO/IndMemRemoval.cpp
diff -u llvm/lib/Transforms/IPO/IndMemRemoval.cpp:1.11 llvm/lib/Transforms/IPO/IndMemRemoval.cpp:1.12
--- llvm/lib/Transforms/IPO/IndMemRemoval.cpp:1.11 Fri Jan 19 15:13:56 2007
+++ llvm/lib/Transforms/IPO/IndMemRemoval.cpp Tue Jan 30 14:08:38 2007
@@ -45,7 +45,7 @@
//happen through intrinsics.
bool changed = false;
if (Function* F = M.getNamedFunction("free")) {
- assert(F->isExternal() && "free not external?");
+ assert(F->isDeclaration() && "free not external?");
if (!F->use_empty()) {
Function* FN = new Function(F->getFunctionType(),
GlobalValue::LinkOnceLinkage,
@@ -60,7 +60,7 @@
}
}
if (Function* F = M.getNamedFunction("malloc")) {
- assert(F->isExternal() && "malloc not external?");
+ assert(F->isDeclaration() && "malloc not external?");
if (!F->use_empty()) {
Function* FN = new Function(F->getFunctionType(),
GlobalValue::LinkOnceLinkage,
Index: llvm/lib/Transforms/IPO/Inliner.cpp
diff -u llvm/lib/Transforms/IPO/Inliner.cpp:1.35 llvm/lib/Transforms/IPO/Inliner.cpp:1.36
--- llvm/lib/Transforms/IPO/Inliner.cpp:1.35 Tue Dec 19 16:09:18 2006
+++ llvm/lib/Transforms/IPO/Inliner.cpp Tue Jan 30 14:08:38 2007
@@ -84,7 +84,7 @@
for (BasicBlock::iterator I = BB->begin(); I != BB->end(); ++I) {
CallSite CS = CallSite::get(I);
if (CS.getInstruction() && (!CS.getCalledFunction() ||
- !CS.getCalledFunction()->isExternal()))
+ !CS.getCalledFunction()->isDeclaration()))
CallSites.push_back(CS);
}
@@ -109,7 +109,7 @@
for (unsigned CSi = 0; CSi != CallSites.size(); ++CSi)
if (Function *Callee = CallSites[CSi].getCalledFunction()) {
// Calls to external functions are never inlinable.
- if (Callee->isExternal() ||
+ if (Callee->isDeclaration() ||
CallSites[CSi].getInstruction()->getParent()->getParent() ==Callee){
if (SCC.size() == 1) {
std::swap(CallSites[CSi], CallSites.back());
Index: llvm/lib/Transforms/IPO/Internalize.cpp
diff -u llvm/lib/Transforms/IPO/Internalize.cpp:1.41 llvm/lib/Transforms/IPO/Internalize.cpp:1.42
--- llvm/lib/Transforms/IPO/Internalize.cpp:1.41 Fri Jan 26 15:22:28 2007
+++ llvm/lib/Transforms/IPO/Internalize.cpp Tue Jan 30 14:08:38 2007
@@ -96,7 +96,7 @@
//
if (ExternalNames.empty()) {
Function *MainFunc = M.getMainFunction();
- if (MainFunc == 0 || MainFunc->isExternal())
+ if (MainFunc == 0 || MainFunc->isDeclaration())
return false; // No main found, must be a library...
// Preserve main, internalize all else.
@@ -107,7 +107,7 @@
// Found a main function, mark all functions not named main as internal.
for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I)
- if (!I->isExternal() && // Function must be defined here
+ if (!I->isDeclaration() && // Function must be defined here
!I->hasInternalLinkage() && // Can't already have internal linkage
!ExternalNames.count(I->getName())) {// Not marked to keep external?
I->setLinkage(GlobalValue::InternalLinkage);
@@ -129,7 +129,7 @@
// Mark all global variables with initializers as internal as well.
for (Module::global_iterator I = M.global_begin(), E = M.global_end();
I != E; ++I)
- if (!I->isExternal() && !I->hasInternalLinkage() &&
+ if (!I->isDeclaration() && !I->hasInternalLinkage() &&
!ExternalNames.count(I->getName())) {
// Special case handling of the global ctor and dtor list. When we
// internalize it, we mark it constant, which allows elimination of
Index: llvm/lib/Transforms/IPO/PruneEH.cpp
diff -u llvm/lib/Transforms/IPO/PruneEH.cpp:1.27 llvm/lib/Transforms/IPO/PruneEH.cpp:1.28
--- llvm/lib/Transforms/IPO/PruneEH.cpp:1.27 Thu Jan 25 18:47:38 2007
+++ llvm/lib/Transforms/IPO/PruneEH.cpp Tue Jan 30 14:08:38 2007
@@ -72,11 +72,11 @@
for (unsigned i = 0, e = SCC.size();
(!SCCMightUnwind || !SCCMightReturn) && i != e; ++i) {
Function *F = SCC[i]->getFunction();
- if (F == 0 || (F->isExternal() && !F->getIntrinsicID())) {
+ if (F == 0 || (F->isDeclaration() && !F->getIntrinsicID())) {
SCCMightUnwind = true;
SCCMightReturn = true;
} else {
- if (F->isExternal())
+ if (F->isDeclaration())
SCCMightReturn = true;
// Check to see if this function performs an unwind or calls an
Index: llvm/lib/Transforms/IPO/RaiseAllocations.cpp
diff -u llvm/lib/Transforms/IPO/RaiseAllocations.cpp:1.35 llvm/lib/Transforms/IPO/RaiseAllocations.cpp:1.36
--- llvm/lib/Transforms/IPO/RaiseAllocations.cpp:1.35 Sat Dec 30 23:48:39 2006
+++ llvm/lib/Transforms/IPO/RaiseAllocations.cpp Tue Jan 30 14:08:38 2007
@@ -109,8 +109,8 @@
}
// Don't mess with locally defined versions of these functions...
- if (MallocFunc && !MallocFunc->isExternal()) MallocFunc = 0;
- if (FreeFunc && !FreeFunc->isExternal()) FreeFunc = 0;
+ if (MallocFunc && !MallocFunc->isDeclaration()) MallocFunc = 0;
+ if (FreeFunc && !FreeFunc->isDeclaration()) FreeFunc = 0;
}
// run - Transform calls into instructions...
Index: llvm/lib/Transforms/IPO/SimplifyLibCalls.cpp
diff -u llvm/lib/Transforms/IPO/SimplifyLibCalls.cpp:1.89 llvm/lib/Transforms/IPO/SimplifyLibCalls.cpp:1.90
--- llvm/lib/Transforms/IPO/SimplifyLibCalls.cpp:1.89 Sat Jan 20 04:07:23 2007
+++ llvm/lib/Transforms/IPO/SimplifyLibCalls.cpp Tue Jan 30 14:08:38 2007
@@ -177,7 +177,7 @@
// because they live in a runtime library somewhere and were (probably)
// not compiled by LLVM. So, we only act on external functions that
// have external or dllimport linkage and non-empty uses.
- if (!FI->isExternal() ||
+ if (!FI->isDeclaration() ||
!(FI->hasExternalLinkage() || FI->hasDLLImportLinkage()) ||
FI->use_empty())
continue;
More information about the llvm-commits
mailing list