Update gcc 4.3 warnings fix patch with recent head changes
llvm-svn: 47368
diff --git a/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp b/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp
index 2cda597..17aaa75 100644
--- a/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp
@@ -1269,15 +1269,18 @@
unsigned RScratch = calcMaxScratches(right);
if (LScratch > RScratch)
return true;
- else if (LScratch == RScratch)
+ else if (LScratch == RScratch) {
if (left->Height > right->Height)
return true;
- else if (left->Height == right->Height)
+ else if (left->Height == right->Height) {
if (left->Depth < right->Depth)
return true;
- else if (left->Depth == right->Depth)
+ else if (left->Depth == right->Depth) {
if (left->CycleBound > right->CycleBound)
return true;
+ }
+ }
+ }
}
}
return false;
@@ -1509,15 +1512,19 @@
if (LPriority+LBonus < RPriority+RBonus)
return true;
- else if (LPriority == RPriority)
+ else if (LPriority == RPriority) {
if (left->Depth < right->Depth)
return true;
- else if (left->Depth == right->Depth)
+ else if (left->Depth == right->Depth) {
if (left->NumSuccsLeft > right->NumSuccsLeft)
return true;
- else if (left->NumSuccsLeft == right->NumSuccsLeft)
+ else if (left->NumSuccsLeft == right->NumSuccsLeft) {
if (left->CycleBound > right->CycleBound)
return true;
+ }
+ }
+ }
+
return false;
}