averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into master-next

Browse Source
This commit is contained in:
Joe Groff
2019-12-10 12:46:41 -08:00
parent f67b9cbbdd 73098687b0
commit fb34044408
642 changed files with 27717 additions and 11572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
test/ModuleInterface/originally-defined-attr.swift Normal file
View File

@@ -0,0 +1,21 @@
// RUN: %empty-directory(%t)
// Ensure the attribute is printed in swiftinterface files
// RUN: %target-swift-frontend-typecheck -emit-module-interface-path %t/Foo.swiftinterface %s -module-name Foo
// RUN: %FileCheck %s < %t/Foo.swiftinterface
// Ensure the attribute is in .swiftmodule files
// RUN: %target-swift-ide-test -print-module -module-to-print Foo -I %t -source-filename %s > %t/printed-module.txt
// RUN: %FileCheck %s < %t/printed-module.txt
// CHECK: @_originallyDefinedIn(module: "another", OSX 13.13)
@_originallyDefinedIn(module: "another", OSX 13.13)
public protocol SimpleProto { }
// CHECK: @_originallyDefinedIn(module: "original", tvOS 1.0)
// CHECK: @_originallyDefinedIn(module: "another_original", OSX 2.0)
// CHECK: @_originallyDefinedIn(module: "another_original", iOS 3.0)
// CHECK: @_originallyDefinedIn(module: "another_original", watchOS 4.0)
@_originallyDefinedIn(module: "original", tvOS 1.0)
@_originallyDefinedIn(module: "another_original", OSX 2.0, iOS 3.0, watchOS 4.0)
public struct SimpleStruct {}

30
test/ModuleInterface/stored-properties.swift
View File

@@ -35,18 +35,18 @@ public struct HasStoredProperties {
public var simpleStoredMutable: Int
// CHECK: @_hasStorage public var storedWithObservers: Swift.Bool {
// RESILIENT: {{^}} public var storedWithObservers: Swift.Bool {
// COMMON-NEXT: get
// COMMON-NEXT: set
// COMMON-NEXT: }
// RESILIENT: {{^}} public var storedWithObservers: Swift.Bool {
// COMMON-NEXT: {{^}} get
// COMMON-NEXT: {{^}} set
// COMMON-NEXT: {{^}} }
public var storedWithObservers: Bool {
willSet {}
}
// CHECK: @_hasStorage public var storedPrivateSet: Swift.Int {
// RESILIENT: {{^}} public var storedPrivateSet: Swift.Int {
// COMMON-NEXT: get
// COMMON-NEXT: }
// RESILIENT: {{^}} public var storedPrivateSet: Swift.Int {
// COMMON-NEXT: {{^}} get
// COMMON-NEXT: {{^}} }
public private(set) var storedPrivateSet: Int
// CHECK: private var privateVar: Swift.Bool
@@ -54,10 +54,10 @@ public struct HasStoredProperties {
private var privateVar: Bool
// CHECK: @_hasStorage @_hasInitialValue public var storedWithObserversInitialValue: Swift.Int {
// RESILIENT: {{^}} public var storedWithObserversInitialValue: Swift.Int {
// COMMON-NEXT: get
// COMMON-NEXT: set
// COMMON-NEXT: }
// RESILIENT: {{^}} public var storedWithObserversInitialValue: Swift.Int {
// COMMON-NEXT: {{^}} get
// COMMON-NEXT: {{^}} set
// COMMON-NEXT: {{^}} }
public var storedWithObserversInitialValue: Int = 0 {
didSet {}
}
@@ -101,10 +101,10 @@ public struct HasStoredPropertiesFixedLayout {
// COMMON: public var simpleStoredMutable: StoredProperties.BagOfVariables
public var simpleStoredMutable: BagOfVariables
// COMMON: @_hasStorage public var storedWithObservers: StoredProperties.BagOfVariables {
// COMMON-NEXT: get
// COMMON-NEXT: set
// COMMON-NEXT: }
// COMMON: {{^}} @_hasStorage public var storedWithObservers: StoredProperties.BagOfVariables {
// COMMON-NEXT: {{^}} get
// COMMON-NEXT: {{^}} set
// COMMON-NEXT: {{^}} }
public var storedWithObservers: BagOfVariables {
didSet {}
}