[BOLT] fix build with gcc-4.8.5

Summary: These are two minor changes to make it copatible with gcc-4.8.5 (cherry picked from FBD9884971)
llvm · Sep 17, 2018 · cc2276d · cc2276d
1 parent ce508b5
commit cc2276d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/bolt/src/BinaryBasicBlock.h b/bolt/src/BinaryBasicBlock.h
@@ -736,7 +736,9 @@ class BinaryBasicBlock {
     adjustNumPseudos(*II, -1);
     adjustNumPseudos(Begin, End, 1);
 
-    return Instructions.insert(Instructions.erase(II), Begin, End);
+    auto i = II - Instructions.begin();
+    Instructions.insert(Instructions.erase(II), Begin, End);
+    return i + Instructions.begin();
   }
 
   iterator replaceInstruction(iterator II,

diff --git a/bolt/src/DataAggregator.cpp b/bolt/src/DataAggregator.cpp
@@ -903,7 +903,7 @@ ErrorOr<AggregatedLBREntry> DataAggregator::parseAggregatedLBREntry() {
   auto TypeOrErr = parseString(FieldSeparator);
   if (std::error_code EC = TypeOrErr.getError())
     return EC;
-  auto Type{AggregatedLBREntry::BRANCH};
+  auto Type = AggregatedLBREntry::BRANCH;
   if (TypeOrErr.get() == "B") {
     Type = AggregatedLBREntry::BRANCH;
   } else if (TypeOrErr.get() == "F") {