Skip to content

[5.9] SIL: Don't skip lowering obsolete decls #66355

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jun 6, 2023
Merged

[5.9] SIL: Don't skip lowering obsolete decls #66355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions lib/SIL/IR/SILModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -956,14 +956,21 @@ bool Lowering::usesObjCAllocator(ClassDecl *theClass) {
return theClass->getObjectModel() == ReferenceCounting::ObjC;
}

static bool isUnconditionallyUnavailable(const Decl *D) {
if (auto unavailableAttrAndDecl = D->getSemanticUnavailableAttr())
return unavailableAttrAndDecl->first->isUnconditionallyUnavailable();

return false;
}

bool Lowering::shouldSkipLowering(const Decl *D) {
if (D->getASTContext().LangOpts.UnavailableDeclOptimizationMode !=
UnavailableDeclOptimization::Complete)
return false;

// Unavailable declarations should be skipped if
// -unavailable-decl-optimization=complete is specified.
return D->getSemanticUnavailableAttr() != None;
return isUnconditionallyUnavailable(D);
}

bool Lowering::shouldLowerToUnavailableCodeStub(const Decl *D) {
Expand All @@ -973,5 +980,5 @@ bool Lowering::shouldLowerToUnavailableCodeStub(const Decl *D) {

// Unavailable declarations should trap at runtime if
// -unavailable-decl-optimization=stub is specified.
return D->getSemanticUnavailableAttr() != None;
return isUnconditionallyUnavailable(D);
}
8 changes: 6 additions & 2 deletions test/SILGen/unavailable_decl_optimization_complete.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// RUN: %target-swift-emit-silgen -module-name Test -parse-as-library %s -verify | %FileCheck %s --check-prefixes=CHECK,CHECK-NO-STRIP
// RUN: %target-swift-emit-silgen -module-name Test -parse-as-library %s -verify -unavailable-decl-optimization=none | %FileCheck %s --check-prefixes=CHECK,CHECK-NO-STRIP
// RUN: %target-swift-emit-silgen -swift-version 5 -module-name Test -parse-as-library %s -verify | %FileCheck %s --check-prefixes=CHECK,CHECK-NO-STRIP
// RUN: %target-swift-emit-silgen -swift-version 5 -module-name Test -parse-as-library %s -verify -unavailable-decl-optimization=none | %FileCheck %s --check-prefixes=CHECK,CHECK-NO-STRIP
// RUN: %target-swift-emit-silgen -module-name Test -parse-as-library %s -verify -unavailable-decl-optimization=complete | %FileCheck %s --check-prefixes=CHECK,CHECK-STRIP

// CHECK-NO-STRIP: s4Test14globalConstant_Wz
Expand All @@ -18,6 +18,10 @@ public let globalConstant = true
@available(*, unavailable)
public func unavailableFunc() {}

// CHECK: s4Test21funcObsoletedInSwift5yyF
@available(swift, introduced: 4.2, obsoleted: 5)
public func funcObsoletedInSwift5() {}

@available(*, unavailable)
public struct UnavailableStruct<T> {
// CHECK-NO-STRIP: s4Test17UnavailableStructV8propertyxvg
Expand Down