[llvm-branch-commits] [llvm-branch] r114224 - in /llvm/branches/release_28: ./ lib/CodeGen/MachineCSE.cpp

[Bill Wendling]

Author: void
Date: Fri Sep 17 17:09:07 2010
New Revision: 114224

URL: http://llvm.org/viewvc/llvm-project?rev=114224&view=rev
Log:
Approved by Evan

$ svn merge -c 114220 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r114220 into '.':
U    lib/CodeGen/MachineCSE.cpp
$ svn merge -c 114222 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r114222 into '.':
G    lib/CodeGen/MachineCSE.cpp


Modified:
    llvm/branches/release_28/   (props changed)
    llvm/branches/release_28/lib/CodeGen/MachineCSE.cpp

Propchange: llvm/branches/release_28/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 17 17:09:07 2010
@@ -1,2 +1,2 @@
 /llvm/branches/Apple/Pertwee:110850,110961
-/llvm/trunk:113057,113109,113123,113146,113158,113255,113257,113260,113297,113299,113303,113322,113345,113365-113366,113394,113483-113485,113557,113576,113600,113603,113615,113637,113764,113820,113828,113848,113894,113911
+/llvm/trunk:113057,113109,113123,113146,113158,113255,113257,113260,113297,113299,113303,113322,113345,113365-113366,113394,113483-113485,113557,113576,113600,113603,113615,113637,113764,113820,113828,113848,113894,113911,114220,114222

Modified: llvm/branches/release_28/lib/CodeGen/MachineCSE.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_28/lib/CodeGen/MachineCSE.cpp?rev=114224&r1=114223&r2=114224&view=diff
==============================================================================
--- llvm/branches/release_28/lib/CodeGen/MachineCSE.cpp (original)
+++ llvm/branches/release_28/lib/CodeGen/MachineCSE.cpp Fri Sep 17 17:09:07 2010
@@ -54,6 +54,11 @@
       AU.addPreserved<MachineDominatorTree>();
     }
 
+    virtual void releaseMemory() {
+      ScopeMap.clear();
+      Exps.clear();
+    }
+
   private:
     const unsigned LookAheadLimit;
     typedef ScopedHashTableScope<MachineInstr*, unsigned,
@@ -101,7 +106,7 @@
     unsigned Reg = MO.getReg();
     if (!Reg || TargetRegisterInfo::isPhysicalRegister(Reg))
       continue;
-    if (!MRI->hasOneUse(Reg))
+    if (!MRI->hasOneNonDBGUse(Reg))
       // Only coalesce single use copies. This ensure the copy will be
       // deleted.
       continue;
@@ -469,6 +474,8 @@
   DenseMap<MachineDomTreeNode*, MachineDomTreeNode*> ParentMap;
   DenseMap<MachineDomTreeNode*, unsigned> OpenChildren;
 
+  CurrVN = 0;
+
   // Perform a DFS walk to determine the order of visit.
   WorkList.push_back(Node);
   do {