---

swift-ci · swift-ci · commit c2257f784f8e · 2019-09-24T08:04:26.000-07:00
yaml --- r: 348643 b: refs/heads/master c: 264c8fe h: refs/heads/master i: 348641: 04a8df6 348639: 958e277
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: ed72643d1b09e4df6b2e535df6af906b47e6292f
+refs/heads/master: 264c8fe752cd99b1db2ebf148128128a38721732
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
diff --git a/trunk/include/swift/Remote/MetadataReader.h b/trunk/include/swift/Remote/MetadataReader.h
@@ -95,6 +95,8 @@ class RemoteRef {
   uint64_t resolveRelativeAddressData() const {
     int32_t offset;
     memcpy(&offset, LocalBuffer, sizeof(int32_t));
+    if (offset == 0)
+      return 0;
     return Address + (int64_t)offset;
   }
   

Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,8 @@ class RemoteRef {`
`95`	`95`	`uint64_t resolveRelativeAddressData() const {`
`96`	`96`	`int32_t offset;`
`97`	`97`	`memcpy(&offset, LocalBuffer, sizeof(int32_t));`
	`98`	`+ if (offset == 0)`
	`99`	`+ return 0;`
`98`	`100`	`return Address + (int64_t)offset;`
`99`	`101`	`}`
`100`	`102`