Merge branch 'codeql-cli-2.11.4' into subatoi/codeql-cli-2.11.4

subatoi · web-flow · commit 40c2b3c43bd2 · 2022-11-23T10:18:46.000Z
diff --git a/swift/extractor/SwiftExtractor.cpp b/swift/extractor/SwiftExtractor.cpp
@@ -46,7 +46,6 @@ static void archiveFile(const SwiftExtractorConfiguration& config, swift::Source
   if (ec) {
     std::cerr << "Cannot archive source file " << srcFilePath << " -> " << dstFilePath << ": "
               << ec.message() << "\n";
-    std::abort();
   }
 }
 
diff --git a/swift/extractor/remapping/SwiftOpenInterception.macOS.cpp b/swift/extractor/remapping/SwiftOpenInterception.macOS.cpp
@@ -61,7 +61,7 @@ void finalizeRemapping(
     }
     auto hash = originalHashFile(original);
     auto hashed = scratchDir / hash;
-    if (!hash.empty() && fs::exists(hashed)) {
+    if (!hash.empty() && fs::exists(patched)) {
       std::error_code ec;
       fs::create_symlink(/* target */ patched, /* symlink */ hashed, ec);
       if (ec) {

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,6 @@ static void archiveFile(const SwiftExtractorConfiguration& config, swift::Source`
`46`	`46`	`if (ec) {`
`47`	`47`	`std::cerr << "Cannot archive source file " << srcFilePath << " -> " << dstFilePath << ": "`
`48`	`48`	`<< ec.message() << "\n";`
`49`		`- std::abort();`
`50`	`49`	`}`
`51`	`50`	`}`
`52`	`51`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ void finalizeRemapping(`
`61`	`61`	`}`
`62`	`62`	`auto hash = originalHashFile(original);`
`63`	`63`	`auto hashed = scratchDir / hash;`
`64`		`- if (!hash.empty() && fs::exists(hashed)) {`
	`64`	`+ if (!hash.empty() && fs::exists(patched)) {`
`65`	`65`	`std::error_code ec;`
`66`	`66`	`fs::create_symlink(/* target / patched, / symlink */ hashed, ec);`
`67`	`67`	`if (ec) {`