Small fixes

Author: fabianbs96

include/phasar/Utils/Utilities.h

@@ -203,17 +203,36 @@ It remove_by_index(It First, EndIt Last, IdxIt FirstIndex, IdxEndIt LastIndex) {
 
   auto CurrIdx = *FirstIndex;
 
-  /// TODO: Optimize this loop
+  if constexpr (std::is_same_v<It, EndIt> &&
+                std::is_same_v<
+                    std::random_access_iterator_tag,
+                    typename std::iterator_traits<It>::iterator_category>) {
+    size_t GapSize = 1;
+    auto Curr = First + 1;
+
+    while (++FirstIndex != LastIndex) {
+      auto Offset = *FirstIndex - CurrIdx - 1;
+      if (Offset >= std::distance(Curr, Last)) {
+        break;
+      }
+      First = std::move(Curr, Curr + Offset, First);
+      CurrIdx = *FirstIndex;
+      Curr = First + ++GapSize;
+    }
 
-  for (auto I = First; ++I != Last; ++CurrIdx) {
-    if (FirstIndex == LastIndex || CurrIdx != *FirstIndex) {
-      *First++ = std::move(*I);
-      if (FirstIndex != LastIndex) {
-        ++FirstIndex;
+    return std::move(Curr, Last, First);
+  } else {
+
+    for (auto I = First; I != Last; ++CurrIdx, ++I) {
+      if (CurrIdx != *FirstIndex) {
+        *First++ = std::move(*I);
+        if (++FirstIndex == LastIndex) {
+          return std::move(std::next(I), Last, First);
+        }
       }
     }
+    return First;
   }
-  return First;
 }
 
 template <typename Container, typename IdxIt, typename IdxEndIt>

lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSIDESolverConfig.cpp

@@ -7,6 +7,7 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
+#include <ios>
 #include <ostream>
 
 #include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSIDESolverConfig.h"
@@ -67,7 +68,7 @@ ostream &operator<<(ostream &OS, const IFDSIDESolverConfig &SC) {
   return OS << "IFDSIDESolverConfig:\n"
             << "\tfollowReturnsPastSeeds: " << SC.followReturnsPastSeeds()
             << "\n"
-            << "\tautoAddZero: " << SC.autoAddZero() << "\n"
+            << "\tautoAddZero: " << std::boolalpha << SC.autoAddZero() << "\n"
             << "\tcomputeValues: " << SC.computeValues() << "\n"
             << "\trecordEdges: " << SC.recordEdges() << "\n"
             << "\tcomputePersistedSummaries: " << SC.computePersistedSummaries()

tools/phasar-llvm/phasar-llvm.cpp

@@ -8,14 +8,14 @@
  *****************************************************************************/
 
 #include <algorithm>
-#include <boost/program_options/value_semantic.hpp>
 #include <chrono>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "boost/filesystem.hpp"
 #include "boost/program_options.hpp"
+#include "boost/program_options/value_semantic.hpp"
 
 #include "boost/dll.hpp"
 #include "boost/filesystem.hpp"