Skip to content

AST: DeclExportabilityVisitor fixes #70358

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 3 commits into from
Dec 10, 2023
+33 −3
Merged

AST: DeclExportabilityVisitor fixes #70358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9444534
AST: Handle MacroExpansionDecl in DeclExportabilityVisitor.
tshortli Dec 10, 2023
a038f7d
AST: Handle PoundDiagnosticDecl in DeclExportabilityVisitor.
tshortli Dec 10, 2023
3c68c20
AST: Handle TopLevelCodeDecl in DeclExportabilityVisitor.
tshortli Dec 10, 2023
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
6 changes: 3 additions & 3 deletions include/swift/AST/DeclExportabilityVisitor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,8 @@ class DeclExportabilityVisitor
return true; \
}
UNREACHABLE(Module);
UNREACHABLE(TopLevelCode);
UNREACHABLE(PoundDiagnostic);
UNREACHABLE(Missing);
UNREACHABLE(MissingMember);
UNREACHABLE(MacroExpansion);
UNREACHABLE(GenericTypeParam);
UNREACHABLE(Param);

Expand All @@ -167,11 +164,14 @@ class DeclExportabilityVisitor
// context has already been checked.
#define UNINTERESTING(KIND) \
bool visit##KIND##Decl(const KIND##Decl *D) { return true; }
UNINTERESTING(TopLevelCode);
UNINTERESTING(IfConfig);
UNINTERESTING(Import);
UNINTERESTING(PoundDiagnostic);
UNINTERESTING(PrecedenceGroup);
UNINTERESTING(EnumCase);
UNINTERESTING(Operator);
UNINTERESTING(MacroExpansion);

#undef UNINTERESTING
};
Expand Down
17 changes: 17 additions & 0 deletions test/Macros/skip_non_exportable_decls.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// REQUIRES: swift_swift_parser, executable_test

// RUN: %empty-directory(%t)
// RUN: %host-build-swift -swift-version 5 -emit-library -o %t/%target-library-name(MacroDefinition) -module-name=MacroDefinition %S/Inputs/syntax_macro_definitions.swift

// RUN: %target-swift-frontend -swift-version 5 -emit-module -o %t/freestanding_macro_library.swiftmodule %S/Inputs/freestanding_macro_library.swift -module-name freestanding_macro_library -load-plugin-library %t/%target-library-name(MacroDefinition)

// RUN: %target-swift-frontend -parse-as-library -emit-sil -load-plugin-library %t/%target-library-name(MacroDefinition) %s -module-name MacroUser -experimental-skip-non-exportable-decls | %FileCheck %s

@freestanding(declaration)
macro anonymousTypes(public: Bool = false, causeErrors: Bool = false, _: () -> String) = #externalMacro(module: "MacroDefinition", type: "DefineAnonymousTypesMacro")

// CHECK: sil @$s9MacroUser03$s9A70User33_B2D49A1BE4DC7AF5CC327EB8EE2214BDLl14anonymousTypesfMf_4namefMu_C5helloSSyF : $@convention(method) (@guaranteed $s9MacroUser33_B2D49A1BE4DC7AF5CC327EB8EE2214BDLl14anonymousTypesfMf_4namefMu_) -> @owned String {
#anonymousTypes(public: true) { "hello" }

// CHECK-NOT: s9MacroUser03$s9A71User33_B2D49A1BE4DC7AF5CC327EB8EE2214BDLl14anonymousTypesfMf_4namefMu0_O5helloSSyF
#anonymousTypes(public: false) { "goodbye" }
2 changes: 2 additions & 0 deletions test/SILGen/skip_non_exportable_decls.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

import Swift

#warning("!")

// CHECK-NO-SKIP: sil_global private @$s4Test17internalGlobalVar_Wz : $Builtin.Word
// CHECK-SKIP-NOT: s4Test17internalGlobalVar_Wz

Expand Down
11 changes: 11 additions & 0 deletions test/SILGen/skip_non_exportable_decls_top_level.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// RUN: %empty-directory(%t)
// RUN: %target-swift-frontend -emit-silgen %s -module-name Test | %FileCheck %s --check-prefixes=CHECK,CHECK-NO-SKIP
// RUN: %target-swift-frontend -emit-silgen %s -module-name Test -experimental-skip-non-exportable-decls | %FileCheck %s --check-prefixes=CHECK,CHECK-SKIP

// CHECK-NO-SKIP: sil_global hidden @$s4Test1xSivp : $Int
// CHECK-SKIP: sil_global hidden_external @$s4Test1xSivp : $Int
var x = foo()

// CHECK-NO-SKIP: sil hidden{{.*}} @$s4Test3fooSiyF : $@convention(thin) () -> Int {
// CHECK-SKIP: sil hidden_external @$s4Test3fooSiyF : $@convention(thin) () -> Int
func foo() -> Int { return 1 }