aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Cheng <evan.cheng@apple.com>2006-12-19 21:31:42 +0000
committerEvan Cheng <evan.cheng@apple.com>2006-12-19 21:31:42 +0000
commita70d14bd16dbd528f6271a5160173d8b80c61ed2 (patch)
tree56f5f3bc33309ee4a3cc55b93b124cb869235f80
parentecb27687587d04475097596c53349b631f7ef42d (diff)
Fix for PR1062 by Dan Gohman.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@32688 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Target/X86/X86ISelDAGToDAG.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/Target/X86/X86ISelDAGToDAG.cpp b/lib/Target/X86/X86ISelDAGToDAG.cpp
index 5c0bd28fe7..863e6d8a14 100644
--- a/lib/Target/X86/X86ISelDAGToDAG.cpp
+++ b/lib/Target/X86/X86ISelDAGToDAG.cpp
@@ -604,11 +604,9 @@ bool X86DAGToDAGISel::MatchAddress(SDOperand N, X86ISelAddressMode &AM,
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;