Swift: error printing in SwiftInvocationExtractor

redsun82 · redsun82 · commit df84ed595300 · 2023-04-18T12:16:22.000+02:00
diff --git a/swift/extractor/invocation/SwiftInvocationExtractor.cpp b/swift/extractor/invocation/SwiftInvocationExtractor.cpp
@@ -4,13 +4,19 @@
 #include "swift/extractor/trap/generated/TrapTags.h"
 #include "swift/extractor/infra/file/TargetFile.h"
 #include "swift/extractor/infra/file/Path.h"
-#include "swift/extractor/trap/LinkDomain.h"
+#include "swift/extractor/infra/log/SwiftAssert.h"
 
 namespace fs = std::filesystem;
 using namespace std::string_literals;
 
 namespace codeql {
 namespace {
+
+Logger& logger() {
+  static Logger ret{"invocation"};
+  return ret;
+}
+
 std::string getModuleId(const std::string_view& name, const std::string_view& hash) {
   auto ret = "module:"s;
   ret += name;
@@ -108,10 +114,8 @@ void replaceMergedModulesImplementation(const SwiftExtractorState& state,
   fs::copy(getTrapPath(state, mergeTarget, TrapType::linkage),
            getTrapPath(state, mergedPartTarget, TrapType::linkage),
            fs::copy_options::overwrite_existing, ec);
-  if (ec) {
-    std::cerr << "unable to replace trap implementation id for merged module '" << name << "' ("
-              << ec.message() << ")";
-  }
+  CODEQL_ASSERT(!ec, "Unable to replace trap implementation id for merged module '{}' ({})", name,
+                ec);
 }
 
 void emitModuleObjectDependencies(const SwiftExtractorState& state,
