From: Jakob Stoklund Olesen <stoklund@2pi.dk>
Date: Mon, 7 Nov 2011 21:23:42 +0000 (+0000)
Subject: MBB doesn't need to be a class member.
X-Git-Tag: android-x86-6.0-r1~411
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=731f8d28dedbbb1e7136ff450d5a5d06404aff32;p=android-x86%2Fexternal-llvm.git

MBB doesn't need to be a class member.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@144015 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/CodeGen/ExecutionDepsFix.cpp b/lib/CodeGen/ExecutionDepsFix.cpp
index 3786d57521f..7f04224720d 100644
--- a/lib/CodeGen/ExecutionDepsFix.cpp
+++ b/lib/CodeGen/ExecutionDepsFix.cpp
@@ -111,7 +111,6 @@ class ExeDepsFix : public MachineFunctionPass {
   MachineFunction *MF;
   const TargetInstrInfo *TII;
   const TargetRegisterInfo *TRI;
-  MachineBasicBlock *MBB;
   std::vector<int> AliasMap;
   const unsigned NumRegs;
   DomainValue **LiveRegs;
@@ -149,7 +148,7 @@ private:
   void Collapse(DomainValue *dv, unsigned domain);
   bool Merge(DomainValue *A, DomainValue *B);
 
-  void enterBasicBlock();
+  void enterBasicBlock(MachineBasicBlock*);
   void visitGenericInstr(MachineInstr*);
   void visitSoftInstr(MachineInstr*, unsigned mask);
   void visitHardInstr(MachineInstr*, unsigned domain);
@@ -271,7 +270,7 @@ bool ExeDepsFix::Merge(DomainValue *A, DomainValue *B) {
   return true;
 }
 
-void ExeDepsFix::enterBasicBlock() {
+void ExeDepsFix::enterBasicBlock(MachineBasicBlock *MBB) {
   // Try to coalesce live-out registers from predecessors.
   for (MachineBasicBlock::livein_iterator i = MBB->livein_begin(),
          e = MBB->livein_end(); i != e; ++i) {
@@ -451,7 +450,6 @@ bool ExeDepsFix::runOnMachineFunction(MachineFunction &mf) {
   MF = &mf;
   TII = MF->getTarget().getInstrInfo();
   TRI = MF->getTarget().getRegisterInfo();
-  MBB = 0;
   LiveRegs = 0;
   Distance = 0;
   assert(NumRegs == RC->getNumRegs() && "Bad regclass");
@@ -482,8 +480,8 @@ bool ExeDepsFix::runOnMachineFunction(MachineFunction &mf) {
   for (df_ext_iterator<MachineBasicBlock*, SmallPtrSet<MachineBasicBlock*, 16> >
          DFI = df_ext_begin(Entry, Visited), DFE = df_ext_end(Entry, Visited);
          DFI != DFE; ++DFI) {
-    MBB = *DFI;
-    enterBasicBlock();
+    MachineBasicBlock *MBB = *DFI;
+    enterBasicBlock(MBB);
     for (MachineBasicBlock::iterator I = MBB->begin(), E = MBB->end(); I != E;
         ++I) {
       MachineInstr *mi = I;