Update and fix bootstrap process logic

Author: SahilPatidar

compiler-rt/lib/orc/common.h

@@ -14,18 +14,11 @@
 #define ORC_RT_COMMON_H
 
 #include "compiler.h"
-#include "orc_rt/c_api.h"
-#include <type_traits>
-
-#include "bitmask_enum.h"
-#include "debug.h"
 #include "error.h"
 #include "executor_address.h"
+#include "orc_rt/c_api.h"
+#include <type_traits>
 #include <algorithm>
-#include <ios>
-#include <map>
-#include <mutex>
-#include <sstream>
 #include <vector>
 
 /// This macro should be used to define tags that will be associated with
@@ -60,86 +53,87 @@ __orc_rt_jit_dispatch(__orc_rt_Opaque *DispatchCtx, const void *FnTag,
 /// sections, selector refs, etc.)
 template <typename RecordElement> class RecordSectionsTracker {
 public:
-/// Add a section to the "new" list.
-void add(__orc_rt::span<RecordElement> Sec) { New.push_back(std::move(Sec)); }
-
-/// Returns true if there are new sections to process.
-bool hasNewSections() const { return !New.empty(); }
-
-/// Returns the number of new sections to process.
-size_t numNewSections() const { return New.size(); }
-
-/// Process all new sections.
-template <typename ProcessSectionFunc>
-std::enable_if_t<std::is_void_v<
-    std::invoke_result_t<ProcessSectionFunc, __orc_rt::span<RecordElement>>>>
-processNewSections(ProcessSectionFunc &&ProcessSection) {
-  for (auto &Sec : New)
-    ProcessSection(Sec);
-  moveNewToProcessed();
-}
-
-/// Proces all new sections with a fallible handler.
-///
-/// Successfully handled sections will be moved to the Processed
-/// list.
-template <typename ProcessSectionFunc>
-std::enable_if_t<
-    std::is_same_v<__orc_rt::Error, std::invoke_result_t<ProcessSectionFunc,
-                                                __orc_rt::span<RecordElement>>>,
-    __orc_rt::Error>
-processNewSections(ProcessSectionFunc &&ProcessSection) {
-  for (size_t I = 0; I != New.size(); ++I) {
-    if (auto Err = ProcessSection(New[I])) {
-      for (size_t J = 0; J != I; ++J)
-        Processed.push_back(New[J]);
-      New.erase(New.begin(), New.begin() + I);
-      return Err;
+  /// Add a section to the "new" list.
+  void add(__orc_rt::span<RecordElement> Sec) { New.push_back(std::move(Sec)); }
+
+  /// Returns true if there are new sections to process.
+  bool hasNewSections() const { return !New.empty(); }
+
+  /// Returns the number of new sections to process.
+  size_t numNewSections() const { return New.size(); }
+
+  /// Process all new sections.
+  template <typename ProcessSectionFunc>
+  std::enable_if_t<std::is_void_v<
+      std::invoke_result_t<ProcessSectionFunc, __orc_rt::span<RecordElement>>>>
+  processNewSections(ProcessSectionFunc &&ProcessSection) {
+    for (auto &Sec : New)
+      ProcessSection(Sec);
+    moveNewToProcessed();
+  }
+
+  /// Proces all new sections with a fallible handler.
+  ///
+  /// Successfully handled sections will be moved to the Processed
+  /// list.
+  template <typename ProcessSectionFunc>
+  std::enable_if_t<
+      std::is_same_v<__orc_rt::Error,
+                     std::invoke_result_t<ProcessSectionFunc,
+                                          __orc_rt::span<RecordElement>>>,
+      __orc_rt::Error>
+  processNewSections(ProcessSectionFunc &&ProcessSection) {
+    for (size_t I = 0; I != New.size(); ++I) {
+      if (auto Err = ProcessSection(New[I])) {
+        for (size_t J = 0; J != I; ++J)
+          Processed.push_back(New[J]);
+        New.erase(New.begin(), New.begin() + I);
+        return Err;
+      }
     }
+    moveNewToProcessed();
+    return __orc_rt::Error::success();
+  }
+
+  /// Move all sections back to New for reprocessing.
+  void reset() {
+    moveNewToProcessed();
+    New = std::move(Processed);
+  }
+
+  /// Remove the section with the given range.
+  bool removeIfPresent(__orc_rt::ExecutorAddrRange R) {
+    if (removeIfPresent(New, R))
+      return true;
+    return removeIfPresent(Processed, R);
   }
-  moveNewToProcessed();
-  return __orc_rt::Error::success();
-}
-
-/// Move all sections back to New for reprocessing.
-void reset() {
-  moveNewToProcessed();
-  New = std::move(Processed);
-}
-
-/// Remove the section with the given range.
-bool removeIfPresent(__orc_rt::ExecutorAddrRange R) {
-  if (removeIfPresent(New, R))
-    return true;
-  return removeIfPresent(Processed, R);
-}
 
 private:
-void moveNewToProcessed() {
-  if (Processed.empty())
-    Processed = std::move(New);
-  else {
-    Processed.reserve(Processed.size() + New.size());
-    std::copy(New.begin(), New.end(), std::back_inserter(Processed));
-    New.clear();
+  void moveNewToProcessed() {
+    if (Processed.empty())
+      Processed = std::move(New);
+    else {
+      Processed.reserve(Processed.size() + New.size());
+      std::copy(New.begin(), New.end(), std::back_inserter(Processed));
+      New.clear();
+    }
   }
-}
-
-bool removeIfPresent(std::vector<__orc_rt::span<RecordElement>> &V,
-                     __orc_rt::ExecutorAddrRange R) {
-  auto RI = std::find_if(
-    V.rbegin(), V.rend(),
-    [RS = R.toSpan<RecordElement>()](const __orc_rt::span<RecordElement> &E) {
-        return E.data() == RS.data();
-    });
-  if (RI != V.rend()) {
-    V.erase(std::next(RI).base());
-    return true;
+
+  bool removeIfPresent(std::vector<__orc_rt::span<RecordElement>> &V,
+                       __orc_rt::ExecutorAddrRange R) {
+    auto RI = std::find_if(V.rbegin(), V.rend(),
+                           [RS = R.toSpan<RecordElement>()](
+                               const __orc_rt::span<RecordElement> &E) {
+                             return E.data() == RS.data();
+                           });
+    if (RI != V.rend()) {
+      V.erase(std::next(RI).base());
+      return true;
+    }
+    return false;
   }
-  return false;
-}
 
-std::vector<__orc_rt::span<RecordElement>> Processed;
-std::vector<__orc_rt::span<RecordElement>> New;
+  std::vector<__orc_rt::span<RecordElement>> Processed;
+  std::vector<__orc_rt::span<RecordElement>> New;
 };
 #endif // ORC_RT_COMMON_H