[llvm-commits] CVS: llvm/lib/Analysis/IPA/Andersens.cpp CallGraph.cpp GlobalsModRef.cpp

[Reid Spencer]

Changes in directory llvm/lib/Analysis/IPA:

Andersens.cpp updated: 1.42 -> 1.43
CallGraph.cpp updated: 1.63 -> 1.64
GlobalsModRef.cpp updated: 1.27 -> 1.28
---
Log message:

For PR1136: http://llvm.org/PR1136 : Rename GlobalVariable::isExternal as isDeclaration to avoid
confusion with external linkage types.


---
Diffs of the changes:  (+7 -7)

 Andersens.cpp     |    8 ++++----
 CallGraph.cpp     |    2 +-
 GlobalsModRef.cpp |    4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)


Index: llvm/lib/Analysis/IPA/Andersens.cpp
diff -u llvm/lib/Analysis/IPA/Andersens.cpp:1.42 llvm/lib/Analysis/IPA/Andersens.cpp:1.43
--- llvm/lib/Analysis/IPA/Andersens.cpp:1.42	Sat Dec 23 00:05:40 2006
+++ llvm/lib/Analysis/IPA/Andersens.cpp	Tue Jan 30 14:08:37 2007
@@ -367,7 +367,7 @@
   // program and modify stuff.  We ignore this technical niggle for now.  This
   // is, after all, a "research quality" implementation of Andersen's analysis.
   if (Function *F = CS.getCalledFunction())
-    if (F->isExternal()) {
+    if (F->isDeclaration()) {
       Node *N1 = getNode(P);
 
       if (N1->begin() == N1->end())
@@ -599,7 +599,7 @@
 /// constraints and return true.  If this is a call to an unknown function,
 /// return false.
 bool Andersens::AddConstraintsForExternalCall(CallSite CS, Function *F) {
-  assert(F->isExternal() && "Not an external function!");
+  assert(F->isDeclaration() && "Not an external function!");
 
   // These functions don't induce any points-to constraints.
   if (F->getName() == "atoi" || F->getName() == "atof" ||
@@ -724,7 +724,7 @@
     if (!F->hasInternalLinkage())
       AddConstraintsForNonInternalLinkage(F);
 
-    if (!F->isExternal()) {
+    if (!F->isDeclaration()) {
       // Scan the function body, creating a memory object for each heap/stack
       // allocation in the body of the function and a node to represent all
       // pointer values defined by instructions and used as operands.
@@ -883,7 +883,7 @@
 void Andersens::AddConstraintsForCall(CallSite CS, Function *F) {
   // If this is a call to an external function, handle it directly to get some
   // taste of context sensitivity.
-  if (F->isExternal() && AddConstraintsForExternalCall(CS, F))
+  if (F->isDeclaration() && AddConstraintsForExternalCall(CS, F))
     return;
 
   if (isa<PointerType>(CS.getType())) {


Index: llvm/lib/Analysis/IPA/CallGraph.cpp
diff -u llvm/lib/Analysis/IPA/CallGraph.cpp:1.63 llvm/lib/Analysis/IPA/CallGraph.cpp:1.64
--- llvm/lib/Analysis/IPA/CallGraph.cpp:1.63	Sat Dec 16 23:15:12 2006
+++ llvm/lib/Analysis/IPA/CallGraph.cpp	Tue Jan 30 14:08:37 2007
@@ -133,7 +133,7 @@
 
     // If this function is not defined in this translation unit, it could call
     // anything.
-    if (F->isExternal() && !F->getIntrinsicID())
+    if (F->isDeclaration() && !F->getIntrinsicID())
       Node->addCalledFunction(CallSite(), CallsExternalNode);
 
     // Loop over all of the users of the function... looking for callers...


Index: llvm/lib/Analysis/IPA/GlobalsModRef.cpp
diff -u llvm/lib/Analysis/IPA/GlobalsModRef.cpp:1.27 llvm/lib/Analysis/IPA/GlobalsModRef.cpp:1.28
--- llvm/lib/Analysis/IPA/GlobalsModRef.cpp:1.27	Sat Dec 23 00:05:40 2006
+++ llvm/lib/Analysis/IPA/GlobalsModRef.cpp	Tue Jan 30 14:08:37 2007
@@ -300,7 +300,7 @@
         // Okay, easy case.
       } else if (CallInst *CI = dyn_cast<CallInst>(Ptr)) {
         Function *F = CI->getCalledFunction();
-        if (!F || !F->isExternal()) return false;     // Too hard to analyze.
+        if (!F || !F->isDeclaration()) return false;     // Too hard to analyze.
         if (F->getName() != "calloc") return false;   // Not calloc.
       } else {
         return false;  // Too hard to analyze.
@@ -341,7 +341,7 @@
     if ((*I).size() != 1) {
       AnalyzeSCC(*I);
     } else if (Function *F = (*I)[0]->getFunction()) {
-      if (!F->isExternal()) {
+      if (!F->isDeclaration()) {
         // Nonexternal function.
         AnalyzeSCC(*I);
       } else {