Merge remote-tracking branch 'origin/master' into master-next

swift-ci · swift-ci · commit c5327439bbb5 · 2019-09-25T17:09:49.000-07:00
diff --git a/include/swift/Remote/MetadataReader.h b/include/swift/Remote/MetadataReader.h
@@ -787,7 +787,7 @@ class MetadataReader {
       baseSize = sizeof(TargetAnonymousContextDescriptor<Runtime>);
       if (AnonymousContextDescriptorFlags(flags.getKindSpecificFlags())
             .hasMangledName()) {
-        baseSize += sizeof(TargetMangledContextName<Runtime>);
+        metadataInitSize = sizeof(TargetMangledContextName<Runtime>);
       }
       break;
     case ContextDescriptorKind::Class:

Original file line number	Diff line number	Diff line change
`@@ -787,7 +787,7 @@ class MetadataReader {`
`787`	`787`	`baseSize = sizeof(TargetAnonymousContextDescriptor<Runtime>);`
`788`	`788`	`if (AnonymousContextDescriptorFlags(flags.getKindSpecificFlags())`
`789`	`789`	`.hasMangledName()) {`
`790`		`- baseSize += sizeof(TargetMangledContextName<Runtime>);`
	`790`	`+ metadataInitSize = sizeof(TargetMangledContextName<Runtime>);`
`791`	`791`	`}`
`792`	`792`	`break;`
`793`	`793`	`case ContextDescriptorKind::Class:`