Skip to content

Commit 72e80c2

Browse files
committed
Bump the module format version
We've changed *what* is serialized by changing the way @_dynamicReplacement is type checked, but not *how* it's serialized. Bump the format so there aren't strange incompatibilities because of this.
1 parent 4e36fc0 commit 72e80c2

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

lib/IRGen/GenDecl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2369,7 +2369,7 @@ static void emitDynamicallyReplaceableThunk(IRGenModule &IGM,
23692369
void IRGenModule::emitOpaqueTypeDescriptorAccessor(OpaqueTypeDecl *opaque) {
23702370
auto *namingDecl = opaque->getNamingDecl();
23712371
auto *abstractStorage = dyn_cast<AbstractStorageDecl>(namingDecl);
2372-
2372+
23732373
bool isNativeDynamic = false;
23742374
const bool isDynamicReplacement = namingDecl->getDynamicallyReplacedDecl();
23752375

lib/Sema/TypeCheckDeclObjC.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1048,9 +1048,6 @@ Optional<ObjCReason> shouldMarkAsObjC(const ValueDecl *VD, bool allowImplicit) {
10481048
if (auto *replaced = VD->getDynamicallyReplacedDecl()) {
10491049
if (replaced->isObjC())
10501050
return ObjCReason(ObjCReason::ImplicitlyObjC);
1051-
} else if (auto *replaced = VD->getDynamicallyReplacedDecl()) {
1052-
if (replaced->isObjC())
1053-
return ObjCReason(ObjCReason::ImplicitlyObjC);
10541051
}
10551052
}
10561053

lib/Serialization/ModuleFormat.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ const uint16_t SWIFTMODULE_VERSION_MAJOR = 0;
5252
/// describe what change you made. The content of this comment isn't important;
5353
/// it just ensures a conflict if two people change the module format.
5454
/// Don't worry about adhering to the 80-column limit for this line.
55-
const uint16_t SWIFTMODULE_VERSION_MINOR = 525; // target formal type for casts
55+
const uint16_t SWIFTMODULE_VERSION_MINOR = 526; // @_dynamicReplacement adjustments
5656

5757
/// A standard hash seed used for all string hashes in a serialized module.
5858
///

0 commit comments

Comments
 (0)