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

kastiglione · web-flow · commit 0c90aac000b4 · 2022-01-31T10:16:22.000-08:00
[Reflection] Resolve direct symbolic reference pointers
diff --git a/include/swift/Remote/MetadataReader.h b/include/swift/Remote/MetadataReader.h
@@ -420,7 +420,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
`@@ -420,7 +420,9 @@ class MetadataReader {`
`420`	`420`	`return nullptr;`
`421`	`421`	`}`
`422`	`422`	`} else {`
`423`		`- resolved = RemoteAbsolutePointer("", remoteAddress);`
	`423`	`+ resolved = Reader->resolvePointer(RemoteAddress(remoteAddress), 0);`
	`424`	`+ if (!resolved)`
	`425`	`+ resolved = RemoteAbsolutePointer("", remoteAddress);`
`424`	`426`	`}`
`425`	`427`
`426`	`428`	`switch (kind) {`