Skip to content

[Sema] Allow non-public static property initializers in @_fixed_layout types #19785

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
merged 1 commit into from
Oct 9, 2018
Merged

[Sema] Allow non-public static property initializers in @_fixed_layout types #19785

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
11 changes: 3 additions & 8 deletions lib/AST/Decl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1302,14 +1302,9 @@ VarDecl *PatternBindingDecl::getSingleVar() const {
bool VarDecl::isInitExposedToClients() const {
auto parent = dyn_cast<NominalTypeDecl>(getDeclContext());
if (!parent) return false;
if (!hasInitialValue())
return false;
if (isStatic())
return false;
if (!parent->getAttrs().hasAttribute<FixedLayoutAttr>())
return false;
auto *module = parent->getModuleContext();
return module->getResilienceStrategy() == ResilienceStrategy::Resilient;
if (!hasInitialValue()) return false;
if (isStatic()) return false;
return parent->getAttrs().hasAttribute<FixedLayoutAttr>();
}

/// Check whether the given type representation will be
Expand Down
9 changes: 9 additions & 0 deletions lib/Sema/ResilienceDiagnostics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,15 @@ bool TypeChecker::diagnoseInlinableDeclRef(SourceLoc loc,
return false;
}

// Property initializers that are not exposed to clients are OK.
if (auto pattern = dyn_cast<PatternBindingInitializer>(DC)) {
auto bindingIndex = pattern->getBindingIndex();
auto &patternEntry = pattern->getBinding()->getPatternList()[bindingIndex];
auto varDecl = patternEntry.getAnchoringVarDecl();
if (!varDecl->isInitExposedToClients())
return false;
}

DowngradeToWarning downgradeToWarning = DowngradeToWarning::No;

// Swift 4.2 did not perform any checks for type aliases.
Expand Down
53 changes: 21 additions & 32 deletions test/ParseableInterface/fixed-layout-property-initializers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,76 +1,65 @@
// RUN: %empty-directory(%t)

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

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

// FIXME(rdar44993525): %target-swift-frontend -emit-module -o %t/Test.swiftmodule %t.swiftinterface -disable-objc-attr-requires-foundation-module
// FIXME(rdar44993525): %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 CHECK --check-prefix COMMON
// RUN: %target-swift-frontend -emit-module -o %t/Test.swiftmodule %t.swiftinterface -disable-objc-attr-requires-foundation-module
// RUN: %target-swift-frontend -emit-module -o /dev/null -merge-modules %t/Test.swiftmodule -module-name Test -emit-parseable-module-interface-path - | %FileCheck %s

// RUN: %target-swift-frontend -emit-module -o %t/TestResilient.swiftmodule -enable-resilience %t-resilient.swiftinterface -disable-objc-attr-requires-foundation-module
// 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 RESILIENT --check-prefix COMMON
// 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

// COMMON: @_fixed_layout public struct MyStruct {
// CHECK: @_fixed_layout public struct MyStruct {
@_fixed_layout
public struct MyStruct {
// CHECK: @_hasInitialValue public var publicVar: [[BOOL:(Swift\.)?Bool]]{{$}}
// RESILIENT: public var publicVar: [[BOOL:(Swift\.)?Bool]] = false
// CHECK: public var publicVar: [[BOOL:(Swift\.)?Bool]] = false
public var publicVar: Bool = false

// CHECK: @_hasInitialValue internal var internalVar: ([[BOOL]], [[BOOL]]){{$}}
// RESILIENT: internal var internalVar: ([[BOOL]], [[BOOL]]) = (false, true)
// CHECK: internal var internalVar: ([[BOOL]], [[BOOL]]) = (false, true)
internal var internalVar: (Bool, Bool) = (false, true)

// CHECK: @_hasInitialValue private var privateVar: [[BOOL]]{{$}}
// RESILIENT: private var privateVar: [[BOOL]] = Bool(4 < 10)
// CHECK: private var privateVar: [[BOOL]] = Bool(4 < 10)
private var privateVar: Bool = Bool(4 < 10)

// CHECK: @usableFromInline
// CHECK-NEXT: internal var ufiVar: [[BOOL]]{{$}}
// RESILIENT: @usableFromInline
// RESILIENT-NEXT: internal var ufiVar: [[BOOL]] = true
// CHECK-NEXT: internal var ufiVar: [[BOOL]] = true
@usableFromInline internal var ufiVar: Bool = true

// CHECK: @_hasInitialValue public var multiVar1: [[BOOL]], (multiVar2, multiVar3): ([[BOOL]], [[BOOL]])
// RESILIENT: public var multiVar1: [[BOOL]] = Bool(false), (multiVar2, multiVar3): ([[BOOL]], [[BOOL]]) = (true, 3 == 0)
// CHECK: public var multiVar1: [[BOOL]] = Bool(false), (multiVar2, multiVar3): ([[BOOL]], [[BOOL]]) = (true, 3 == 0)
public var multiVar1: Bool = Bool(false), (multiVar2, multiVar3): (Bool, Bool) = (true, 3 == 0)

// COMMON: @_hasInitialValue public static var staticVar: [[BOOL]]
// CHECK: @_hasInitialValue public static var staticVar: [[BOOL]]
public static var staticVar: Bool = Bool(true && false)

// COMMON: @inlinable internal init() {}
// CHECK: @inlinable internal init() {}
@inlinable init() {}
}

// COMMON: @_fixed_layout public class MyClass {
// CHECK: @_fixed_layout public class MyClass {
@_fixed_layout
public class MyClass {
// CHECK: @_hasInitialValue public var publicVar: [[BOOL]]{{$}}
// RESILIENT: public var publicVar: [[BOOL]] = false
// CHECK: public var publicVar: [[BOOL]] = false
public var publicVar: Bool = false

// CHECK: @_hasInitialValue internal var internalVar: [[BOOL]]{{$}}
// RESILIENT: internal var internalVar: [[BOOL]] = false
// CHECK: internal var internalVar: [[BOOL]] = false
internal var internalVar: Bool = false

// CHECK: @_hasInitialValue private var privateVar: {{(Swift\.)?}}UInt8{{$}}
// RESILIENT: private var privateVar: {{(Swift\.)?}}UInt8 = UInt8(2)
// CHECK: private var privateVar: {{(Swift\.)?}}UInt8 = UInt8(2)
private var privateVar: UInt8 = UInt8(2)

// CHECK: @usableFromInline
// CHECK-NEXT: internal var ufiVar: [[BOOL]]{{$}}
// RESILIENT: @usableFromInline
// RESILIENT: internal var ufiVar: [[BOOL]] = true
// CHECK-NEXT: internal var ufiVar: [[BOOL]] = true
@usableFromInline internal var ufiVar: Bool = true

// COMMON: @_hasInitialValue public static var staticVar: [[BOOL]]
// CHECK: @_hasInitialValue public static var staticVar: [[BOOL]]
public static var staticVar: Bool = Bool(true && false)

// COMMON: @inlinable internal init() {}
// CHECK: @inlinable internal init() {}
@inlinable init() {}
}

// COMMON: @_hasInitialValue public var topLevelVar: [[BOOL]]
// CHECK: @_hasInitialValue public var topLevelVar: [[BOOL]]
public var topLevelVar: Bool = Bool(false && !true)
5 changes: 5 additions & 0 deletions test/attr/attr_inlinable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,10 +247,15 @@ public struct PublicResilientStructWithInit {
var y = publicGlobal // OK
}

private func privateIntReturningFunc() -> Int { return 0 }
internal func internalIntReturningFunc() -> Int { return 0 }

@_fixed_layout
public struct PublicFixedStructWithInit {
var x = internalGlobal // expected-error {{let 'internalGlobal' is internal and cannot be referenced from a property initializer in a '@_fixed_layout' type}}
var y = publicGlobal // OK
static var z = privateIntReturningFunc() // OK
static var a = internalIntReturningFunc() // OK
}

public struct KeypathStruct {
Expand Down