mirror of
https://github.com/apple/swift.git
synced 2025-12-21 12:14:44 +01:00
3c740e4f2e
This is reasonable to diagnose with a warning, but dropping the 'open' down to 'public' isn't the right fix, because now it's not a valid override. The declaration has to get moved to another extension instead, or the extension has to not set a default access level. This turned out to be a source compat issue because the same logic that emits the fix-it also updates the access of the member, which then resulted in "must be as accessible as the declaration it overrides" in the /same/ build. It's not immediately clear what caused this; probably something's just being validated in a different order than it was before. The change makes sense either way. Stepping back, it's weird that a warning would change how the compiler saw the code, and while we could check for 'override' explicitly, we can't know if the member might be satisfying a protocol requirement. Better to just not guess at the right answer here. rdar://problem/47557376&28493971
149 lines
6.9 KiB
Swift
149 lines
6.9 KiB
Swift
// RUN: %target-typecheck-verify-swift
|
|
// RUN: %target-swift-emit-silgen %s | %FileCheck %s
|
|
|
|
// This file tests that the AST produced after fixing accessibility warnings
|
|
// is valid according to SILGen and the verifiers.
|
|
|
|
public struct PublicStruct {
|
|
// CHECK-DAG: sil{{( \[.+\])*}} @$s22accessibility_warnings12PublicStructV9publicVarSivg
|
|
public var publicVar = 0
|
|
// CHECK-DAG: sil hidden [ossa] @$s22accessibility_warnings12PublicStructVACycfC
|
|
}
|
|
|
|
internal struct InternalStruct {
|
|
public var publicVar = 0
|
|
|
|
public private(set) var publicVarPrivateSet = 0
|
|
|
|
// expected-warning@+1 {{'public(set)' modifier is redundant for a public property}} {{10-22=}}
|
|
public public(set) var publicVarPublicSet = 0
|
|
|
|
// CHECK-DAG: sil hidden [ossa] @$s22accessibility_warnings14InternalStructV16publicVarGetOnlySivg
|
|
public var publicVarGetOnly: Int { return 0 }
|
|
|
|
// CHECK-DAG: sil hidden [ossa] @$s22accessibility_warnings14InternalStructV15publicVarGetSetSivg
|
|
public var publicVarGetSet: Int { get { return 0 } set {} }
|
|
|
|
// CHECK-DAG: sil hidden [ossa] @$s22accessibility_warnings14InternalStructVACycfC
|
|
}
|
|
|
|
private struct PrivateStruct {
|
|
public var publicVar = 0
|
|
// CHECK-DAG: sil private [ossa] @$s22accessibility_warnings13PrivateStruct33_5D2F2E026754A901C0FF90C404896D02LLVADycfC
|
|
}
|
|
|
|
|
|
extension PublicStruct {
|
|
// CHECK-DAG: sil [ossa] @$s22accessibility_warnings12PublicStructV1xACSi_tcfC
|
|
public init(x: Int) { self.init() }
|
|
|
|
// CHECK-DAG: sil [ossa] @$s22accessibility_warnings12PublicStructV18publicVarExtensionSivg
|
|
public var publicVarExtension: Int { get { return 0 } set {} }
|
|
}
|
|
|
|
extension InternalStruct {
|
|
// CHECK-DAG: sil hidden [ossa] @$s22accessibility_warnings14InternalStructV1xACSi_tcfC
|
|
public init(x: Int) { self.init() }
|
|
|
|
// CHECK-DAG: sil hidden [ossa] @$s22accessibility_warnings14InternalStructV18publicVarExtensionSivg
|
|
public var publicVarExtension: Int { get { return 0 } set {} }
|
|
}
|
|
|
|
extension PrivateStruct {
|
|
// CHECK-DAG: sil private [ossa] @$s22accessibility_warnings13PrivateStruct33_5D2F2E026754A901C0FF90C404896D02LLV1xADSi_tcfC
|
|
public init(x: Int) { self.init() }
|
|
|
|
// CHECK-DAG: sil private [ossa] @$s22accessibility_warnings13PrivateStruct33_5D2F2E026754A901C0FF90C404896D02LLV18publicVarExtensionSivg
|
|
public var publicVarExtension: Int { get { return 0 } set {} }
|
|
}
|
|
|
|
public extension PublicStruct {
|
|
// CHECK-DAG: sil [ossa] @$s22accessibility_warnings12PublicStructV09extMemberC0yyF
|
|
public func extMemberPublic() {} // expected-warning {{'public' modifier is redundant for instance method declared in a public extension}} {{3-10=}}
|
|
// CHECK-DAG: sil private [ossa] @$s22accessibility_warnings12PublicStructV07extImplC033_5D2F2E026754A901C0FF90C404896D02LLyyF
|
|
private func extImplPublic() {}
|
|
}
|
|
|
|
internal extension PublicStruct {
|
|
// CHECK-DAG: sil [ossa] @$s22accessibility_warnings12PublicStructV17extMemberInternalyyF
|
|
public func extMemberInternal() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'internal'}} {{none}}
|
|
// CHECK-DAG: sil private [ossa] @$s22accessibility_warnings12PublicStructV15extImplInternal33_5D2F2E026754A901C0FF90C404896D02LLyyF
|
|
private func extImplInternal() {}
|
|
}
|
|
private extension PublicStruct {
|
|
// CHECK-DAG: sil [ossa] @$s22accessibility_warnings12PublicStructV16extMemberPrivateyyF
|
|
public func extMemberPrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'private'}} {{none}}
|
|
// CHECK-DAG: sil private [ossa] @$s22accessibility_warnings12PublicStructV14extImplPrivate33_5D2F2E026754A901C0FF90C404896D02LLyyF
|
|
private func extImplPrivate() {}
|
|
}
|
|
|
|
internal extension InternalStruct {
|
|
// CHECK-DAG: sil hidden [ossa] @$s22accessibility_warnings14InternalStructV09extMemberC0yyF
|
|
public func extMemberInternal() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'internal'}} {{none}}
|
|
// CHECK-DAG: sil private [ossa] @$s22accessibility_warnings14InternalStructV07extImplC033_5D2F2E026754A901C0FF90C404896D02LLyyF
|
|
private func extImplInternal() {}
|
|
}
|
|
private extension InternalStruct {
|
|
// CHECK-DAG: sil hidden [ossa] @$s22accessibility_warnings14InternalStructV16extMemberPrivateyyF
|
|
public func extMemberPrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'private'}} {{none}}
|
|
// CHECK-DAG: sil private [ossa] @$s22accessibility_warnings14InternalStructV14extImplPrivate33_5D2F2E026754A901C0FF90C404896D02LLyyF
|
|
private func extImplPrivate() {}
|
|
}
|
|
|
|
|
|
private extension PrivateStruct {
|
|
// CHECK-DAG: sil private [ossa] @$s22accessibility_warnings13PrivateStruct33_5D2F2E026754A901C0FF90C404896D02LLV09extMemberC0yyF
|
|
public func extMemberPrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'private'}} {{none}}
|
|
// CHECK-DAG: sil private [ossa] @$s22accessibility_warnings13PrivateStruct33_5D2F2E026754A901C0FF90C404896D02LLV07extImplC0yyF
|
|
private func extImplPrivate() {}
|
|
}
|
|
|
|
public protocol PublicReadOnlyOperations {
|
|
var size: Int { get }
|
|
subscript (_: Int) -> Int { get }
|
|
}
|
|
|
|
internal struct PrivateSettersForReadOnlyInternal : PublicReadOnlyOperations {
|
|
// CHECK-DAG: sil hidden{{( \[.+\])*}} [ossa] @$s22accessibility_warnings33PrivateSettersForReadOnlyInternalV4sizeSivg
|
|
public private(set) var size = 0
|
|
// CHECK-DAG: sil hidden [ossa] @$s22accessibility_warnings33PrivateSettersForReadOnlyInternalVyS2icig
|
|
// CHECK-DAG: sil hidden [ossa] @$s22accessibility_warnings33PrivateSettersForReadOnlyInternalVyS2icis
|
|
internal private(set) subscript (_: Int) -> Int { // no-warning
|
|
get { return 42 }
|
|
set {}
|
|
}
|
|
}
|
|
|
|
|
|
public class PublicClass {
|
|
// CHECK-DAG: sil{{( \[.+\])*}} @$s22accessibility_warnings11PublicClassC9publicVarSivg
|
|
public var publicVar = 0
|
|
// CHECK-DAG: sil hidden [ossa] @$s22accessibility_warnings11PublicClassCACycfc
|
|
}
|
|
|
|
internal class InternalClass {
|
|
// CHECK-DAG: sil hidden{{( \[.+\])*}} [ossa] @$s22accessibility_warnings13InternalClassC9publicVarSivg
|
|
public var publicVar = 0
|
|
|
|
// CHECK-DAG: sil hidden [transparent] [ossa] @$s22accessibility_warnings13InternalClassC19publicVarPrivateSetSivg
|
|
public private(set) var publicVarPrivateSet = 0
|
|
|
|
// expected-warning@+1 {{'public(set)' modifier is redundant for a public property}} {{10-22=}}
|
|
public public(set) var publicVarPublicSet = 0
|
|
|
|
// CHECK-DAG: sil hidden [ossa] @$s22accessibility_warnings13InternalClassC16publicVarGetOnlySivg
|
|
public var publicVarGetOnly: Int { return 0 }
|
|
|
|
// CHECK-DAG: sil hidden [ossa] @$s22accessibility_warnings13InternalClassC15publicVarGetSetSivg
|
|
public var publicVarGetSet: Int { get { return 0 } set {} }
|
|
|
|
// CHECK-DAG: sil hidden [ossa] @$s22accessibility_warnings13InternalClassCACycfc
|
|
}
|
|
|
|
private class PrivateClass {
|
|
// CHECK-DAG: sil private{{( \[.+\])*}} [ossa] @$s22accessibility_warnings12PrivateClass33_5D2F2E026754A901C0FF90C404896D02LLC9publicVarSivg
|
|
public var publicVar = 0
|
|
// CHECK-DAG: sil private [ossa] @$s22accessibility_warnings12PrivateClass33_5D2F2E026754A901C0FF90C404896D02LLCADycfc
|
|
}
|
|
|