diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp index 8bea5b9f43c95..384c0450b1034 100644 --- a/lib/AST/Decl.cpp +++ b/lib/AST/Decl.cpp @@ -1126,14 +1126,6 @@ bool Decl::isAlwaysWeakImported() const { if (getAttrs().hasAttribute()) return true; - // Declarations that are unavailable should be weak linked since they are - // meant to be unreachable at runtime and their removal should not affect - // clients. However, make an exception for unavailable declarations with - // explicit introduction versions, which are considered required ABI. - if (getSemanticUnavailableAttr() && - getAvailabilityForLinkage().isAlwaysAvailable()) - return true; - if (auto *accessor = dyn_cast(this)) return accessor->getStorage()->isAlwaysWeakImported(); diff --git a/test/IRGen/Inputs/weak_import_availability_helper.swift b/test/IRGen/Inputs/weak_import_availability_helper.swift index a4c549fc75b3f..3a74e9651b8a3 100644 --- a/test/IRGen/Inputs/weak_import_availability_helper.swift +++ b/test/IRGen/Inputs/weak_import_availability_helper.swift @@ -1,39 +1,17 @@ @available(macOS 10.50, *) public func conditionallyAvailableFunction() {} -@available(macOS, unavailable) -public func unavailableFunction() {} - -@available(macOS 10.50, *) -@available(macOS, unavailable) -public func unavailableButIntroducedFunction() {} - @available(macOS 10.50, *) public var conditionallyAvailableGlobal: Int { get {return 0} set {} } -@available(macOS, unavailable) -public var unavailableGlobal: Int { - get {return 0} - set {} -} - @available(macOS 10.50, *) public struct ConditionallyAvailableStruct { public func conditionallyAvailableMethod() {} } -extension ConditionallyAvailableStruct { - public struct NestedStruct {} -} - -@available(macOS, unavailable) -public struct UnvailableStruct { - public func unavailableMethod() {} -} - public protocol AlwaysAvailableProtocol {} public struct AlwaysAvailableStruct {} @@ -41,15 +19,9 @@ public struct AlwaysAvailableStruct {} @available(macOS 10.50, *) extension AlwaysAvailableStruct : AlwaysAvailableProtocol {} -@available(macOS, unavailable) -public protocol UnavailableProtocol {} - -@available(macOS, unavailable) -extension AlwaysAvailableStruct : UnavailableProtocol {} - public enum AlwaysAvailableEnum { case alwaysAvailableCase @available(macOS 10.50, *) case conditionallyAvailableCase -} +} \ No newline at end of file diff --git a/test/IRGen/weak_import_availability.swift b/test/IRGen/weak_import_availability.swift index 85216cd4d4815..2dc7f3f8f0ec2 100644 --- a/test/IRGen/weak_import_availability.swift +++ b/test/IRGen/weak_import_availability.swift @@ -1,12 +1,12 @@ // RUN: %empty-directory(%t) -// RUN: %target-swift-frontend -target %target-cpu-apple-macosx10.50 -emit-module -emit-module-path %t/weak_import_availability_helper.swiftmodule -parse-as-library %S/Inputs/weak_import_availability_helper.swift -enable-library-evolution +// RUN: %target-swift-frontend -emit-module -emit-module-path %t/weak_import_availability_helper.swiftmodule -parse-as-library %S/Inputs/weak_import_availability_helper.swift -enable-library-evolution // -// RUN: %target-swift-frontend -primary-file %s -I %t -emit-ir | %FileCheck %s --check-prefixes=CHECK,CHECK-OLD -// RUN: %target-swift-frontend -primary-file %s -I %t -emit-ir -target %target-cpu-apple-macosx10.50 | %FileCheck %s --check-prefixes=CHECK,CHECK-NEW -// RUN: %target-swift-frontend -primary-file %s -I %t -emit-ir -target %target-cpu-apple-macosx10.60 | %FileCheck %s --check-prefixes=CHECK,CHECK-NEW +// RUN: %target-swift-frontend -primary-file %s -I %t -emit-ir | %FileCheck %s --check-prefix=CHECK-OLD +// RUN: %target-swift-frontend -primary-file %s -I %t -emit-ir -target %target-cpu-apple-macosx10.50 | %FileCheck %s --check-prefix=CHECK-NEW +// RUN: %target-swift-frontend -primary-file %s -I %t -emit-ir -target %target-cpu-apple-macosx10.60 | %FileCheck %s --check-prefix=CHECK-NEW -// RUN: %target-swift-frontend -primary-file %s -I %t -emit-ir -target %target-cpu-apple-macosx10.50 -weak-link-at-target | %FileCheck %s --check-prefixes=CHECK,CHECK-OLD -// RUN: %target-swift-frontend -primary-file %s -I %t -emit-ir -target %target-cpu-apple-macosx10.60 -weak-link-at-target | %FileCheck %s --check-prefixes=CHECK,CHECK-NEW +// RUN: %target-swift-frontend -primary-file %s -I %t -emit-ir -target %target-cpu-apple-macosx10.50 -weak-link-at-target | %FileCheck %s --check-prefix=CHECK-OLD +// RUN: %target-swift-frontend -primary-file %s -I %t -emit-ir -target %target-cpu-apple-macosx10.60 -weak-link-at-target | %FileCheck %s --check-prefix=CHECK-NEW // REQUIRES: OS=macosx @@ -35,16 +35,6 @@ public func useConditionallyAvailableConformance() { // CHECK-OLD-LABEL: @"$s31weak_import_availability_helper21AlwaysAvailableStructVAA0eF8ProtocolAAWP" = extern_weak global i8* // CHECK-NEW-LABEL: @"$s31weak_import_availability_helper21AlwaysAvailableStructVAA0eF8ProtocolAAWP" = external global i8* -@available(macOS, unavailable) -func useUnavailableConformance(_: T.Type) {} - -@available(macOS, unavailable) -public func useUnavailableConformance() { - useUnavailableConformance(AlwaysAvailableStruct.self) -} - -// CHECK-LABEL: @"$s31weak_import_availability_helper21AlwaysAvailableStructVAA19UnavailableProtocolAAWP" = extern_weak global i8*, align 8 - @available(macOS 10.50, *) public func callConditionallyAvailableFunction() { conditionallyAvailableFunction() @@ -53,21 +43,6 @@ public func callConditionallyAvailableFunction() { // CHECK-OLD-LABEL: declare extern_weak swiftcc void @"$s31weak_import_availability_helper30conditionallyAvailableFunctionyyF"() // CHECK-NEW-LABEL: declare swiftcc void @"$s31weak_import_availability_helper30conditionallyAvailableFunctionyyF"() -@available(macOS, unavailable) -public func callUnavailableFunction() { - unavailableFunction() -} - -// CHECK-LABEL: declare extern_weak swiftcc void @"$s31weak_import_availability_helper19unavailableFunctionyyF"() - -@available(macOS, unavailable) -public func callUnavailableButIntroducedFunction() { - unavailableButIntroducedFunction() -} - -// CHECK-OLD-LABEL: declare extern_weak swiftcc void @"$s31weak_import_availability_helper32unavailableButIntroducedFunctionyyF"() -// CHECK-NEW-LABEL: declare swiftcc void @"$s31weak_import_availability_helper32unavailableButIntroducedFunctionyyF"() - @available(macOS 10.50, *) public func useConditionallyAvailableGlobal() { _ = conditionallyAvailableGlobal @@ -81,20 +56,6 @@ public func useConditionallyAvailableGlobal() { // CHECK-OLD-LABEL: declare extern_weak swiftcc void @"$s31weak_import_availability_helper28conditionallyAvailableGlobalSivs"(i64) // CHECK-NEW-LABEL: declare swiftcc void @"$s31weak_import_availability_helper28conditionallyAvailableGlobalSivs"(i64) -// CHECK-OLD-LABEL: declare extern_weak swiftcc { i8*, %TSi* } @"$s31weak_import_availability_helper28conditionallyAvailableGlobalSivM"(i8* noalias dereferenceable(32)) -// CHECK-NEW-LABEL: declare swiftcc { i8*, %TSi* } @"$s31weak_import_availability_helper28conditionallyAvailableGlobalSivM"(i8* noalias dereferenceable(32)) - -@available(macOS, unavailable) -public func useUnavailableGlobal() { - _ = unavailableGlobal - unavailableGlobal = 0 - unavailableGlobal += 1 -} - -// CHECK-LABEL: declare extern_weak swiftcc i64 @"$s31weak_import_availability_helper17unavailableGlobalSivg"() -// CHECK-LABEL: declare extern_weak swiftcc void @"$s31weak_import_availability_helper17unavailableGlobalSivs"(i64) -// CHECK-LABEL: declare extern_weak swiftcc { i8*, %TSi* } @"$s31weak_import_availability_helper17unavailableGlobalSivM"(i8* noalias dereferenceable(32)) - func blackHole(_: T) {} @available(macOS 10.50, *) @@ -102,17 +63,6 @@ public func useConditionallyAvailableStruct() { blackHole(ConditionallyAvailableStruct.self) } -// CHECK-OLD-LABEL: declare extern_weak swiftcc %swift.metadata_response @"$s31weak_import_availability_helper28ConditionallyAvailableStructVMa"(i64) -// CHECK-NEW-LABEL: declare swiftcc %swift.metadata_response @"$s31weak_import_availability_helper28ConditionallyAvailableStructVMa"(i64) - -@available(macOS 10.50, *) -public func useNestedConditionallyAvailableStruct() { - blackHole(ConditionallyAvailableStruct.NestedStruct.self) -} - -// CHECK-OLD-LABEL: declare extern_weak swiftcc %swift.metadata_response @"$s31weak_import_availability_helper28ConditionallyAvailableStructV06NestedG0VMa"(i64) -// CHECK-NEW-LABEL: declare swiftcc %swift.metadata_response @"$s31weak_import_availability_helper28ConditionallyAvailableStructV06NestedG0VMa"(i64) - @available(macOS 10.50, *) public func useConditionallyAvailableMethod(s: ConditionallyAvailableStruct) { s.conditionallyAvailableMethod() @@ -120,17 +70,3 @@ public func useConditionallyAvailableMethod(s: ConditionallyAvailableStruct) { // CHECK-OLD-LABEL: declare extern_weak swiftcc void @"$s31weak_import_availability_helper28ConditionallyAvailableStructV013conditionallyF6MethodyyF"(%swift.opaque* noalias nocapture swiftself) // CHECK-NEW-LABEL: declare swiftcc void @"$s31weak_import_availability_helper28ConditionallyAvailableStructV013conditionallyF6MethodyyF"(%swift.opaque* noalias nocapture swiftself) - -@available(macOS, unavailable) -public func useUnavailableStruct() { - blackHole(UnvailableStruct.self) -} - -// CHECK-LABEL: declare extern_weak swiftcc %swift.metadata_response @"$s31weak_import_availability_helper16UnvailableStructVMa"(i64) - -@available(macOS, unavailable) -public func useUnavailableMethod(s: UnvailableStruct) { - s.unavailableMethod() -} - -// CHECK-LABEL: declare extern_weak swiftcc void @"$s31weak_import_availability_helper16UnvailableStructV17unavailableMethodyyF"(%swift.opaque* noalias nocapture swiftself) diff --git a/test/SILGen/objc_init_unavailable.swift b/test/SILGen/objc_init_unavailable.swift index 04f791ebfd7df..7d3f30accff67 100644 --- a/test/SILGen/objc_init_unavailable.swift +++ b/test/SILGen/objc_init_unavailable.swift @@ -1,13 +1,12 @@ // RUN: %target-swift-emit-silgen(mock-sdk: %clang-importer-sdk) -enable-objc-interop -import-objc-header %S/Inputs/objc_init_unavailable.h %s | %FileCheck %s // REQUIRES: objc_interop -// REQUIRES: OS=macosx @available(macOS, unavailable) public func callUnavailableInit(name: String) -> ClassWithUnavailableInit { return ClassWithUnavailableInit(bundleID: name) } -// CHECK-LABEL: sil [weak_imported] [ossa] @$s21objc_init_unavailable19callUnavailableInit4nameSo09ClassWitheF0CSS_tF : $@convention(thin) (@guaranteed String) -> @owned ClassWithUnavailableInit { +// CHECK-LABEL: sil [ossa] @$s21objc_init_unavailable19callUnavailableInit4nameSo09ClassWitheF0CSS_tF : $@convention(thin) (@guaranteed String) -> @owned ClassWithUnavailableInit { // CHECK: function_ref @$sSo24ClassWithUnavailableInitC8bundleIDABSgSSSg_tcfC : $@convention(method) (@owned Optional, @thick ClassWithUnavailableInit.Type) -> @owned Optional // CHECK: return