-
Notifications
You must be signed in to change notification settings - Fork 10.5k
[AST/Sema] Make it possible to use init accessors in inlinable initializers #75191
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.
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
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
dbe151b
[AST] Mark init accessors as having internal access
xedin 6925940
[Sema] Improve diagnostic when `@usableFromInline` is applied to a de…
xedin 123068c
[Sema] Resilience: Diagnose uses of init accessors in inlinable conte…
xedin be33968
[AST] Print init accessors when they are ABI-public
xedin File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| // RUN: %empty-directory(%t/src) | ||
| // RUN: split-file %s %t/src | ||
|
|
||
| // RUN: %target-build-swift %t/src/Library.swift -swift-version 5 -emit-module -emit-library \ | ||
| // RUN: -enable-library-evolution \ | ||
| // RUN: -module-name Library \ | ||
| // RUN: -o %t/%target-library-name(Library) \ | ||
| // RUN: -emit-module-interface-path %t/Library.swiftinterface | ||
|
|
||
| // RUN: %target-codesign %t/%target-library-name(Library) | ||
|
|
||
| // RUN: %target-build-swift -I %t -L %t -l Library %t/src/main.swift %target-rpath(%t) -o %t/main.out | ||
| // RUN: %target-codesign %t/main.out | ||
| // RUN: %target-run %t/main.out %t/%target-library-name(Library) 2>&1 | %FileCheck %t/src/main.swift | ||
|
|
||
| // RUN: rm %t/Library.swiftmodule | ||
|
|
||
| // RUN: %target-build-swift -I %t -L %t -l Library %t/src/main.swift %target-rpath(%t) -o %t/main.out | ||
| // RUN: %target-codesign %t/main.out | ||
| // RUN: %target-run %t/main.out %t/%target-library-name(Library) 2>&1 | %FileCheck %t/src/main.swift | ||
|
|
||
| // REQUIRES: executable_test | ||
|
|
||
| //--- Library.swift | ||
| @frozen | ||
| public struct Inlinable { | ||
| var _x: Int | ||
|
|
||
| public var x: Int { | ||
| @usableFromInline | ||
| @storageRestrictions(initializes: _x) | ||
| init { | ||
| self._x = newValue | ||
| } | ||
|
|
||
| get { | ||
| _x | ||
| } | ||
| } | ||
|
|
||
| @inlinable | ||
| public init(x: Int) { | ||
| self.x = x | ||
| } | ||
| } | ||
|
|
||
| @frozen | ||
| public struct Transparent { | ||
| @usableFromInline | ||
| var _x: Int | ||
|
|
||
| public var x: Int { | ||
| @_alwaysEmitIntoClient | ||
| @storageRestrictions(initializes: _x) | ||
| init { | ||
| self._x = newValue | ||
| } | ||
|
|
||
| get { | ||
| _x | ||
| } | ||
| } | ||
|
|
||
| @_alwaysEmitIntoClient | ||
| public init(x: Int) { | ||
| self.x = x | ||
| } | ||
| } | ||
|
|
||
| //--- main.swift | ||
| import Library | ||
|
|
||
| let inlinable = Inlinable(x: 42) | ||
| print("Inlinable.x = \(inlinable.x)") | ||
| // CHECK: Inlinable.x = 42 | ||
|
|
||
| let transparent = Transparent(x: -1) | ||
| print("Transparent.x = \(transparent.x)") | ||
| // CHECK: Transparent.x = -1 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| // RUN: %empty-directory(%t/src) | ||
| // RUN: split-file %s %t/src | ||
|
|
||
| /// Build the library A | ||
| // RUN: %target-swift-frontend -emit-module %t/src/A.swift \ | ||
| // RUN: -module-name A -swift-version 5 -enable-library-evolution \ | ||
| // RUN: -emit-module-path %t/A.swiftmodule \ | ||
| // RUN: -emit-module-interface-path %t/A.swiftinterface | ||
|
|
||
| // RUN: %FileCheck %t/src/A.swift < %t/A.swiftinterface | ||
|
|
||
| // Build the client using module | ||
| // RUN: %target-swift-emit-sil -verify -module-name Client -I %t %t/src/Client.swift | %FileCheck %t/src/Client.swift | ||
|
|
||
| // RUN: rm %t/A.swiftmodule | ||
|
|
||
| // Re-build the client using interface | ||
| // RUN: %target-swift-emit-sil -verify -module-name Client -I %t %t/src/Client.swift | %FileCheck %t/src/Client.swift | ||
|
|
||
| // REQUIRES: asserts | ||
|
|
||
| //--- A.swift | ||
| @frozen | ||
| public struct Inlinable { | ||
| var _x: Int | ||
|
|
||
| // CHECK: public var x: Swift.Int { | ||
| // CHECK-NEXT: @usableFromInline | ||
| // CHECK-NEXT: @storageRestrictions(initializes: _x) init | ||
| // CHECK-NEXT: get | ||
| // CHECK-NEXT } | ||
|
|
||
| public var x: Int { | ||
| @usableFromInline | ||
| @storageRestrictions(initializes: _x) | ||
| init { | ||
| self._x = newValue | ||
| } | ||
|
|
||
| get { | ||
| _x | ||
| } | ||
| } | ||
|
|
||
| @inlinable | ||
| public init(x: Int) { | ||
| self.x = x | ||
| } | ||
| } | ||
|
|
||
| public struct Internal { | ||
| // CHECK: public var y: Swift.Int { | ||
| // CHECK-NEXT: get | ||
| // CHECK-NEXT: } | ||
|
|
||
| public var y: Int { | ||
| init { | ||
| } | ||
|
|
||
| get { 0 } | ||
| } | ||
|
|
||
| init(y: Int) { | ||
| self.y = y | ||
| } | ||
| } | ||
|
|
||
| @frozen | ||
| public struct Transparent { | ||
| @usableFromInline | ||
| var _x: Int | ||
|
|
||
| // CHECK: public var x: Swift.Int { | ||
| // CHECK-NEXT: @_alwaysEmitIntoClient @storageRestrictions(initializes: _x) init { | ||
| // CHECK-NEXT: self._x = newValue | ||
| // CHECK-NEXT: } | ||
| // CHECK-NEXT: get | ||
| // CHECK-NEXT } | ||
|
|
||
| public var x: Int { | ||
| @_alwaysEmitIntoClient | ||
| @storageRestrictions(initializes: _x) | ||
| init { | ||
| self._x = newValue | ||
| } | ||
|
|
||
| get { | ||
| _x | ||
| } | ||
| } | ||
|
|
||
| @_alwaysEmitIntoClient | ||
| public init(x: Int) { | ||
| self.x = x | ||
| } | ||
| } | ||
|
|
||
| //--- Client.swift | ||
| import A | ||
|
|
||
| // CHECK-LABEL: sil hidden @$s6Client15testTransparentyyF : $@convention(thin) () -> () | ||
| // CHECK: [[X:%.*]] = struct $Int (%1 : $Builtin.Int64) | ||
| // CHECK-NEXT: // function_ref Transparent.init(x:) | ||
| // CHECK-NEXT: [[TRANSPARENT_REF:%.*]] = function_ref @$s1A11TransparentV1xACSi_tcfC : $@convention(method) (Int, @thin Transparent.Type) -> Transparent | ||
| // CHECK-NEXT: apply [[TRANSPARENT_REF]]([[X]], %0) : $@convention(method) (Int, @thin Transparent.Type) -> Transparent | ||
| func testTransparent() { | ||
| _ = Transparent(x: 42) | ||
| } | ||
|
|
||
| // CHECK-LABEL: sil shared @$s1A11TransparentV1xACSi_tcfC : $@convention(method) (Int, @thin Transparent.Type) -> Transparent | ||
|
|
||
| // CHECK-LABEL: sil hidden @$s6Client13testInlinableyyF : $@convention(thin) () -> () | ||
| // CHECK: [[X:%.*]] = struct $Int (%1 : $Builtin.Int64) | ||
| // CHECK-NEXT: // function_ref Inlinable.init(x:) | ||
| // CHECK-NEXT: [[INLINABLE_REF:%.*]] = function_ref @$s1A9InlinableV1xACSi_tcfC : $@convention(method) (Int, @thin Inlinable.Type) -> Inlinable | ||
| // CHECK-NEXT: apply [[INLINABLE_REF]]([[X]], %0) : $@convention(method) (Int, @thin Inlinable.Type) -> Inlinable | ||
| func testInlinable() { | ||
| _ = Inlinable(x: 42) | ||
| } | ||
|
|
||
| // CHECK-LABEL: sil @$s1A9InlinableV1xACSi_tcfC : $@convention(method) (Int, @thin Inlinable.Type) -> Inlinable | ||
|
|
||
| // CHECK-LABEL: sil shared @$s1A11TransparentV1xSivi : $@convention(thin) (Int, @thin Transparent.Type) -> @out Int |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.