Skip to content

Commit abbe6a8

Browse files
author
Harlan Haskins
committed
[ParseableInterface] Don't print @_hasInitialValue for resilient variables
1 parent 4f25c55 commit abbe6a8

File tree

3 files changed

+26
-23
lines changed

3 files changed

+26
-23
lines changed

‎lib/AST/ASTPrinter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -889,8 +889,8 @@ void PrintAST::printAttributes(const Decl *D) {
889889

890890
if (auto vd = dyn_cast<VarDecl>(D)) {
891891
// Don't print @_hasInitialValue if we're printing an initializer
892-
// expression.
893-
if (vd->isInitExposedToClients())
892+
// expression or if the storage is resilient.
893+
if (vd->isInitExposedToClients() || vd->isResilient())
894894
Options.ExcludeAttrList.push_back(DAK_HasInitialValue);
895895

896896
if (!Options.PrintForSIL) {

‎test/ParseableInterface/fixed-layout-property-initializers.swift

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,70 @@
11
// RUN: %empty-directory(%t)
22

33
// RUN: %target-swift-frontend -typecheck -emit-parseable-module-interface-path %t.swiftinterface %s
4-
// RUN: %FileCheck %s --check-prefix FROMSOURCE --check-prefix CHECK < %t.swiftinterface
4+
// RUN: %FileCheck %s --check-prefix FROMSOURCE --check-prefix NONRESILIENT --check-prefix COMMON < %t.swiftinterface
55

66
// RUN: %target-swift-frontend -typecheck -emit-parseable-module-interface-path %t-resilient.swiftinterface -enable-resilience %s
7-
// RUN: %FileCheck %s --check-prefix FROMSOURCE --check-prefix CHECK < %t-resilient.swiftinterface
7+
// RUN: %FileCheck %s --check-prefix FROMSOURCE --check-prefix RESILIENT --check-prefix COMMON < %t-resilient.swiftinterface
88

99
// RUN: %target-swift-frontend -emit-module -o %t/Test.swiftmodule %t.swiftinterface -disable-objc-attr-requires-foundation-module
10-
// RUN: %target-swift-frontend -emit-module -o /dev/null -merge-modules %t/Test.swiftmodule -module-name Test -emit-parseable-module-interface-path - | %FileCheck %s --check-prefix FROMMODULE --check-prefix CHECK
10+
// RUN: %target-swift-frontend -emit-module -o /dev/null -merge-modules %t/Test.swiftmodule -module-name Test -emit-parseable-module-interface-path - | %FileCheck %s --check-prefix FROMMODULE --check-prefix NONRESILIENT --check-prefix COMMON
1111

1212
// RUN: %target-swift-frontend -emit-module -o %t/TestResilient.swiftmodule -enable-resilience %t-resilient.swiftinterface -disable-objc-attr-requires-foundation-module
13-
// RUN: %target-swift-frontend -emit-module -o /dev/null -merge-modules %t/TestResilient.swiftmodule -module-name TestResilient -enable-resilience -emit-parseable-module-interface-path - | %FileCheck %s --check-prefix FROMMODULE --check-prefix CHECK
13+
// RUN: %target-swift-frontend -emit-module -o /dev/null -merge-modules %t/TestResilient.swiftmodule -module-name TestResilient -enable-resilience -emit-parseable-module-interface-path - | %FileCheck %s --check-prefix FROMMODULE --check-prefix RESILIENT --check-prefix COMMON
1414

15-
// CHECK: @_fixed_layout public struct MyStruct {
15+
// COMMON: @_fixed_layout public struct MyStruct {
1616
@_fixed_layout
1717
public struct MyStruct {
18-
// CHECK: public var publicVar: [[BOOL:(Swift\.)?Bool]] = false
18+
// COMMON: public var publicVar: [[BOOL:(Swift\.)?Bool]] = false
1919
public var publicVar: Bool = false
2020

21-
// CHECK: internal var internalVar: ([[BOOL]], [[BOOL]]) = (false, true)
21+
// COMMON: internal var internalVar: ([[BOOL]], [[BOOL]]) = (false, true)
2222
internal var internalVar: (Bool, Bool) = (false, true)
2323

24-
// CHECK: private var privateVar: [[BOOL]] = Bool(4 < 10)
24+
// COMMON: private var privateVar: [[BOOL]] = Bool(4 < 10)
2525
private var privateVar: Bool = Bool(4 < 10)
2626

27-
// CHECK: @usableFromInline
28-
// CHECK-NEXT: internal var ufiVar: [[BOOL]] = true
27+
// COMMON: @usableFromInline
28+
// COMMON-NEXT: internal var ufiVar: [[BOOL]] = true
2929
@usableFromInline internal var ufiVar: Bool = true
3030

31-
// CHECK: public var multiVar1: [[BOOL]] = Bool(false), (multiVar2, multiVar3): ([[BOOL]], [[BOOL]]) = (true, 3 == 0)
31+
// COMMON: public var multiVar1: [[BOOL]] = Bool(false), (multiVar2, multiVar3): ([[BOOL]], [[BOOL]]) = (true, 3 == 0)
3232
public var multiVar1: Bool = Bool(false), (multiVar2, multiVar3): (Bool, Bool) = (true, 3 == 0)
3333

34-
// CHECK: @_hasInitialValue public static var staticVar: [[BOOL]]
34+
// NONRESILIENT: @_hasInitialValue public static var staticVar: [[BOOL]]
35+
// RESILIENT: {{^}} public static var staticVar: [[BOOL]]
3536
public static var staticVar: Bool = Bool(true && false)
3637

3738
// FROMSOURCE: @inlinable internal init() {}
3839
// FROMMODULE: @inlinable internal init(){{$}}
3940
@inlinable init() {}
4041
}
4142

42-
// CHECK: @_fixed_layout public class MyClass {
43+
// COMMON: @_fixed_layout public class MyClass {
4344
@_fixed_layout
4445
public class MyClass {
45-
// CHECK: public var publicVar: [[BOOL]] = false
46+
// COMMON: public var publicVar: [[BOOL]] = false
4647
public var publicVar: Bool = false
4748

48-
// CHECK: internal var internalVar: [[BOOL]] = false
49+
// COMMON: internal var internalVar: [[BOOL]] = false
4950
internal var internalVar: Bool = false
5051

51-
// CHECK: private var privateVar: {{(Swift\.)?}}UInt8 = UInt8(2)
52+
// COMMON: private var privateVar: {{(Swift\.)?}}UInt8 = UInt8(2)
5253
private var privateVar: UInt8 = UInt8(2)
5354

54-
// CHECK: @usableFromInline
55-
// CHECK-NEXT: internal var ufiVar: [[BOOL]] = true
55+
// COMMON: @usableFromInline
56+
// COMMON-NEXT: internal var ufiVar: [[BOOL]] = true
5657
@usableFromInline internal var ufiVar: Bool = true
5758

58-
// CHECK: @_hasInitialValue public static var staticVar: [[BOOL]]
59+
// NONRESILIENT: @_hasInitialValue public static var staticVar: [[BOOL]]
60+
// RESILIENT: {{^}} public static var staticVar: [[BOOL]]
5961
public static var staticVar: Bool = Bool(true && false)
6062

6163
// FROMSOURCE: @inlinable internal init() {}
6264
// FROMMODULE: @inlinable internal init(){{$}}
6365
@inlinable init() {}
6466
}
6567

66-
// CHECK: @_hasInitialValue public var topLevelVar: [[BOOL]]
68+
// NONRESILIENT: @_hasInitialValue public var topLevelVar: [[BOOL]]
69+
// RESILIENT: {{^}}public var topLevelVar: [[BOOL]]
6770
public var topLevelVar: Bool = Bool(false && !true)

‎test/ParseableInterface/stored-properties.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public struct HasStoredProperties {
5353
private var privateVar: Bool
5454

5555
// CHECK: @_hasStorage @_hasInitialValue public var storedWithObserversInitialValue: [[INT]] {
56-
// RESILIENT: {{^}} @_hasInitialValue public var storedWithObserversInitialValue: [[INT]] {
56+
// RESILIENT: {{^}} public var storedWithObserversInitialValue: [[INT]] {
5757
// COMMON-NEXT: get
5858
// COMMON-NEXT: set
5959
// COMMON-NEXT: }

0 commit comments

Comments
 (0)