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

kastiglione · web-flow · commit 5a5f4b0f815d · 2022-02-04T09:49:41.000-08:00
[Reflection] Fix failing arm64e test
diff --git a/include/swift/Remote/MetadataReader.h b/include/swift/Remote/MetadataReader.h
@@ -421,8 +421,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
`@@ -421,8 +421,10 @@ class MetadataReader {`
`421`	`421`	`}`
`422`	`422`	`} else {`
`423`	`423`	`resolved = Reader->resolvePointer(RemoteAddress(remoteAddress), 0);`
`424`		`- if (!resolved)`
	`424`	`+ if (resolved.getSymbol().empty()) {`
	`425`	`+ // No symbol found, use the already calculated address.`
`425`	`426`	`resolved = RemoteAbsolutePointer("", remoteAddress);`
	`427`	`+ }`
`426`	`428`	`}`
`427`	`429`
`428`	`430`	`switch (kind) {`