X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FTarget%2FSparcV9%2FSparcV9PeepholeOpts.cpp;h=21cc5d79e12d97c15f03c3754b83525128886381;hb=8f7802727f796b60fed79bb76f908ff289ad382c;hp=b41290e576529a90ca25e22ea7209acb0c9d77ef;hpb=55291ead559c902e46ddcebad50dbfefe50ec2d6;p=oota-llvm.git

diff --git a/lib/Target/SparcV9/SparcV9PeepholeOpts.cpp b/lib/Target/SparcV9/SparcV9PeepholeOpts.cpp
index b41290e5765..21cc5d79e12 100644
--- a/lib/Target/SparcV9/SparcV9PeepholeOpts.cpp
+++ b/lib/Target/SparcV9/SparcV9PeepholeOpts.cpp
@@ -6,7 +6,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/CodeGen/PeepholeOpts.h"
-#include "llvm/CodeGen/MachineBasicBlock.h"
+#include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/MachineInstrInfo.h"
@@ -100,7 +100,16 @@ bool
 PeepholeOpts::runOnBasicBlock(BasicBlock &BB)
 {
   // Get the machine instructions for this BB
-  MachineBasicBlock& mvec = MachineBasicBlock::get(&BB);
+  // FIXME: MachineBasicBlock::get() is deprecated, hence inlining the function
+  const Function *F = BB.getParent();
+  MachineFunction &MF = MachineFunction::get(F);
+  MachineBasicBlock *MBB = NULL;
+  for (MachineFunction::iterator I = MF.begin(), E = MF.end(); I != E; ++I) {
+    if (I->getBasicBlock() == &BB)
+      MBB = I;
+  }
+  assert(MBB && "MachineBasicBlock object not found for specified block!");
+  MachineBasicBlock &mvec = *MBB;
 
   // Iterate over all machine instructions in the BB
   // Use a reverse iterator to allow deletion of MI or any instruction after it.