[BOLT] Update updateRtFiniReloc to return error instead of assertions

Author: Vasily Leonenko

bolt/include/bolt/Rewrite/RewriteInstance.h

@@ -109,7 +109,7 @@ class RewriteInstance {
 
   /// If DT_FINI_ARRAY is used for instrumentation, update the relocation of its
   /// first entry to point to the instrumentation library's fini address.
-  void updateRtFiniReloc();
+  Error updateRtFiniReloc();
 
   /// Create and initialize metadata rewriters for this instance.
   void initializeMetadataManager();

bolt/lib/Rewrite/RewriteInstance.cpp

@@ -814,7 +814,8 @@ Error RewriteInstance::run() {
   if (opts::Instrument && !BC->IsStaticExecutable) {
     if (Error E = updateRtInitReloc())
       return E;
-    updateRtFiniReloc();
+    if (Error E = updateRtFiniReloc())
+      return E;
   }
 
   if (opts::OutputFilename == "/dev/null") {
@@ -1597,33 +1598,36 @@ Error RewriteInstance::updateRtInitReloc() {
   return Error::success();
 }
 
-void RewriteInstance::updateRtFiniReloc() {
+Error RewriteInstance::updateRtFiniReloc() {
   // Updating DT_FINI is handled by patchELFDynamic.
   if (BC->FiniAddress)
-    return;
+    return Error::success();
 
   const RuntimeLibrary *RT = BC->getRuntimeLibrary();
   if (!RT || !RT->getRuntimeFiniAddress())
-    return;
+    return Error::success();
 
   // It is still possible to generate profile without fini hook if
   // InstrumentationSleepTime is set
   if ((!BC->FiniArrayAddress || !BC->FiniArraySize) &&
       opts::InstrumentationSleepTime > 0) {
-    return;
+    return Error::success();
   }
 
-  assert(BC->FiniArrayAddress && BC->FiniArraySize &&
-         "inconsistent .fini_array state");
+  if (!BC->FiniArrayAddress || !BC->FiniArraySize)
+    return createStringError(std::errc::not_supported,
+                             "inconsistent .fini_array state");
 
   ErrorOr<BinarySection &> FiniArraySection =
       BC->getSectionForAddress(*BC->FiniArrayAddress);
-  assert(FiniArraySection && ".fini_array removed");
+  if (!FiniArraySection)
+    return createStringError(std::errc::not_supported, ".fini_array removed");
 
   if (std::optional<Relocation> Reloc =
           FiniArraySection->takeDynamicRelocationAt(0)) {
-    assert(Reloc->Addend == BC->FiniFunctionAddress &&
-           "inconsistent .fini_array dynamic relocation");
+    if (Reloc->Addend != BC->FiniFunctionAddress)
+      return createStringError(std::errc::not_supported,
+                               "inconsistent .fini_array dynamic relocation");
     Reloc->Addend = RT->getRuntimeFiniAddress();
     FiniArraySection->addDynamicRelocation(*Reloc);
   }
@@ -1636,6 +1640,7 @@ void RewriteInstance::updateRtFiniReloc() {
   FiniArraySection->addPendingRelocation(Relocation{
       /*Offset*/ 0, /*Symbol*/ nullptr, /*Type*/ Relocation::getAbs64(),
       /*Addend*/ RT->getRuntimeFiniAddress(), /*Value*/ 0});
+  return Error::success();
 }
 
 void RewriteInstance::registerFragments() {