Clean up

Author: rxwei

include/swift/AST/Decl.h

@@ -109,7 +109,6 @@ namespace swift {
   class VarDecl;
   class OpaqueReturnTypeRepr;
   class Witness;
-  class MacroExpansionExpr;
 
   namespace ast_scope {
   class AbstractPatternEntryScope;

include/swift/AST/FileUnit.h

@@ -210,12 +210,13 @@ class FileUnit : public DeclContext, public ASTAllocated<FileUnit> {
   /// The order of the results is not guaranteed to be meaningful.
   virtual void getTopLevelDecls(SmallVectorImpl<Decl*> &results) const {}
 
-  /// Finds all top-level decls in this file with all macros recursively
-  /// expanded.
+  /// Finds all top-level decls in this file with their auxiliary decls such as
+  /// macro expansions.
   ///
   /// This does a simple local lookup, not recursively looking through imports.
   /// The order of the results is not guaranteed to be meaningful.
-  void getExpandedTopLevelDecls(SmallVectorImpl<Decl*> &results) const;
+  void getTopLevelDeclsWithAuxiliaryDecls(
+      SmallVectorImpl<Decl*> &results) const;
 
   virtual void
   getExportedPrespecializations(SmallVectorImpl<Decl *> &results) const {}

lib/AST/Module.cpp

@@ -3911,18 +3911,16 @@ void FileUnit::getTopLevelDeclsWhereAttributesMatch(
   Results.erase(newEnd, Results.end());
 }
 
-void FileUnit::getExpandedTopLevelDecls(SmallVectorImpl<Decl*> &results) const {
+void FileUnit::getTopLevelDeclsWithAuxiliaryDecls(
+    SmallVectorImpl<Decl*> &results) const {
   SmallVector<Decl *, 32> nonExpandedDecls;
   nonExpandedDecls.reserve(results.capacity());
   getTopLevelDecls(nonExpandedDecls);
   for (auto *decl : nonExpandedDecls) {
-    if (auto *med = dyn_cast<MacroExpansionDecl>(decl)) {
-      med->visitAuxiliaryDecls([&](Decl *decl) {
-        results.push_back(decl);
-      });
-    } else {
-      results.push_back(decl);
-    }
+    decl->visitAuxiliaryDecls([&](Decl *auxDecl) {
+      results.push_back(auxDecl);
+    });
+    results.push_back(decl);
   }
 }
 

lib/Serialization/Serialization.cpp

@@ -6133,7 +6133,7 @@ void Serializer::writeAST(ModuleOrSourceFile DC) {
 
     // FIXME: Switch to a visitor interface?
     SmallVector<Decl *, 32> fileDecls;
-    nextFile->getExpandedTopLevelDecls(fileDecls);
+    nextFile->getTopLevelDeclsWithAuxiliaryDecls(fileDecls);
 
     for (auto D : fileDecls) {
       if (isa<ImportDecl>(D) || isa<IfConfigDecl>(D) ||

test/Macros/Inputs/syntax_macro_definitions.swift

@@ -1177,7 +1177,8 @@ public struct DefineAnonymousTypesMacro: DeclarationMacro {
       """
 
       class \(context.createUniqueName("name")) {
-        func hello() {
+        func hello() -> String {
+          \(body.statements)
         }
       }
       """,
@@ -1187,7 +1188,8 @@ public struct DefineAnonymousTypesMacro: DeclarationMacro {
         case apple
         case banana
 
-        func hello() {
+        func hello() -> String {
+          \(body.statements)
         }
       }
       """

test/Macros/macro_expand.swift

@@ -1,5 +1,5 @@
-// UN: %empty-directory(%t)
-// UN: %target-build-swift -swift-version 5 -I %swift-host-lib-dir -L %swift-host-lib-dir -emit-library -o %t/%target-library-name(MacroDefinition) -module-name=MacroDefinition %S/Inputs/syntax_macro_definitions.swift -g -no-toolchain-stdlib-rpath -swift-version 5
+// RUN: %empty-directory(%t)
+// RUN: %target-build-swift -swift-version 5 -I %swift-host-lib-dir -L %swift-host-lib-dir -emit-library -o %t/%target-library-name(MacroDefinition) -module-name=MacroDefinition %S/Inputs/syntax_macro_definitions.swift -g -no-toolchain-stdlib-rpath -swift-version 5
 // RUNx: %target-swift-frontend -dump-ast -enable-experimental-feature FreestandingMacros -load-plugin-library %t/%target-library-name(MacroDefinition) -I %swift-host-lib-dir %s -module-name MacroUser 2>&1 | %FileCheck --check-prefix CHECK-AST %s
 
 // Diagnostics testing
@@ -12,14 +12,14 @@
 
 // RUN: %FileCheck %s  --check-prefix CHECK-MACRO-PRINTED < %t/macro-printing.txt
 
-// FIXME(rdar://106053984) Debug info SIL testing (re-enable -g)
-// UN: %target-swift-frontend -swift-version 5 -emit-sil -enable-experimental-feature FreestandingMacros -load-plugin-library %t/%target-library-name(MacroDefinition) -I %swift-host-lib-dir %s -module-name MacroUser -o - | %FileCheck --check-prefix CHECK-SIL %s
+// Debug info SIL testing
+// RUN: %target-swift-frontend -swift-version 5 -emit-sil -enable-experimental-feature FreestandingMacros -load-plugin-library %t/%target-library-name(MacroDefinition) -I %swift-host-lib-dir %s -module-name MacroUser -o - -g | %FileCheck --check-prefix CHECK-SIL %s
 
-// FIXME(rdar://106053984) Debug info IR testing (re-enable -g)
-// UN: %target-swift-frontend -swift-version 5 -emit-ir -enable-experimental-feature FreestandingMacros -load-plugin-library %t/%target-library-name(MacroDefinition) -I %swift-host-lib-dir %s -module-name MacroUser -o - | %FileCheck --check-prefix CHECK-IR %s
+// Debug info IR testing
+// RUN: %target-swift-frontend -swift-version 5 -emit-ir -enable-experimental-feature FreestandingMacros -load-plugin-library %t/%target-library-name(MacroDefinition) -I %swift-host-lib-dir %s -module-name MacroUser -o - -g | %FileCheck --check-prefix CHECK-IR %s
 
 // Execution testing
-// RUN: %target-build-swift -swift-version 5 -enable-experimental-feature FreestandingMacros -load-plugin-library %t/%target-library-name(MacroDefinition) -I %swift-host-lib-dir -L %swift-host-lib-dir %s -o %t/main -module-name MacroUser
+// RUN: %target-build-swift -swift-version 5 -g -enable-experimental-feature FreestandingMacros -load-plugin-library %t/%target-library-name(MacroDefinition) -I %swift-host-lib-dir -L %swift-host-lib-dir %s -o %t/main -module-name MacroUser
 // RUN: %target-run %t/main | %FileCheck %s
 // REQUIRES: executable_test
 
@@ -83,10 +83,10 @@ struct Bad {}
 func testFileID(a: Int, b: Int) {
   // CHECK: MacroUser/macro_expand.swift
   print("Result is \(#customFileID)")
-  // HECK-SIL: sil_scope [[MACRO_SCOPE:[0-9]+]] { loc "{{.*}}":1:1 parent @$s9MacroUser10testFileID1a1bySi_SitF06customdE0fMf_ {{.*}} }
-  // HECK-SIL: sil_scope [[SRC_SCOPE:[0-9]+]] { loc "{{.*}}macro_expand.swift":[[@LINE-2]]
-  // HECK-SIL: sil_scope {{[0-9]+}} { loc "{{.*}}":1:1 parent [[MACRO_SCOPE]] inlined_at [[SRC_SCOPE]] }
-  // HECK-IR: !DISubprogram(name: "customFileID", linkageName: "$s9MacroUser10testFileID1a1bySi_SitF06customdE0fMf_"
+  // CHECK-SIL: sil_scope [[MACRO_SCOPE:[0-9]+]] { loc "{{.*}}":1:1 parent @$s9MacroUser10testFileID1a1bySi_SitF06customdE0fMf_ {{.*}} }
+  // CHECK-SIL: sil_scope [[SRC_SCOPE:[0-9]+]] { loc "{{.*}}macro_expand.swift":[[@LINE-2]]
+  // CHECK-SIL: sil_scope {{[0-9]+}} { loc "{{.*}}":1:1 parent [[MACRO_SCOPE]] inlined_at [[SRC_SCOPE]] }
+  // CHECK-IR: !DISubprogram(name: "customFileID", linkageName: "$s9MacroUser10testFileID1a1bySi_SitF06customdE0fMf_"
 
 
   // CHECK: Builtin result is MacroUser/macro_expand.swift
@@ -230,26 +230,32 @@ func testNestedDeclInExpr() {
 @freestanding(declaration, names: named(A), named(B), named(foo), named(addOne))
 macro defineDeclsWithKnownNames() = #externalMacro(module: "MacroDefinition", type: "DefineDeclsWithKnownNamesMacro")
 
-//#bitwidthNumberedStructs("MyIntGlobal")
-//
-//#bitwidthNumberedStructs("MyIntGlobalTwo", blah: false)
-//
-//let blah = false
-//#bitwidthNumberedStructs("MyIntGlobalThree", blah: blah)
+// FIXME: Macros producing arbitrary names are not supported yet
+#if false
+#bitwidthNumberedStructs("MyIntGlobal")
+
+#bitwidthNumberedStructs("MyIntGlobalTwo", blah: false)
+
+let blah = false
+#bitwidthNumberedStructs("MyIntGlobalThree", blah: blah)
+#endif
 
 // Test unqualified lookup from within a macro expansion
 @freestanding(declaration, names: named(StructWithUnqualifiedLookup))
 macro structWithUnqualifiedLookup() = #externalMacro(module: "MacroDefinition", type: "DefineStructWithUnqualifiedLookupMacro")
-let world = 3 // to be used by the macro expansion below
-#structWithUnqualifiedLookup()
-_ = StructWithUnqualifiedLookup().foo()
 
 @freestanding(declaration)
 macro anonymousTypes(_: () -> String) = #externalMacro(module: "MacroDefinition", type: "DefineAnonymousTypesMacro")
 
-#anonymousTypes { "hello" }
 
-// CECK-SIL: $s9MacroUser14anonymousTypesfMf0_4namefMu_
+// FIXME: Global freestanding macros not yet supported in script mode.
+#if false
+let world = 3 // to be used by the macro expansion below
+#structWithUnqualifiedLookup()
+_ = StructWithUnqualifiedLookup().foo()
+
+#anonymousTypes { "hello" }
+#endif
 
 func testFreestandingMacroExpansion() {
   // Explicit structs to force macros to be parsed as decl.
@@ -309,7 +315,5 @@ func testFreestandingMacroExpansion() {
   // print(MyIntGlobal64.self)
 
   #anonymousTypes { "hello" }
-  // expected-note @-1 2 {{in expansion of macro 'anonymousTypes' here}}
-  // HECK-SIL: $s9MacroUser016testFreestandingA9ExpansionyyF14anonymousTypesfMf1_4namefMu_
 }
 testFreestandingMacroExpansion()

test/Macros/macro_expand_synthesized_members.swift

@@ -74,7 +74,7 @@ public macro ExtendableEnum() = #externalMacro(module: "MacroDefinition", type:
 
 @ExtendableEnum
 enum ElementType {
-case paper
+  case paper
 }
 
 print(ElementType.paper.unknown())