[llvm-commits] [llvm] r76517 - /llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
Dale Johannesen
dalej at apple.com
Mon Jul 20 17:12:30 PDT 2009
Author: johannes
Date: Mon Jul 20 19:12:29 2009
New Revision: 76517
URL: http://llvm.org/viewvc/llvm-project?rev=76517&view=rev
Log:
revert 76503 while I figure out what's going on
Modified:
llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=76517&r1=76516&r2=76517&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Mon Jul 20 19:12:29 2009
@@ -4557,7 +4557,7 @@
SDValue Result;
if (OpFlags == X86II::MO_NO_FLAG && isInt32(Offset)) {
// A direct static reference to a global.
- Result = DAG.getTargetGlobalAddress(GV, getPointerTy(), Offset, OpFlags);
+ Result = DAG.getTargetGlobalAddress(GV, getPointerTy(), Offset);
Offset = 0;
} else {
Result = DAG.getTargetGlobalAddress(GV, getPointerTy(), 0, OpFlags);
@@ -8911,7 +8911,10 @@
getTargetMachine())))
return;
- Op = LowerGlobalAddress(GV, Op.getDebugLoc(), Offset, DAG);
+ if (hasMemory)
+ Op = LowerGlobalAddress(GV, Op.getDebugLoc(), Offset, DAG);
+ else
+ Op = DAG.getTargetGlobalAddress(GV, GA->getValueType(0), Offset);
Result = Op;
break;
}
More information about the llvm-commits
mailing list