[llvm-branch-commits] [llvm-branch] r103270 - /llvm/branches/Apple/Morbo/lib/Target/X86/X86InstrInfo.cpp

[Dan Gohman]

Author: djg
Date: Fri May  7 12:32:47 2010
New Revision: 103270

URL: http://llvm.org/viewvc/llvm-project?rev=103270&view=rev
Log:
$ svn merge -c 103232 https://djg@llvm.org/svn/llvm-project/llvm/trunk
--- Merging r103232 into '.':
U    lib/Target/X86/X86InstrInfo.cpp

Modified:
    llvm/branches/Apple/Morbo/lib/Target/X86/X86InstrInfo.cpp

Modified: llvm/branches/Apple/Morbo/lib/Target/X86/X86InstrInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/lib/Target/X86/X86InstrInfo.cpp?rev=103270&r1=103269&r2=103270&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/lib/Target/X86/X86InstrInfo.cpp (original)
+++ llvm/branches/Apple/Morbo/lib/Target/X86/X86InstrInfo.cpp Fri May  7 12:32:47 2010
@@ -1064,7 +1064,7 @@
                                  unsigned DestReg, unsigned SubIdx,
                                  const MachineInstr *Orig,
                                  const TargetRegisterInfo *TRI) const {
-  DebugLoc DL = MBB.findDebugLoc(I);
+  DebugLoc DL = Orig->getDebugLoc();
 
   if (SubIdx && TargetRegisterInfo::isPhysicalRegister(DestReg)) {
     DestReg = TRI->getSubReg(DestReg, SubIdx);