-
Notifications
You must be signed in to change notification settings - Fork 10.5k
AST: Fix accessibility checking in opaque type archetype substitution logic #30847
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
slavapestov
merged 1 commit into
swiftlang:master
from
slavapestov:opaque-type-lowering-access-level-fix
Apr 7, 2020
Merged
Changes from all commits
Commits
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| public protocol View {} | ||
|
|
||
| struct InternalView : View {} | ||
| struct InternalGenericView<T> : View {} | ||
|
|
||
| public struct PublicView : View {} | ||
| public struct PublicGenericView<T> : View {} | ||
|
|
||
| extension View { | ||
| public func passThrough() -> some View { | ||
| return self | ||
| } | ||
|
|
||
| public func wrapWithInternalView() -> some View { | ||
| return InternalView() | ||
| } | ||
|
|
||
| public func wrapWithInternalGenericView() -> some View { | ||
| return InternalGenericView<Self>() | ||
| } | ||
|
|
||
| public func wrapWithPublicView() -> some View { | ||
| return PublicView() | ||
| } | ||
|
|
||
| public func wrapWithPublicGenericView() -> some View { | ||
| return PublicGenericView<Self>() | ||
| } | ||
| } |
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,46 @@ | ||
| // RUN: %empty-directory(%t) | ||
| // RUN: %target-swift-frontend -disable-availability-checking -emit-module %S/Inputs/opaque_result_type_fragile_other.swift -emit-module-path %t/opaque_result_type_fragile_other.swiftmodule | ||
| // RUN: %target-swift-frontend -disable-availability-checking -emit-silgen -I%t %s | %FileCheck %s | ||
|
|
||
| import opaque_result_type_fragile_other | ||
|
|
||
| struct InternalView: View {} | ||
| public struct PublicView: View {} | ||
|
|
||
| public func testInternalView() { | ||
| let v = InternalView() | ||
|
|
||
| // CHECK: function_ref @$s32opaque_result_type_fragile_other4ViewPAAE11passThroughQryF : $@convention(method) <τ_0_0 where τ_0_0 : View> (@in_guaranteed τ_0_0) -> @out τ_0_0 | ||
| _ = v.passThrough() | ||
|
|
||
| // CHECK: function_ref @$s32opaque_result_type_fragile_other4ViewPAAE016wrapWithInternalF0QryF : $@convention(method) <τ_0_0 where τ_0_0 : View> (@in_guaranteed τ_0_0) -> @out @_opaqueReturnTypeOf("$s32opaque_result_type_fragile_other4ViewPAAE016wrapWithInternalF0QryF", 0) 🦸<τ_0_0> | ||
| _ = v.wrapWithInternalView() | ||
|
|
||
| // CHECK: function_ref @$s32opaque_result_type_fragile_other4ViewPAAE023wrapWithInternalGenericF0QryF : $@convention(method) <τ_0_0 where τ_0_0 : View> (@in_guaranteed τ_0_0) -> @out @_opaqueReturnTypeOf("$s32opaque_result_type_fragile_other4ViewPAAE023wrapWithInternalGenericF0QryF", 0) 🦸<τ_0_0> | ||
| _ = v.wrapWithInternalGenericView() | ||
|
|
||
| // CHECK: function_ref @$s32opaque_result_type_fragile_other4ViewPAAE014wrapWithPublicF0QryF : $@convention(method) <τ_0_0 where τ_0_0 : View> (@in_guaranteed τ_0_0) -> @out PublicView | ||
| _ = v.wrapWithPublicView() | ||
|
|
||
| //CHECK: function_ref @$s32opaque_result_type_fragile_other4ViewPAAE021wrapWithPublicGenericF0QryF : $@convention(method) <τ_0_0 where τ_0_0 : View> (@in_guaranteed τ_0_0) -> @out PublicGenericView<τ_0_0> | ||
| _ = v.wrapWithPublicGenericView() | ||
| } | ||
|
|
||
| public func testPublicView() { | ||
| let v = PublicView() | ||
|
|
||
| // CHECK: function_ref @$s32opaque_result_type_fragile_other4ViewPAAE11passThroughQryF : $@convention(method) <τ_0_0 where τ_0_0 : View> (@in_guaranteed τ_0_0) -> @out τ_0_0 | ||
| _ = v.passThrough() | ||
|
|
||
| // CHECK: function_ref @$s32opaque_result_type_fragile_other4ViewPAAE016wrapWithInternalF0QryF : $@convention(method) <τ_0_0 where τ_0_0 : View> (@in_guaranteed τ_0_0) -> @out @_opaqueReturnTypeOf("$s32opaque_result_type_fragile_other4ViewPAAE016wrapWithInternalF0QryF", 0) 🦸<τ_0_0> | ||
| _ = v.wrapWithInternalView() | ||
|
|
||
| // CHECK: function_ref @$s32opaque_result_type_fragile_other4ViewPAAE023wrapWithInternalGenericF0QryF : $@convention(method) <τ_0_0 where τ_0_0 : View> (@in_guaranteed τ_0_0) -> @out @_opaqueReturnTypeOf("$s32opaque_result_type_fragile_other4ViewPAAE023wrapWithInternalGenericF0QryF", 0) 🦸<τ_0_0> | ||
| _ = v.wrapWithInternalGenericView() | ||
|
|
||
| // CHECK: function_ref @$s32opaque_result_type_fragile_other4ViewPAAE014wrapWithPublicF0QryF : $@convention(method) <τ_0_0 where τ_0_0 : View> (@in_guaranteed τ_0_0) -> @out PublicView | ||
| _ = v.wrapWithPublicView() | ||
|
|
||
| //CHECK: function_ref @$s32opaque_result_type_fragile_other4ViewPAAE021wrapWithPublicGenericF0QryF : $@convention(method) <τ_0_0 where τ_0_0 : View> (@in_guaranteed τ_0_0) -> @out PublicGenericView<τ_0_0> | ||
| _ = v.wrapWithPublicGenericView() | ||
| } |
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,21 @@ | ||
| // RUN: %target-swift-frontend -enable-library-evolution -disable-availability-checking -O -emit-sil %s | ||
| // RUN: %target-swift-frontend -enable-library-evolution -disable-availability-checking -Onone -emit-sil %s | %FileCheck %s | ||
|
|
||
| public protocol P {} | ||
|
|
||
| public struct Underlying : P { | ||
| } | ||
|
|
||
| public func returnOpaque() -> some P { | ||
| return Underlying() | ||
| } | ||
|
|
||
| // CHECK-LABEL: sil [serialized] @$s19cast_folding_opaque23testCastOpaqueArchetypeAA10UnderlyingVyF | ||
| // CHECK: [[O:%.*]] = alloc_stack $@_opaqueReturnTypeOf("$s19cast_folding_opaque12returnOpaqueQryF", 0) | ||
| // CHECK: [[F:%.*]] = function_ref @$s19cast_folding_opaque12returnOpaqueQryF | ||
| // CHECK: apply [[F]]([[O]]) | ||
| // CHECK: unconditional_checked_cast_addr @_opaqueReturnTypeOf{{.*}}in [[O]] : $*@_opaqueReturnTypeOf{{.*}}to Underlying in %0 : $*Underlying | ||
| @inlinable | ||
| public func testCastOpaqueArchetype() -> Underlying { | ||
| return returnOpaque() as! Underlying | ||
| } |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for fixing this! Is there an existing resilience API we can use here to avoid duplicating visibility logic?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
None that I'm aware of at the moment. I have a follow-up PR with a couple of cleanups for a few other things I noticed while looking around at opaque type lowering, but not this function in particular. It's something we should chip away at over time.