Merge pull request #41087 from apple/Reflection-Resolve-direct-symbolic-reference-pointers

kastiglione · kastiglione · commit 7005460171dd · 2022-02-04T11:08:15.000-08:00
[Reflection] Resolve direct symbolic reference pointers (cherry picked from commit 0c90aac)
diff --git a/include/swift/Remote/MetadataReader.h b/include/swift/Remote/MetadataReader.h
@@ -418,7 +418,9 @@ class MetadataReader {
           return nullptr;
         }
       } else {
-        resolved = RemoteAbsolutePointer("", remoteAddress);
+        resolved = Reader->resolvePointer(RemoteAddress(remoteAddress), 0);
+        if (!resolved)
+          resolved = RemoteAbsolutePointer("", remoteAddress);
       }
 
       switch (kind) {

Original file line number	Diff line number	Diff line change
`@@ -418,7 +418,9 @@ class MetadataReader {`
`418`	`418`	`return nullptr;`
`419`	`419`	`}`
`420`	`420`	`} else {`
`421`		`- resolved = RemoteAbsolutePointer("", remoteAddress);`
	`421`	`+ resolved = Reader->resolvePointer(RemoteAddress(remoteAddress), 0);`
	`422`	`+ if (!resolved)`
	`423`	`+ resolved = RemoteAbsolutePointer("", remoteAddress);`
`422`	`424`	`}`
`423`	`425`
`424`	`426`	`switch (kind) {`