[llvm-branch-commits] [llvm-branch] r83991 - /llvm/branches/Apple/Leela/lib/Target/ARM/ARMConstantIslandPass.cpp

[Bill Wendling]

Author: void
Date: Tue Oct 13 12:49:49 2009
New Revision: 83991

URL: http://llvm.org/viewvc/llvm-project?rev=83991&view=rev
Log:
$ svn merge -c 83982 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r83982 into '.':
U    lib/Target/ARM/ARMConstantIslandPass.cpp


Modified:
    llvm/branches/Apple/Leela/lib/Target/ARM/ARMConstantIslandPass.cpp

Modified: llvm/branches/Apple/Leela/lib/Target/ARM/ARMConstantIslandPass.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/lib/Target/ARM/ARMConstantIslandPass.cpp?rev=83991&r1=83990&r2=83991&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/lib/Target/ARM/ARMConstantIslandPass.cpp (original)
+++ llvm/branches/Apple/Leela/lib/Target/ARM/ARMConstantIslandPass.cpp Tue Oct 13 12:49:49 2009
@@ -933,13 +933,14 @@
 ///
 MachineBasicBlock *ARMConstantIslands::AcceptWater(water_iterator IP) {
   DEBUG(errs() << "found water in range\n");
+  MachineBasicBlock *WaterBB = *IP;
   // Remove the original WaterList entry; we want subsequent
   // insertions in this vicinity to go after the one we're
   // about to insert.  This considerably reduces the number
   // of times we have to move the same CPE more than once.
   WaterList.erase(IP);
   // CPE goes before following block (NewMBB).
-  return next(MachineFunction::iterator(*IP));
+  return next(MachineFunction::iterator(WaterBB));
 }
 
 /// LookForWater - look for an existing entry in the WaterList in which