Index: lib/Target/X86/X86InstrBuilder.h
===================================================================
--- lib/Target/X86/X86InstrBuilder.h
+++ lib/Target/X86/X86InstrBuilder.h
@@ -109,9 +109,11 @@
   AM.IndexReg = Op2.getReg();
 
   const MachineOperand &Op3 = MI->getOperand(Operand + 3);
-  if (Op3.isGlobal())
+  // FIXME: Handle additional types of memory references below.
+  if (Op3.isGlobal()) {
     AM.GV = Op3.getGlobal();
-  else
+    AM.Disp = Op3.getOffset();
+  } else
     AM.Disp = Op3.getImm();
 
   return AM;