[llvm-commits] CVS: llvm/lib/Target/X86/X86ATTAsmPrinter.cpp X86IntelAsmPrinter.cpp X86Subtarget.cpp

[Reid Spencer]

Changes in directory llvm/lib/Target/X86:

X86ATTAsmPrinter.cpp updated: 1.95 -> 1.96
X86IntelAsmPrinter.cpp updated: 1.68 -> 1.69
X86Subtarget.cpp updated: 1.51 -> 1.52
---
Log message:

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


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

 X86ATTAsmPrinter.cpp   |    6 +++---
 X86IntelAsmPrinter.cpp |    6 +++---
 X86Subtarget.cpp       |    4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)


Index: llvm/lib/Target/X86/X86ATTAsmPrinter.cpp
diff -u llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.95 llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.96
--- llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.95	Fri Jan 26 15:22:28 2007
+++ llvm/lib/Target/X86/X86ATTAsmPrinter.cpp	Tue Jan 30 14:08:38 2007
@@ -281,7 +281,7 @@
     if (printStub(TM, Subtarget)) {
       // Link-once, External, or Weakly-linked global variables need
       // non-lazily-resolved stubs
-      if (GV->isExternal() ||
+      if (GV->isDeclaration() ||
           GV->hasWeakLinkage() ||
           GV->hasLinkOnceLinkage()) {
         // Dynamically-resolved functions need a stub for the function.
@@ -310,10 +310,10 @@
       if (isCallOp && isa<Function>(GV)) {
         if (printGOT(TM, Subtarget)) {
           // Assemble call via PLT for non-local symbols
-          if (!GV->hasHiddenVisibility() || GV->isExternal())
+          if (!GV->hasHiddenVisibility() || GV->isDeclaration())
             O << "@PLT";
         }
-        if (Subtarget->isTargetCygMing() && GV->isExternal())
+        if (Subtarget->isTargetCygMing() && GV->isDeclaration())
           // Save function name for later type emission
           FnStubs.insert(Name);
       }


Index: llvm/lib/Target/X86/X86IntelAsmPrinter.cpp
diff -u llvm/lib/Target/X86/X86IntelAsmPrinter.cpp:1.68 llvm/lib/Target/X86/X86IntelAsmPrinter.cpp:1.69
--- llvm/lib/Target/X86/X86IntelAsmPrinter.cpp:1.68	Sat Jan 13 17:59:03 2007
+++ llvm/lib/Target/X86/X86IntelAsmPrinter.cpp	Tue Jan 30 14:08:38 2007
@@ -347,7 +347,7 @@
 
   // Emit declarations for external functions.
   for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I)
-    if (I->isExternal()) {
+    if (I->isDeclaration()) {
       std::string Name = Mang->getValueName(I);
       X86SharedAsmPrinter::decorateName(Name, I);
 
@@ -362,7 +362,7 @@
   // external globals to have type byte, and if that's good enough for VC++...
   for (Module::const_global_iterator I = M.global_begin(), E = M.global_end();
        I != E; ++I) {
-    if (I->isExternal()) {
+    if (I->isDeclaration()) {
       std::string Name = Mang->getValueName(I);
 
       O << "\textern " ;
@@ -382,7 +382,7 @@
   // Print out module-level global variables here.
   for (Module::const_global_iterator I = M.global_begin(), E = M.global_end();
        I != E; ++I) {
-    if (I->isExternal()) continue;   // External global require no code
+    if (I->isDeclaration()) continue;   // External global require no code
     
     // Check to see if this is a special global used by LLVM, if so, emit it.
     if (EmitSpecialLLVMGlobal(I))


Index: llvm/lib/Target/X86/X86Subtarget.cpp
diff -u llvm/lib/Target/X86/X86Subtarget.cpp:1.51 llvm/lib/Target/X86/X86Subtarget.cpp:1.52
--- llvm/lib/Target/X86/X86Subtarget.cpp:1.51	Sun Jan 28 07:31:35 2007
+++ llvm/lib/Target/X86/X86Subtarget.cpp	Tue Jan 30 14:08:38 2007
@@ -40,11 +40,11 @@
     if (isTargetDarwin()) {
       return (!isDirectCall &&
               (GV->hasWeakLinkage() || GV->hasLinkOnceLinkage() ||
-               (GV->isExternal() && !GV->hasNotBeenReadFromBytecode())));
+               (GV->isDeclaration() && !GV->hasNotBeenReadFromBytecode())));
     } else if (TM.getRelocationModel() == Reloc::PIC_ && isPICStyleGOT()) {
       // Extra load is needed for all non-statics.
       return (!isDirectCall &&
-              (GV->isExternal() || !GV->hasInternalLinkage()));
+              (GV->isDeclaration() || !GV->hasInternalLinkage()));
     } else if (isTargetCygMing() || isTargetWindows()) {
       return (GV->hasDLLImportLinkage());
     }