Skip to content

[5.1] [Serialization] Preserve whether a raw value is explicit #26331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shahmishal merged 1 commit into from
Jul 24, 2019
Merged

[5.1] [Serialization] Preserve whether a raw value is explicit #26331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion include/swift/Serialization/ModuleFormat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const uint16_t SWIFTMODULE_VERSION_MAJOR = 0;
/// describe what change you made. The content of this comment isn't important;
/// it just ensures a conflict if two people change the module format.
/// Don't worry about adhering to the 80-column limit for this line.
const uint16_t SWIFTMODULE_VERSION_MINOR = 499; // remove 'requires stored property inits'
const uint16_t SWIFTMODULE_VERSION_MINOR = 500; // distinguish implicit raw values for enum cases

using DeclIDField = BCFixed<31>;

Expand Down Expand Up @@ -1190,6 +1190,7 @@ namespace decls_block {
BCFixed<1>, // implicit?
BCFixed<1>, // has payload?
EnumElementRawValueKindField, // raw value kind
BCFixed<1>, // implicit raw value?
BCFixed<1>, // negative raw value?
IdentifierIDField, // raw value
BCFixed<1>, // default argument resilience expansion
Expand Down
7 changes: 4 additions & 3 deletions lib/Serialization/Deserialization.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3668,7 +3668,7 @@ class swift::DeclDeserializer {
Expected<Decl *> deserializeEnumElement(ArrayRef<uint64_t> scratch,
StringRef blobData) {
DeclContextID contextID;
bool isImplicit; bool hasPayload; bool isNegative;
bool isImplicit, hasPayload, isRawValueImplicit, isNegative;
unsigned rawValueKindID;
IdentifierID rawValueData;
uint8_t rawResilienceExpansion;
Expand All @@ -3677,7 +3677,8 @@ class swift::DeclDeserializer {

decls_block::EnumElementLayout::readRecord(scratch, contextID,
isImplicit, hasPayload,
rawValueKindID, isNegative,
rawValueKindID,
isRawValueImplicit, isNegative,
rawValueData,
rawResilienceExpansion,
numArgNames,
Expand Down Expand Up @@ -3724,7 +3725,7 @@ class swift::DeclDeserializer {
case EnumElementRawValueKind::IntegerLiteral: {
auto literalText = MF.getIdentifierText(rawValueData);
auto literal = new (ctx) IntegerLiteralExpr(literalText, SourceLoc(),
/*implicit*/ true);
isRawValueImplicit);
if (isNegative)
literal->setNegative(SourceLoc());
elem->setRawValueExpr(literal);
Expand Down
14 changes: 8 additions & 6 deletions lib/Serialization/Serialization.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3618,15 +3618,16 @@ void Serializer::writeDecl(const Decl *D) {

// We only serialize the raw values of @objc enums, because they're part
// of the ABI. That isn't the case for Swift enums.
auto RawValueKind = EnumElementRawValueKind::None;
bool Negative = false;
auto rawValueKind = EnumElementRawValueKind::None;
bool isNegative = false, isRawValueImplicit = false;
StringRef RawValueText;
if (elem->getParentEnum()->isObjC()) {
// Currently ObjC enums always have integer raw values.
RawValueKind = EnumElementRawValueKind::IntegerLiteral;
rawValueKind = EnumElementRawValueKind::IntegerLiteral;
auto ILE = cast<IntegerLiteralExpr>(elem->getRawValueExpr());
RawValueText = ILE->getDigitsText();
Negative = ILE->isNegative();
isNegative = ILE->isNegative();
isRawValueImplicit = ILE->isImplicit();
}

uint8_t rawResilienceExpansion =
Expand All @@ -3637,8 +3638,9 @@ void Serializer::writeDecl(const Decl *D) {
contextID,
elem->isImplicit(),
elem->hasAssociatedValues(),
(unsigned)RawValueKind,
Negative,
(unsigned)rawValueKind,
isRawValueImplicit,
isNegative,
addUniquedStringRef(RawValueText),
rawResilienceExpansion,
elem->getFullName().getArgumentNames().size()+1,
Expand Down
8 changes: 8 additions & 0 deletions test/ParseableInterface/Inputs/enums-layout-helper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ public enum FutureproofEnum: Int {
case b = 10
// CHECK-NEXT: case c{{$}}
case c = 100
// CHECK-NEXT: case d{{$}}
case d
}

// CHECK-LABEL: public enum FrozenEnum : Swift.Int
Expand All @@ -16,6 +18,8 @@ public enum FutureproofEnum: Int {
case b = 10
// CHECK-NEXT: case c{{$}}
case c = 100
// CHECK-NEXT: case d{{$}}
case d
}

// CHECK-LABEL: public enum FutureproofObjCEnum : Swift.Int
Expand All @@ -26,6 +30,8 @@ public enum FutureproofEnum: Int {
case b = 10
// CHECK-NEXT: case c = 100{{$}}
case c = 100
// CHECK-NEXT: case d{{$}}
case d
}

// CHECK-LABEL: public enum FrozenObjCEnum : Swift.Int
Expand All @@ -36,6 +42,8 @@ public enum FutureproofEnum: Int {
case b = 10
// CHECK-NEXT: case c = 100{{$}}
case c = 100
// CHECK-NEXT: case d{{$}}
case d
}

// CHECK-LABEL: indirect public enum FutureproofIndirectEnum
Expand Down
9 changes: 8 additions & 1 deletion test/ParseableInterface/enums-layout.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
// RUN: %empty-directory(%t)
// RUN: %target-swift-frontend -emit-module-interface-path %t/Lib.swiftinterface -typecheck -enable-library-evolution -enable-objc-interop -disable-objc-attr-requires-foundation-module -swift-version 5 %S/Inputs/enums-layout-helper.swift -module-name Lib
// RUN: %target-build-swift -emit-module-interface-path %t/Lib.swiftinterface -emit-module -o %t/unused.swiftmodule -enable-library-evolution -Xfrontend -enable-objc-interop -Xfrontend -disable-objc-attr-requires-foundation-module -swift-version 5 %S/Inputs/enums-layout-helper.swift -module-name Lib
// RUN: %FileCheck %S/Inputs/enums-layout-helper.swift < %t/Lib.swiftinterface
// RUN: %target-swift-frontend -enable-objc-interop -O -emit-ir -primary-file %s -I %t -Xllvm -swiftmergefunc-threshold=0 | %FileCheck %s

// Try again using a single-frontend build.
// RUN: %empty-directory(%t)
// RUN: %target-build-swift -force-single-frontend-invocation -emit-module-interface-path %t/Lib.swiftinterface -emit-module -o %t/unused.swiftmodule -enable-library-evolution -Xfrontend -enable-objc-interop -Xfrontend -disable-objc-attr-requires-foundation-module -swift-version 5 %S/Inputs/enums-layout-helper.swift -module-name Lib
// RUN: %FileCheck %S/Inputs/enums-layout-helper.swift < %t/Lib.swiftinterface
// RUN: %target-swift-frontend -enable-objc-interop -O -emit-ir -primary-file %s -I %t -Xllvm -swiftmergefunc-threshold=0 | %FileCheck %s


import Lib

// CHECK-LABEL: define{{.+}}testFutureproofEnum
Expand Down