Merge pull request #11381 from github/alexdenisov/swift-fix-remapping-regression

redsun82 · web-flow · commit d345cec339f8 · 2022-11-23T06:56:05.000+01:00
Swift: fix remapping bug
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
`@@ -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) {`