Merge pull request #41196 from apple/Reflection-Fix-failing-arm64e-test

kastiglione · kastiglione · commit d31d5ed10d0e · 2022-02-04T11:08:23.000-08:00
[Reflection] Fix failing arm64e test (cherry picked from commit 5a5f4b0)
diff --git a/include/swift/Remote/MetadataReader.h b/include/swift/Remote/MetadataReader.h
@@ -419,8 +419,10 @@ class MetadataReader {
         }
       } else {
         resolved = Reader->resolvePointer(RemoteAddress(remoteAddress), 0);
-        if (!resolved)
+        if (resolved.getSymbol().empty()) {
+          // No symbol found, use the already calculated address.
           resolved = RemoteAbsolutePointer("", remoteAddress);
+        }
       }
 
       switch (kind) {

Original file line number	Diff line number	Diff line change
`@@ -419,8 +419,10 @@ class MetadataReader {`
`419`	`419`	`}`
`420`	`420`	`} else {`
`421`	`421`	`resolved = Reader->resolvePointer(RemoteAddress(remoteAddress), 0);`
`422`		`- if (!resolved)`
	`422`	`+ if (resolved.getSymbol().empty()) {`
	`423`	`+ // No symbol found, use the already calculated address.`
`423`	`424`	`resolved = RemoteAbsolutePointer("", remoteAddress);`
	`425`	`+ }`
`424`	`426`	`}`
`425`	`427`
`426`	`428`	`switch (kind) {`