Don't use random class variables across functions

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

diff --git a/lib/CodeGen/LiveDebugValues.cpp b/lib/CodeGen/LiveDebugValues.cpp
index 49d436c43b695bff40d91136717058a9755425f7..a920a0ba6f98f328186436aac1b0dc858cb87bed 100644 (file)
--- a/lib/CodeGen/LiveDebugValues.cpp
+++ b/lib/CodeGen/LiveDebugValues.cpp
@@ -76,16 +76,13 @@ private:
   typedef std::list<VarLoc> VarLocList;
   typedef SmallDenseMap<const MachineBasicBlock *, VarLocList> VarLocInMBB;
 
   typedef std::list<VarLoc> VarLocList;
   typedef SmallDenseMap<const MachineBasicBlock *, VarLocList> VarLocInMBB;
 

-  bool OLChanged; // OutgoingLocs got changed for this bb.
-  bool MBBJoined; // The MBB was joined.
-

   void transferDebugValue(MachineInstr &MI, VarLocList &OpenRanges);
   void transferRegisterDef(MachineInstr &MI, VarLocList &OpenRanges);
   void transferDebugValue(MachineInstr &MI, VarLocList &OpenRanges);
   void transferRegisterDef(MachineInstr &MI, VarLocList &OpenRanges);

-  void transferTerminatorInst(MachineInstr &MI, VarLocList &OpenRanges,
+  bool transferTerminatorInst(MachineInstr &MI, VarLocList &OpenRanges,

                               VarLocInMBB &OutLocs);
                               VarLocInMBB &OutLocs);

-  void transfer(MachineInstr &MI, VarLocList &OpenRanges, VarLocInMBB &OutLocs);
+  bool transfer(MachineInstr &MI, VarLocList &OpenRanges, VarLocInMBB &OutLocs);

 
 

-  void join(MachineBasicBlock &MBB, VarLocInMBB &OutLocs, VarLocInMBB &InLocs);
+  bool join(MachineBasicBlock &MBB, VarLocInMBB &OutLocs, VarLocInMBB &InLocs);

 
   bool ExtendRanges(MachineFunction &MF);
 
 
   bool ExtendRanges(MachineFunction &MF);
 


@@ -225,15 +222,16 @@ void LiveDebugValues::transferRegisterDef(MachineInstr &MI,
 }
 
 /// Terminate all open ranges at the end of the current basic block.
 }
 
 /// Terminate all open ranges at the end of the current basic block.

-void LiveDebugValues::transferTerminatorInst(MachineInstr &MI,
+bool LiveDebugValues::transferTerminatorInst(MachineInstr &MI,

                                              VarLocList &OpenRanges,
                                              VarLocInMBB &OutLocs) {
                                              VarLocList &OpenRanges,
                                              VarLocInMBB &OutLocs) {

+  bool Changed = false;

   const MachineBasicBlock *CurMBB = MI.getParent();
   if (!(MI.isTerminator() || (&MI == &CurMBB->instr_back())))
   const MachineBasicBlock *CurMBB = MI.getParent();
   if (!(MI.isTerminator() || (&MI == &CurMBB->instr_back())))

-    return;
+    return false;

 
   if (OpenRanges.empty())
 
   if (OpenRanges.empty())

-    return;
+    return false;

 
   VarLocList &VLL = OutLocs[CurMBB];
 
 
   VarLocList &VLL = OutLocs[CurMBB];
 


@@ -244,28 +242,30 @@ void LiveDebugValues::transferTerminatorInst(MachineInstr &MI,
     if (std::find_if(VLL.begin(), VLL.end(),
                      [&](const VarLoc &V) { return (OR == V); }) == VLL.end()) {
       VLL.push_back(std::move(OR));
     if (std::find_if(VLL.begin(), VLL.end(),
                      [&](const VarLoc &V) { return (OR == V); }) == VLL.end()) {
       VLL.push_back(std::move(OR));

-      OLChanged = true;
+      Changed = true;

     }
   }
   OpenRanges.clear();
     }
   }
   OpenRanges.clear();

+  return Changed;

 }
 
 /// This routine creates OpenRanges and OutLocs.
 }
 
 /// This routine creates OpenRanges and OutLocs.

-void LiveDebugValues::transfer(MachineInstr &MI, VarLocList &OpenRanges,
+bool LiveDebugValues::transfer(MachineInstr &MI, VarLocList &OpenRanges,

                                VarLocInMBB &OutLocs) {
                                VarLocInMBB &OutLocs) {

+  bool Changed = false;

   transferDebugValue(MI, OpenRanges);
   transferRegisterDef(MI, OpenRanges);
   transferDebugValue(MI, OpenRanges);
   transferRegisterDef(MI, OpenRanges);

-  transferTerminatorInst(MI, OpenRanges, OutLocs);
+  Changed = transferTerminatorInst(MI, OpenRanges, OutLocs);
+  return Changed;

 }
 
 /// This routine joins the analysis results of all incoming edges in @MBB by
 /// inserting a new DBG_VALUE instruction at the start of the @MBB - if the same
 /// source variable in all the predecessors of @MBB reside in the same location.
 }
 
 /// This routine joins the analysis results of all incoming edges in @MBB by
 /// inserting a new DBG_VALUE instruction at the start of the @MBB - if the same
 /// source variable in all the predecessors of @MBB reside in the same location.

-void LiveDebugValues::join(MachineBasicBlock &MBB, VarLocInMBB &OutLocs,
+bool LiveDebugValues::join(MachineBasicBlock &MBB, VarLocInMBB &OutLocs,

                            VarLocInMBB &InLocs) {
   DEBUG(dbgs() << "join MBB: " << MBB.getName() << "\n");
                            VarLocInMBB &InLocs) {
   DEBUG(dbgs() << "join MBB: " << MBB.getName() << "\n");

-
-  MBBJoined = false;
+  bool Changed = false;

 
   VarLocList InLocsT; // Temporary incoming locations.
 
 
   VarLocList InLocsT; // Temporary incoming locations.
 


@@ -275,7 +275,7 @@ void LiveDebugValues::join(MachineBasicBlock &MBB, VarLocInMBB &OutLocs,
     auto OL = OutLocs.find(p);
     // Join is null in case of empty OutLocs from any of the pred.
     if (OL == OutLocs.end())
     auto OL = OutLocs.find(p);
     // Join is null in case of empty OutLocs from any of the pred.
     if (OL == OutLocs.end())

-      return;
+      return false;

 
     // Just copy over the Out locs to incoming locs for the first predecessor.
     if (p == *MBB.pred_begin()) {
 
     // Just copy over the Out locs to incoming locs for the first predecessor.
     if (p == *MBB.pred_begin()) {


@@ -285,18 +285,16 @@ void LiveDebugValues::join(MachineBasicBlock &MBB, VarLocInMBB &OutLocs,
 
     // Join with this predecessor.
     VarLocList &VLL = OL->second;
 
     // Join with this predecessor.
     VarLocList &VLL = OL->second;

-    InLocsT.erase(std::remove_if(InLocsT.begin(), InLocsT.end(),
-                                 [&](VarLoc &ILT) {
-                                   return (std::find_if(VLL.begin(), VLL.end(),
-                                                        [&](const VarLoc &V) {
-                                                          return (ILT == V);
-                                                        }) == VLL.end());
-                                 }),
-                  InLocsT.end());
+    InLocsT.erase(
+        std::remove_if(InLocsT.begin(), InLocsT.end(), [&](VarLoc &ILT) {
+          return (std::find_if(VLL.begin(), VLL.end(), [&](const VarLoc &V) {
+                    return (ILT == V);
+                  }) == VLL.end());
+        }), InLocsT.end());

   }
 
   if (InLocsT.empty())
   }
 
   if (InLocsT.empty())

-    return;
+    return false;

 
   VarLocList &ILL = InLocs[&MBB];
 
 
   VarLocList &ILL = InLocs[&MBB];
 


@@ -317,12 +315,13 @@ void LiveDebugValues::join(MachineBasicBlock &MBB, VarLocInMBB &OutLocs,
         MI->getOperand(1).setImm(DMI->getOperand(1).getImm());
       DEBUG(dbgs() << "Inserted: "; MI->dump(););
       ++NumInserted;
         MI->getOperand(1).setImm(DMI->getOperand(1).getImm());
       DEBUG(dbgs() << "Inserted: "; MI->dump(););
       ++NumInserted;

-      MBBJoined = true; // rerun transfer().
+      Changed = true;

 
       VarLoc V(ILT.Var, MI);
       ILL.push_back(std::move(V));
     }
   }
 
       VarLoc V(ILT.Var, MI);
       ILL.push_back(std::move(V));
     }
   }

+  return Changed;

 }
 
 /// Calculate the liveness information for the given machine function and
 }
 
 /// Calculate the liveness information for the given machine function and


@@ -332,7 +331,8 @@ bool LiveDebugValues::ExtendRanges(MachineFunction &MF) {
   DEBUG(dbgs() << "\nDebug Range Extension\n");
 
   bool Changed = false;
   DEBUG(dbgs() << "\nDebug Range Extension\n");
 
   bool Changed = false;

-  OLChanged = MBBJoined = false;
+  bool OLChanged = false;
+  bool MBBJoined = false;

 
   VarLocList OpenRanges; // Ranges that are open until end of bb.
   VarLocInMBB OutLocs;   // Ranges that exist beyond bb.
 
   VarLocList OpenRanges; // Ranges that are open until end of bb.
   VarLocInMBB OutLocs;   // Ranges that exist beyond bb.


@@ -356,12 +356,13 @@ bool LiveDebugValues::ExtendRanges(MachineFunction &MF) {
     MachineBasicBlock *MBB = BBWorklist.front();
     BBWorklist.pop_front();
 
     MachineBasicBlock *MBB = BBWorklist.front();
     BBWorklist.pop_front();
 

-    join(*MBB, OutLocs, InLocs);
+    MBBJoined = join(*MBB, OutLocs, InLocs);

 
     if (MBBJoined) {
 
     if (MBBJoined) {

+      MBBJoined = false;

       Changed = true;
       for (auto &MI : *MBB)
       Changed = true;
       for (auto &MI : *MBB)

-        transfer(MI, OpenRanges, OutLocs);
+        OLChanged |= transfer(MI, OpenRanges, OutLocs);

       DEBUG(printVarLocInMBB(OutLocs, "OutLocs after propagating", dbgs()));
       DEBUG(printVarLocInMBB(InLocs, "InLocs after propagating", dbgs()));
 
       DEBUG(printVarLocInMBB(OutLocs, "OutLocs after propagating", dbgs()));
       DEBUG(printVarLocInMBB(InLocs, "InLocs after propagating", dbgs()));