Skip to content

Commit 14200e4

Browse files
tshortlitshortli
committed
SILGen/stdlib: Remove _diagnoseUnavailableCodeReached_aeic().
It should no longer be necessary to provide an `@_alwaysEmitIntoClient` version of `_diagnoseUnavailableCodeReached()`. This workaround was originally added to provide compatibility with projects that were misconfigured to compile against a newer stdlib but link against an older one. Resolves rdar://119892482.
1 parent a55beaa commit 14200e4

16 files changed

+25
-55
lines changed

‎include/swift/AST/ASTContext.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1499,10 +1499,6 @@ class ASTContext final {
14991499
/// The declared interface type of Builtin.TheTupleType.
15001500
BuiltinTupleType *getBuiltinTupleType();
15011501

1502-
/// The declaration for the `_diagnoseUnavailableCodeReached()` declaration
1503-
/// that ought to be used for the configured deployment target.
1504-
FuncDecl *getDiagnoseUnavailableCodeReachedDecl();
1505-
15061502
Type getNamedSwiftType(ModuleDecl *module, StringRef name);
15071503

15081504
/// Set the plugin loader.

‎include/swift/AST/KnownDecls.def

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ FUNC_DECL(DiagnoseUnexpectedNilOptional, "_diagnoseUnexpectedNilOptional")
7373
FUNC_DECL(DiagnoseUnexpectedEnumCase, "_diagnoseUnexpectedEnumCase")
7474
FUNC_DECL(DiagnoseUnexpectedEnumCaseValue, "_diagnoseUnexpectedEnumCaseValue")
7575
FUNC_DECL(DiagnoseUnavailableCodeReached, "_diagnoseUnavailableCodeReached")
76-
FUNC_DECL(DiagnoseUnavailableCodeReachedAEIC, "_diagnoseUnavailableCodeReached_aeic")
7776

7877
FUNC_DECL(GetErrorEmbeddedNSError, "_getErrorEmbeddedNSError")
7978

‎lib/AST/ASTContext.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6591,14 +6591,6 @@ BuiltinTupleType *ASTContext::getBuiltinTupleType() {
65916591
return result;
65926592
}
65936593

6594-
FuncDecl *ASTContext::getDiagnoseUnavailableCodeReachedDecl() {
6595-
// FIXME: Remove this with rdar://119892482
6596-
if (AvailabilityContext::forDeploymentTarget(*this).isContainedIn(
6597-
getSwift59Availability()))
6598-
return getDiagnoseUnavailableCodeReached();
6599-
return getDiagnoseUnavailableCodeReachedAEIC();
6600-
}
6601-
66026594
void ASTContext::setPluginLoader(std::unique_ptr<PluginLoader> loader) {
66036595
getImpl().Plugins = std::move(loader);
66046596
}

‎lib/SILGen/SILGenApply.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6397,7 +6397,7 @@ void SILGenFunction::emitApplyOfUnavailableCodeReached() {
63976397
return;
63986398

63996399
auto loc = RegularLocation::getAutoGeneratedLocation(F.getLocation());
6400-
FuncDecl *fd = getASTContext().getDiagnoseUnavailableCodeReachedDecl();
6400+
FuncDecl *fd = getASTContext().getDiagnoseUnavailableCodeReached();
64016401

64026402
if (!fd) {
64036403
// Broken stdlib?

‎lib/Sema/DerivedConformances.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ DerivedConformance::createBuiltinCall(ASTContext &ctx,
498498

499499
CallExpr *DerivedConformance::createDiagnoseUnavailableCodeReachedCallExpr(
500500
ASTContext &ctx) {
501-
FuncDecl *diagnoseDecl = ctx.getDiagnoseUnavailableCodeReachedDecl();
501+
FuncDecl *diagnoseDecl = ctx.getDiagnoseUnavailableCodeReached();
502502
assert(diagnoseDecl);
503503
auto diagnoseDeclRefExpr =
504504
new (ctx) DeclRefExpr(diagnoseDecl, DeclNameLoc(), true);
@@ -936,7 +936,7 @@ CaseStmt *DerivedConformance::unavailableEnumElementCaseStmt(
936936
// If the stdlib isn't new enough to contain the helper function for
937937
// diagnosing execution of unavailable code then just synthesize this case
938938
// normally.
939-
if (!C.getDiagnoseUnavailableCodeReachedDecl())
939+
if (!C.getDiagnoseUnavailableCodeReached())
940940
return nullptr;
941941

942942
auto createElementPattern = [&]() -> EnumElementPattern * {

‎stdlib/public/core/AssertCommon.swift

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -338,17 +338,6 @@ internal func _diagnoseUnexpectedEnumCase<SwitchedValue>(
338338
@_semantics("unavailable_code_reached")
339339
@usableFromInline // COMPILER_INTRINSIC
340340
internal func _diagnoseUnavailableCodeReached() -> Never {
341-
_diagnoseUnavailableCodeReached_aeic()
342-
}
343-
344-
// FIXME: Remove this with rdar://119892482
345-
/// An `@_alwaysEmitIntoClient` variant of `_diagnoseUnavailableCodeReached()`.
346-
/// This is temporarily needed by the compiler to reference from back deployed
347-
/// clients.
348-
@_alwaysEmitIntoClient
349-
@inline(never)
350-
@_semantics("unavailable_code_reached")
351-
internal func _diagnoseUnavailableCodeReached_aeic() -> Never {
352341
_assertionFailure(
353342
"Fatal error", "Unavailable code reached", flags: _fatalErrorFlags())
354343
}

‎test/SILGen/unavailable_decl_optimization_stub.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
public struct S {}
44

55
// CHECK-LABEL: sil{{.*}}@$s4Test15unavailableFuncAA1SVyF
6-
// CHECK: [[FNREF:%.*]] = function_ref @$[[DIAGNOSEFN:(ss36_diagnoseUnavailableCodeReached_aeics5NeverOyF|ss31_diagnoseUnavailableCodeReacheds5NeverOyF|ss31_diagnoseUnavailableCodeReacheds5NeverOyFTwb)]] : $@convention(thin) () -> Never
6+
// CHECK: [[FNREF:%.*]] = function_ref @$[[DIAGNOSEFN:(ss31_diagnoseUnavailableCodeReacheds5NeverOyF|ss31_diagnoseUnavailableCodeReacheds5NeverOyFTwb)]] : $@convention(thin) () -> Never
77
// CHECK-NEXT: [[APPLY:%.*]] = apply [[FNREF]]()
88
// CHECK: function_ref @$s4Test1SVACycfC
99
// CHECK: } // end sil function '$s4Test15unavailableFuncAA1SVyF'

‎test/SILGen/unavailable_decl_optimization_stub_class.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ func foo() {}
77
public class ExplicitInitClass {
88
// ExplicitInitClass.s.getter
99
// CHECK-LABEL: sil{{.*}}@$s4Test17ExplicitInitClassC1sAA1SVvg
10-
// CHECK: [[FNREF:%.*]] = function_ref @$[[DIAGNOSEFN:(ss36_diagnoseUnavailableCodeReached_aeics5NeverOyF|ss31_diagnoseUnavailableCodeReacheds5NeverOyF|ss31_diagnoseUnavailableCodeReacheds5NeverOyFTwb)]] : $@convention(thin) () -> Never
10+
// CHECK: [[FNREF:%.*]] = function_ref @$[[DIAGNOSEFN:(ss31_diagnoseUnavailableCodeReacheds5NeverOyF|ss31_diagnoseUnavailableCodeReacheds5NeverOyFTwb)]] : $@convention(thin) () -> Never
1111
// CHECK-NEXT: [[APPLY:%.*]] = apply [[FNREF]]()
1212
// CHECK: load
1313
// CHECK: } // end sil function '$s4Test17ExplicitInitClassC1sAA1SVvg'

‎test/SILGen/unavailable_decl_optimization_stub_macos.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@
66
// REQUIRES: OS=macosx
77

88
// CHECK-LABEL: sil{{.*}}@$s4Test15unavailableFuncyyF
9-
// CHECK-SWIFT5_8: [[FNREF:%.*]] = function_ref @$ss36_diagnoseUnavailableCodeReached_aeics5NeverOyF : $@convention(thin) () -> Never
9+
// CHECK-SWIFT5_8: [[FNREF:%.*]] = function_ref @$ss31_diagnoseUnavailableCodeReacheds5NeverOyFTwb : $@convention(thin) () -> Never
1010
// CHECK-SWIFT5_9: [[FNREF:%.*]] = function_ref @$ss31_diagnoseUnavailableCodeReacheds5NeverOyF : $@convention(thin) () -> Never
1111
// CHECK-NEXT: [[APPLY:%.*]] = apply [[FNREF]]()
1212
// CHECK: } // end sil function '$s4Test15unavailableFuncyyF'
1313
@available(*, unavailable)
1414
public func unavailableFunc() {}
1515

1616
// CHECK-LABEL: sil{{.*}}@$s4Test24unavailableInlinableFuncyyF
17-
// CHECK-SWIFT5_8: [[FNREF:%.*]] = function_ref @$ss36_diagnoseUnavailableCodeReached_aeics5NeverOyF : $@convention(thin) () -> Never
17+
// CHECK-SWIFT5_8: [[FNREF:%.*]] = function_ref @$ss31_diagnoseUnavailableCodeReacheds5NeverOyFTwb : $@convention(thin) () -> Never
1818
// CHECK-SWIFT5_9: [[FNREF:%.*]] = function_ref @$ss31_diagnoseUnavailableCodeReacheds5NeverOyFTwb : $@convention(thin) () -> Never
1919
// CHECK-NEXT: [[APPLY:%.*]] = apply [[FNREF]]()
2020
// CHECK: } // end sil function '$s4Test24unavailableInlinableFuncyyF'
2121
@available(*, unavailable)
2222
@inlinable public func unavailableInlinableFunc() {}
2323

2424
// CHECK-LABEL: sil{{.*}}@$s4Test22unavailableOnMacOSFuncyyF
25-
// CHECK-SWIFT5_8: [[FNREF:%.*]] = function_ref @$ss36_diagnoseUnavailableCodeReached_aeics5NeverOyF : $@convention(thin) () -> Never
25+
// CHECK-SWIFT5_8: [[FNREF:%.*]] = function_ref @$ss31_diagnoseUnavailableCodeReacheds5NeverOyFTwb : $@convention(thin) () -> Never
2626
// CHECK-SWIFT5_9: [[FNREF:%.*]] = function_ref @$ss31_diagnoseUnavailableCodeReacheds5NeverOyF : $@convention(thin) () -> Never
2727
// CHECK-NEXT: [[APPLY:%.*]] = apply [[FNREF]]()
2828
// CHECK: } // end sil function '$s4Test22unavailableOnMacOSFuncyyF'
@@ -36,7 +36,7 @@ public func unavailableOnMacOSFunc() {}
3636
public func unavailableOnMacOSExtensionFunc() {}
3737

3838
// CHECK-LABEL: sil{{.*}}@$s4Test021unavailableOnMacOSAndD15OSExtensionFuncyyF
39-
// CHECK-SWIFT5_8: [[FNREF:%.*]] = function_ref @$ss36_diagnoseUnavailableCodeReached_aeics5NeverOyF : $@convention(thin) () -> Never
39+
// CHECK-SWIFT5_8: [[FNREF:%.*]] = function_ref @$ss31_diagnoseUnavailableCodeReacheds5NeverOyFTwb : $@convention(thin) () -> Never
4040
// CHECK-SWIFT5_9: [[FNREF:%.*]] = function_ref @$ss31_diagnoseUnavailableCodeReacheds5NeverOyF : $@convention(thin) () -> Never
4141
// CHECK-NEXT: [[APPLY:%.*]] = apply [[FNREF]]()
4242
// CHECK: } // end sil function '$s4Test021unavailableOnMacOSAndD15OSExtensionFuncyyF'

‎test/SILGen/unavailable_decl_optimization_stub_macos_zippered.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// REQUIRES: OS=macosx
44

55
// CHECK-LABEL: sil{{.*}}@$s4Test15unavailableFuncyyF
6-
// CHECK: [[FNREF:%.*]] = function_ref @$ss36_diagnoseUnavailableCodeReached_aeics5NeverOyF : $@convention(thin) () -> Never
6+
// CHECK: [[FNREF:%.*]] = function_ref @$ss31_diagnoseUnavailableCodeReacheds5NeverOyFTwb : $@convention(thin) () -> Never
77
// CHECK-NEXT: [[APPLY:%.*]] = apply [[FNREF]]()
88
// CHECK: } // end sil function '$s4Test15unavailableFuncyyF'
99
@available(*, unavailable)

0 commit comments

Comments
 (0)