Addressing reviewers (2)

Author: paschalis-mpeis

bolt/lib/Core/BinaryFunction.cpp

@@ -1689,7 +1689,7 @@ bool BinaryFunction::scanExternalRefs() {
     // Create relocation for every fixup.
     for (const MCFixup &Fixup : Fixups) {
       std::optional<Relocation> Rel = BC.MIB->createRelocation(Fixup, *BC.MAB);
-      // Can be skipped under the right circumstances.
+      // Can be skipped in case of overlow during relocation value encoding.
       Rel->setOptional();
       if (!Rel) {
         Success = false;

bolt/lib/Core/BinarySection.cpp

@@ -190,10 +190,9 @@ void BinarySection::flushPendingRelocations(raw_pwrite_stream &OS,
       // relocations are flushed. Otherwise, PatchEntries should run.
       if (!opts::ForcePatch) {
         BC.errs()
-            << "BOLT-ERROR: Cannot fully run scanExternalRefs as pending "
-               "relocation for symbol "
+            << "BOLT-ERROR: Cannot encode relocation for symbol "
             << Reloc.Symbol->getName()
-            << " is out-of-range. Cannot proceed without using -force-patch\n";
+            << " as it is out-of-range. To proceed must use -force-patch\n";
         exit(1);
       }
 

bolt/unittests/Core/BinaryContext.cpp

@@ -188,9 +188,8 @@ TEST_P(BinaryContextTester,
   EXPECT_EXIT(BS.flushPendingRelocations(
                   OS, [&](const MCSymbol *S) { return 0x800000F; }),
               ::testing::ExitedWithCode(1),
-              "BOLT-ERROR: Cannot fully run scanExternalRefs as pending "
-              "relocation for symbol Func0x4 is out-of-range. Cannot proceed "
-              "without using -force-patch");
+              "BOLT-ERROR: Cannot encode relocation for symbol Func0x4 as it is"
+              " out-of-range. To proceed must use -force-patch");
 }
 
 TEST_P(BinaryContextTester,