Merge pull request swiftlang#40939 from mikeash/bump-reflection-libraryversion

swift-ci · web-flow · commit 68c458674f34 · 2022-01-20T18:51:02.000-08:00
diff --git a/include/swift/SwiftRemoteMirror/SwiftRemoteMirror.h b/include/swift/SwiftRemoteMirror/SwiftRemoteMirror.h
@@ -47,6 +47,8 @@ extern unsigned long long swift_reflection_classIsSwiftMask;
 /// 2 - swift_reflection_iterateAsyncTaskAllocations has been replaced by
 ///     swift_reflection_asyncTaskSlabPointer and
 ///     swift_reflection_asyncTaskSlabAllocations.
+/// 3 - The async task slab size calculation is fixed to account for alignment,
+///     no longer short by 8 bytes.
 SWIFT_REMOTE_MIRROR_LINKAGE extern uint32_t swift_reflection_libraryVersion;
 
 /// Get the metadata version supported by the Remote Mirror library.
diff --git a/stdlib/public/SwiftRemoteMirror/SwiftRemoteMirror.cpp b/stdlib/public/SwiftRemoteMirror/SwiftRemoteMirror.cpp
@@ -19,7 +19,7 @@ extern "C" {
 SWIFT_REMOTE_MIRROR_LINKAGE
 unsigned long long swift_reflection_classIsSwiftMask = 2;
 
-SWIFT_REMOTE_MIRROR_LINKAGE uint32_t swift_reflection_libraryVersion = 2;
+SWIFT_REMOTE_MIRROR_LINKAGE uint32_t swift_reflection_libraryVersion = 3;
 }
 
 #include "swift/Demangling/Demangler.h"

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ extern "C" {`
`19`	`19`	`SWIFT_REMOTE_MIRROR_LINKAGE`
`20`	`20`	`unsigned long long swift_reflection_classIsSwiftMask = 2;`
`21`	`21`
`22`		`-SWIFT_REMOTE_MIRROR_LINKAGE uint32_t swift_reflection_libraryVersion = 2;`
	`22`	`+SWIFT_REMOTE_MIRROR_LINKAGE uint32_t swift_reflection_libraryVersion = 3;`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`#include "swift/Demangling/Demangler.h"`