Transfer weights in transferSuccessorsAndUpdatePHIs().

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

diff --git a/lib/CodeGen/MachineBasicBlock.cpp b/lib/CodeGen/MachineBasicBlock.cpp
index 8bf0cc96565c066874bbf49f139f600a9011af8c..fa6b4502c4ab746b9d98dae601b6ba13e8f9b083 100644 (file)
--- a/lib/CodeGen/MachineBasicBlock.cpp
+++ b/lib/CodeGen/MachineBasicBlock.cpp
@@ -535,14 +535,13 @@ void MachineBasicBlock::transferSuccessors(MachineBasicBlock *fromMBB) {
 
   while (!fromMBB->succ_empty()) {
     MachineBasicBlock *Succ = *fromMBB->succ_begin();
 
   while (!fromMBB->succ_empty()) {
     MachineBasicBlock *Succ = *fromMBB->succ_begin();

-    uint32_t weight = 0;
-
+    uint32_t Weight = 0;

 
     // If Weight list is empty it means we don't use it (disabled optimization).
     if (!fromMBB->Weights.empty())
 
     // If Weight list is empty it means we don't use it (disabled optimization).
     if (!fromMBB->Weights.empty())

-      weight = *fromMBB->Weights.begin();
+      Weight = *fromMBB->Weights.begin();

 
 

-    addSuccessor(Succ, weight);
+    addSuccessor(Succ, Weight);

     fromMBB->removeSuccessor(Succ);
   }
 }
     fromMBB->removeSuccessor(Succ);
   }
 }


@@ -554,7 +553,10 @@ MachineBasicBlock::transferSuccessorsAndUpdatePHIs(MachineBasicBlock *fromMBB) {
 
   while (!fromMBB->succ_empty()) {
     MachineBasicBlock *Succ = *fromMBB->succ_begin();
 
   while (!fromMBB->succ_empty()) {
     MachineBasicBlock *Succ = *fromMBB->succ_begin();

-    addSuccessor(Succ);
+    uint32_t Weight = 0;
+    if (!fromMBB->Weights.empty())
+      Weight = *fromMBB->Weights.begin();
+    addSuccessor(Succ, Weight);

     fromMBB->removeSuccessor(Succ);
 
     // Fix up any PHI nodes in the successor.
     fromMBB->removeSuccessor(Succ);
 
     // Fix up any PHI nodes in the successor.