-
Notifications
You must be signed in to change notification settings - Fork 10.6k
[cxx-interop] Make imported enum members inherit the access of their parent #84522
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
Open
j-hui
wants to merge
4
commits into
swiftlang:main
Choose a base branch
from
j-hui:fix-inherited-nested-types
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
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
111 changes: 111 additions & 0 deletions
111
test/Interop/Cxx/class/access/non-public-nested-enum-executable.swift
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,111 @@ | ||
| // RUN: split-file %s %t | ||
|
|
||
| // RUN: %target-build-swift -module-name main %t/base.swift -I %t/Inputs -o %t/base -Xfrontend -cxx-interoperability-mode=default -enable-experimental-feature ImportNonPublicCxxMembers | ||
| // RUN: %target-codesign %t/base | ||
| // RUN: %target-run %t/base | ||
|
|
||
| // RUN: %target-build-swift -module-name main %t/not-base.swift -I %t/Inputs -o %t/not-base -Xfrontend -cxx-interoperability-mode=default -enable-experimental-feature ImportNonPublicCxxMembers | ||
| // RUN: %target-codesign %t/not-base | ||
| // RUN: %target-run %t/not-base | ||
|
|
||
| // RUN: %target-build-swift -module-name main %t/derived.swift -I %t/Inputs -o %t/derived -Xfrontend -cxx-interoperability-mode=default -enable-experimental-feature ImportNonPublicCxxMembers | ||
| // RUN: %target-codesign %t/derived | ||
| // RUN: %target-run %t/derived | ||
|
|
||
| // RUN: %target-build-swift -module-name main %t/not-derived.swift -I %t/Inputs -o %t/not-derived -Xfrontend -cxx-interoperability-mode=default -enable-experimental-feature ImportNonPublicCxxMembers | ||
| // RUN: %target-codesign %t/not-derived | ||
| // RUN: %target-run %t/not-derived | ||
|
|
||
| // REQUIRES: executable_test | ||
| // REQUIRES: swift_feature_ImportNonPublicCxxMembers | ||
|
|
||
| //--- Inputs/module.modulemap | ||
| module CxxModule { | ||
| requires cplusplus | ||
| header "cxx-header.h" | ||
| } | ||
|
|
||
| //--- Inputs/cxx-header.h | ||
| #pragma once | ||
|
|
||
| class __attribute__((__swift_attr__("private_fileid:main/base.swift"))) | ||
| Base { | ||
| protected: | ||
| enum class Enum { Foo, Bar }; | ||
| public: | ||
| Enum makeEnum(void) const { return Enum::Bar; } | ||
| }; | ||
|
|
||
| class __attribute__((__swift_attr__("private_fileid:main/derived.swift"))) | ||
| Derived : public Base {}; | ||
|
|
||
| //--- base.swift | ||
| import StdlibUnittest | ||
| import CxxModule | ||
|
|
||
| var Suite = TestSuite("BlessedForBase") | ||
| extension Base { | ||
| static func makeEnums() { | ||
| let e1: Enum = Enum.Bar | ||
| let e2: Enum = Enum.Foo | ||
| expectEqual(e1, Enum.Bar) | ||
| expectNotEqual(e1, e2) | ||
| switch e2 { | ||
| case .Bar: | ||
| expectTrue(false, "foo is bar") | ||
| case .Foo: | ||
| expectTrue(true, "foo is foo") | ||
| } | ||
| } | ||
| } | ||
| Suite.test("Use private nested enum in base class") { Base.makeEnums() } | ||
| runAllTests() | ||
|
|
||
| //--- not-base.swift | ||
| import StdlibUnittest | ||
| import CxxModule | ||
|
|
||
| var Suite = TestSuite("NotBlessedForBase") | ||
| Suite.test("Use private nested enum in base class") { | ||
| let b = Base() | ||
| let e1 = b.makeEnum() | ||
| let e2 = b.makeEnum() | ||
| expectEqual(e1, e2) | ||
| } | ||
| runAllTests() | ||
|
|
||
|
|
||
| //--- derived.swift | ||
| import StdlibUnittest | ||
| import CxxModule | ||
|
|
||
| var Suite = TestSuite("BlessedForDerived") | ||
| extension Derived { | ||
| static func makeEnums() { | ||
| let e1: Enum = Enum.Bar | ||
| let e2: Enum = Enum.Foo | ||
| expectEqual(e1, Enum.Bar) | ||
| expectNotEqual(e1, e2) | ||
| switch e2 { | ||
| case .Bar: | ||
| expectTrue(false, "foo is bar") | ||
| case .Foo: | ||
| expectTrue(true, "foo is foo") | ||
| } | ||
| } | ||
| } | ||
| Suite.test("Use private nested enum inherited from base class") { Derived.makeEnums() } | ||
| runAllTests() | ||
|
|
||
| //--- not-derived.swift | ||
| import StdlibUnittest | ||
| import CxxModule | ||
|
|
||
| var Suite = TestSuite("NotBlessedForDerive") | ||
| Suite.test("Use private nested enum inherited from base class") { | ||
| let d = Derived() | ||
| let e1 = d.makeEnum() | ||
| let e2 = d.makeEnum() | ||
| expectEqual(e1, e2) | ||
| } | ||
| runAllTests() |
43 changes: 43 additions & 0 deletions
43
test/Interop/Cxx/class/access/non-public-nested-enum-module-interface.swift
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,43 @@ | ||
| // RUN: split-file %s %t | ||
|
|
||
| // RUN: %target-swift-ide-test -print-module -module-to-print=CxxModule -print-access -I %t/Inputs -source-filename=x -enable-experimental-cxx-interop -enable-experimental-feature ImportNonPublicCxxMembers | %FileCheck %s | ||
|
|
||
| // REQUIRES: swift_feature_ImportNonPublicCxxMembers | ||
|
|
||
| //--- Inputs/module.modulemap | ||
| module CxxModule { | ||
| requires cplusplus | ||
| header "cxx-header.h" | ||
| } | ||
|
|
||
| //--- Inputs/cxx-header.h | ||
| #pragma once | ||
|
|
||
| class __attribute__((__swift_attr__("private_fileid:main/base.swift"))) | ||
| Base { | ||
| protected: | ||
| enum class Enum { Foo, Bar }; | ||
| public: | ||
| Enum makeEnum(void) const { return Enum::Bar; } | ||
| }; | ||
|
|
||
| class __attribute__((__swift_attr__("private_fileid:main/derived.swift"))) | ||
| Derived : public Base {}; | ||
|
|
||
| // CHECK: public struct Base { | ||
| // CHECK-NEXT: public init() | ||
| // CHECK-NEXT: private enum Enum : [[ENUM_UNDERLYING_TYPE:Int32|UInt32]] { | ||
| // CHECK-NEXT: private init?(rawValue: [[ENUM_UNDERLYING_TYPE]]) | ||
| // CHECK-NEXT: private var rawValue: [[ENUM_UNDERLYING_TYPE]] { get } | ||
| // CHECK-NEXT: private typealias RawValue = [[ENUM_UNDERLYING_TYPE]] | ||
| // CHECK-NEXT: case Foo | ||
| // CHECK-NEXT: case Bar | ||
| // CHECK-NEXT: } | ||
| // CHECK-NEXT: public func makeEnum() -> Base.Enum | ||
| // CHECK-NEXT: } | ||
|
|
||
| // CHECK-NEXT: public struct Derived { | ||
| // CHECK-NEXT: public init() | ||
| // CHECK-NEXT: private typealias Enum = Base.Enum | ||
| // CHECK-NEXT: public func makeEnum() -> Base.Enum | ||
| // CHECK-NEXT: } |
116 changes: 116 additions & 0 deletions
116
test/Interop/Cxx/class/access/non-public-nested-enum-typecheck.swift
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,116 @@ | ||
| // RUN: split-file %s %t | ||
|
|
||
| // RUN: %target-swift-frontend -typecheck -verify -I %t/Inputs -cxx-interoperability-mode=default -enable-experimental-feature ImportNonPublicCxxMembers -module-name main %t/base.swift | ||
| // RUN: %target-swift-frontend -typecheck -verify -I %t/Inputs -cxx-interoperability-mode=default -enable-experimental-feature ImportNonPublicCxxMembers -module-name main %t/derived.swift | ||
|
|
||
| // REQUIRES: swift_feature_ImportNonPublicCxxMembers | ||
|
|
||
| //--- Inputs/module.modulemap | ||
| module CxxModule { | ||
| requires cplusplus | ||
| header "cxx-header.h" | ||
| } | ||
|
|
||
| //--- Inputs/cxx-header.h | ||
| #pragma once | ||
|
|
||
| class __attribute__((__swift_attr__("private_fileid:main/base.swift"))) | ||
| Base { | ||
| protected: | ||
| enum class Enum { Foo, Bar }; | ||
| public: | ||
| Enum makeEnum(void) const { return Enum::Bar; } | ||
| }; | ||
|
|
||
| class __attribute__((__swift_attr__("private_fileid:main/derived.swift"))) | ||
| Derived : public Base {}; | ||
|
|
||
| //--- base.swift | ||
| import CxxModule | ||
|
|
||
| extension Base { | ||
| private static func inside(e: Enum) { | ||
| let _: Enum = Enum.Bar | ||
| let _: Base.Enum = Base.Enum.Bar | ||
| let _: Enum = Base.Enum.Foo | ||
| let _: Base.Enum = Enum.Foo | ||
|
|
||
| switch e { | ||
| case .Bar: return | ||
| case .Foo: return | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func switches() { | ||
| let b = Base() | ||
| let d = Derived() | ||
| switch b.makeEnum() { | ||
| default: return // this is OK | ||
| } | ||
| switch d.makeEnum() { | ||
| default: return // this is OK | ||
| } | ||
| switch b.makeEnum() { | ||
| case Base.Enum.Bar: return // expected-error {{'Enum' is inaccessible due to 'private' protection level}} | ||
| case Base.Enum.Foo: return // expected-error {{'Enum' is inaccessible due to 'private' protection level}} | ||
| } | ||
| switch b.makeEnum() { | ||
| case .Bar: return // OK as long as the user does not refer to Enum itself | ||
| case .Foo: return // (NOTE: arguably this should not be allowed) | ||
| } | ||
| switch d.makeEnum() { | ||
| case Derived.Enum.Bar: return // expected-error {{'Enum' is inaccessible due to 'private' protection level}} | ||
| case Derived.Enum.Foo: return // expected-error {{'Enum' is inaccessible due to 'private' protection level}} | ||
| } | ||
| switch d.makeEnum() { | ||
| case .Bar: return // OK as long as the user does not refer to Enum itself | ||
| case .Foo: return // (NOTE: arguably this should not be allowed) | ||
| } | ||
| } | ||
|
|
||
| func outside() { | ||
| let b = Base() | ||
| let d = Derived() | ||
| let _ = b.makeEnum() // This is OK as long as we don't name the type | ||
| let _ = d.makeEnum() // This is OK as long as we don't name the type | ||
|
|
||
| let _: Derived.Enum = b.makeEnum() // expected-error {{'Enum' is inaccessible due to 'private' protection level}} | ||
| let _: Derived.Enum = d.makeEnum() // expected-error {{'Enum' is inaccessible due to 'private' protection level}} | ||
|
|
||
| // The types in the base and derived types should be considered the same type | ||
| var x = b.makeEnum() | ||
| x = d.makeEnum() | ||
| var y = d.makeEnum() | ||
| y = b.makeEnum() | ||
| } | ||
|
|
||
| //--- derived.swift | ||
| import CxxModule | ||
|
|
||
| extension Base { | ||
| private static func inside(e: Enum) { // expected-error {{'Enum' is inaccessible due to 'private' protection level}} | ||
| let _: Enum = Enum.Bar // expected-error {{'Enum' is inaccessible due to 'private' protection level}} | ||
| // expected-error@-1 {{'Enum' is inaccessible due to 'private' protection level}} | ||
| } | ||
| } | ||
|
|
||
| extension Derived { | ||
| private static func inside(e: Enum) { | ||
| let b = Base() | ||
| let _: Enum = Enum.Bar | ||
| let _: Derived.Enum = Derived.Enum.Bar | ||
| let _: Enum = b.makeEnum() | ||
|
|
||
| // It would be nice to make these work but they do not | ||
| let _: Base.Enum = Base.Enum.Bar // expected-error {{'Enum' is inaccessible due to 'private' protection level}} | ||
j-hui marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| // expected-error@-1 {{'Enum' is inaccessible due to 'private' protection level}} | ||
| let _: Enum = Base.Enum.Foo // expected-error {{'Enum' is inaccessible due to 'private' protection level}} | ||
| let _: Base.Enum = Enum.Foo // expected-error {{'Enum' is inaccessible due to 'private' protection level}} | ||
|
|
||
| switch e { | ||
| case .Bar: return | ||
| case .Foo: return | ||
| } | ||
| } | ||
| } | ||
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.
I'm not actually sure why this changed/had to be written like this before. But this seems like the right behavior to me, since the initializer does not return an optional.