[llvm-commits] CVS: llvm/lib/ExecutionEngine/ExecutionEngine.cpp

Reid Spencer reid at x10sys.com
Tue Jan 30 12:10:10 PST 2007



Changes in directory llvm/lib/ExecutionEngine:

ExecutionEngine.cpp updated: 1.101 -> 1.102
---
Log message:

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


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

 ExecutionEngine.cpp |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Index: llvm/lib/ExecutionEngine/ExecutionEngine.cpp
diff -u llvm/lib/ExecutionEngine/ExecutionEngine.cpp:1.101 llvm/lib/ExecutionEngine/ExecutionEngine.cpp:1.102
--- llvm/lib/ExecutionEngine/ExecutionEngine.cpp:1.101	Fri Jan 19 15:13:56 2007
+++ llvm/lib/ExecutionEngine/ExecutionEngine.cpp	Tue Jan 30 14:08:37 2007
@@ -194,7 +194,7 @@
     // an old-style (llvmgcc3) static ctor with __main linked in and in use.  If
     // this is the case, don't execute any of the global ctors, __main will do
     // it.
-    if (!GV || GV->isExternal() || GV->hasInternalLinkage()) continue;
+    if (!GV || GV->isDeclaration() || GV->hasInternalLinkage()) continue;
   
     // Should be an array of '{ int, void ()* }' structs.  The first value is
     // the init priority, which we ignore.
@@ -746,7 +746,7 @@
       for (Module::const_global_iterator I = M.global_begin(),
            E = M.global_end(); I != E; ++I) {
         const GlobalValue *GV = I;
-        if (GV->hasInternalLinkage() || GV->isExternal() ||
+        if (GV->hasInternalLinkage() || GV->isDeclaration() ||
             GV->hasAppendingLinkage() || !GV->hasName())
           continue;// Ignore external globals and globals with internal linkage.
           
@@ -791,7 +791,7 @@
         }
       }
       
-      if (!I->isExternal()) {
+      if (!I->isDeclaration()) {
         // Get the type of the global.
         const Type *Ty = I->getType()->getElementType();
 
@@ -829,7 +829,7 @@
     // and initialize their contents.
     for (Module::const_global_iterator I = M.global_begin(), E = M.global_end();
          I != E; ++I) {
-      if (!I->isExternal()) {
+      if (!I->isDeclaration()) {
         if (!LinkedGlobalsMap.empty()) {
           if (const GlobalValue *GVEntry = 
                 LinkedGlobalsMap[std::make_pair(I->getName(), I->getType())])






More information about the llvm-commits mailing list