[llvm-commits] CVS: llvm/lib/Target/X86/X86ISelDAGToDAG.cpp

[Evan Cheng]

Changes in directory llvm/lib/Target/X86:

X86ISelDAGToDAG.cpp updated: 1.138 -> 1.139
---
Log message:

Fix for PR1062: http://llvm.org/PR1062  by Dan Gohman.

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

 X86ISelDAGToDAG.cpp |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)


Index: llvm/lib/Target/X86/X86ISelDAGToDAG.cpp
diff -u llvm/lib/Target/X86/X86ISelDAGToDAG.cpp:1.138 llvm/lib/Target/X86/X86ISelDAGToDAG.cpp:1.139
--- llvm/lib/Target/X86/X86ISelDAGToDAG.cpp:1.138	Thu Dec  7 16:21:48 2006
+++ llvm/lib/Target/X86/X86ISelDAGToDAG.cpp	Tue Dec 19 15:31:42 2006
@@ -604,11 +604,9 @@
       SDOperand N0 = N.getOperand(0);
       if (GlobalAddressSDNode *G = dyn_cast<GlobalAddressSDNode>(N0)) {
         GlobalValue *GV = G->getGlobal();
-        bool isAbs32 = !is64Bit ||
-          (isStatic && !(GV->isExternal() || GV->hasWeakLinkage() ||
-                         GV->hasLinkOnceLinkage()));
+        bool isAbs32 = !is64Bit || isStatic;
         if (isAbs32 || isRoot) {
-          AM.GV = G->getGlobal();
+          AM.GV = GV;
           AM.Disp += G->getOffset();
           AM.isRIPRel = !isAbs32;
           return false;