Merge pull request #4113 from swiftwasm/main

Author: MaxDesiatov

docs/DebuggingTheCompiler.md

@@ -931,7 +931,7 @@ standalone driver must be built as a separate build product using the
 *just-built* Swift compiler and toolchain (the ones built in the same
 `build-script` invocation, preceding the SwiftDriver build product). The
 additional build product is added to the build by specifying the
-`--swift-driver` option of the `build-script`. The driver product is istalled
+`--swift-driver` option of the `build-script`. The driver product is installed
 into the resulting toolchain installation by specifying the
 `--install-swift-driver` option of the `build-script`.
 

docs/HowToGuides/GettingStarted.md

@@ -457,7 +457,7 @@ There are two main ways to run tests:
    The `-s` and `-vv` flags print a progress bar and the executed commands
    respectively.
 
-If you making small changes to the compiler or some other component, you'll
+If you are making small changes to the compiler or some other component, you'll
 likely want to [incrementally rebuild](#editing-code) only the relevant
 Ninja/Xcode target and use `lit.py` with `--filter`. One potential failure
 mode with this approach is accidental use of stale binaries. For example, say

include/swift/AST/FileUnit.h

@@ -16,7 +16,6 @@
 #include "swift/AST/Module.h"
 #include "swift/AST/RawComment.h"
 #include "swift/Basic/BasicSourceInfo.h"
-#include "swift/Basic/Debug.h"
 
 #include "llvm/ADT/PointerIntPair.h"
 
@@ -309,9 +308,6 @@ class FileUnit : public DeclContext, public ASTAllocated<FileUnit> {
     return getParentModule()->getRealName().str();
   }
 
-  SWIFT_DEBUG_DUMPER(dumpDisplayDecls());
-  SWIFT_DEBUG_DUMPER(dumpTopLevelDecls());
-
   /// Traverse the decls within this file.
   ///
   /// \returns true if traversal was aborted, false if it completed

include/swift/AST/Module.h

@@ -26,7 +26,6 @@
 #include "swift/AST/Type.h"
 #include "swift/Basic/BasicSourceInfo.h"
 #include "swift/Basic/Compiler.h"
-#include "swift/Basic/Debug.h"
 #include "swift/Basic/OptionSet.h"
 #include "swift/Basic/STLExtras.h"
 #include "swift/Basic/SourceLoc.h"
@@ -857,9 +856,6 @@ class ModuleDecl
   /// transferred from module files to the dSYMs, remove this.
   bool isExternallyConsumed() const;
 
-  SWIFT_DEBUG_DUMPER(dumpDisplayDecls());
-  SWIFT_DEBUG_DUMPER(dumpTopLevelDecls());
-
   SourceRange getSourceRange() const { return SourceRange(); }
 
   static bool classof(const DeclContext *DC) {

include/swift/AST/SourceFile.h

@@ -288,10 +288,6 @@ class SourceFile final : public FileUnit {
 
   ~SourceFile();
 
-  bool hasImports() const {
-    return Imports.hasValue();
-  }
-
   /// Retrieve an immutable view of the source file's imports.
   ArrayRef<AttributedImport<ImportedModule>> getImports() const {
     return *Imports;

lib/AST/Module.cpp

@@ -780,22 +780,6 @@ void SourceFile::lookupObjCMethods(
   results.append(known->second.begin(), known->second.end());
 }
 
-static void collectParsedExportedImports(const ModuleDecl *M, SmallPtrSetImpl<ModuleDecl *> &Imports) {
-  for (const FileUnit *file : M->getFiles()) {
-    if (const SourceFile *source = dyn_cast<SourceFile>(file)) {
-      if (source->hasImports()) {
-        for (auto import : source->getImports()) {
-          if (import.options.contains(ImportFlags::Exported)) {
-            if (!Imports.contains(import.module.importedModule)) {
-              Imports.insert(import.module.importedModule);
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
 void ModuleDecl::getLocalTypeDecls(SmallVectorImpl<TypeDecl*> &Results) const {
   FORWARD(getLocalTypeDecls, (Results));
 }
@@ -804,24 +788,6 @@ void ModuleDecl::getTopLevelDecls(SmallVectorImpl<Decl*> &Results) const {
   FORWARD(getTopLevelDecls, (Results));
 }
 
-void ModuleDecl::dumpDisplayDecls() const {
-  SmallVector<Decl *, 32> Decls;
-  getDisplayDecls(Decls);
-  for (auto *D : Decls) {
-    D->dump(llvm::errs());
-    llvm::errs() << "\n";
-  }
-}
-
-void ModuleDecl::dumpTopLevelDecls() const {
-  SmallVector<Decl *, 32> Decls;
-  getTopLevelDecls(Decls);
-  for (auto *D : Decls) {
-    D->dump(llvm::errs());
-    llvm::errs() << "\n";
-  }
-}
-
 void ModuleDecl::getExportedPrespecializations(
     SmallVectorImpl<Decl *> &Results) const {
   FORWARD(getExportedPrespecializations, (Results));
@@ -942,23 +908,8 @@ SourceFile::getExternalRawLocsForDecl(const Decl *D) const {
 }
 
 void ModuleDecl::getDisplayDecls(SmallVectorImpl<Decl*> &Results) const {
-  if (isParsedModule(this)) {
-    SmallPtrSet<ModuleDecl *, 4> Modules;
-    collectParsedExportedImports(this, Modules);
-    for (const ModuleDecl *import : Modules) {
-      import->getDisplayDecls(Results);
-    }
-  }
   // FIXME: Should this do extra access control filtering?
   FORWARD(getDisplayDecls, (Results));
-
-#ifndef NDEBUG
-  llvm::DenseSet<Decl *> visited;
-  for (auto *D : Results) {
-    auto inserted = visited.insert(D).second;
-    assert(inserted && "there should be no duplicate decls");
-  }
-#endif
 }
 
 ProtocolConformanceRef
@@ -3115,22 +3066,6 @@ void FileUnit::getTopLevelDeclsWhereAttributesMatch(
   Results.erase(newEnd, Results.end());
 }
 
-void FileUnit::dumpDisplayDecls() const {
-  SmallVector<Decl *, 32> Decls;
-  getDisplayDecls(Decls);
-  for (auto *D : Decls) {
-    D->dump(llvm::errs());
-  }
-}
-
-void FileUnit::dumpTopLevelDecls() const {
-  SmallVector<Decl *, 32> Decls;
-  getTopLevelDecls(Decls);
-  for (auto *D : Decls) {
-    D->dump(llvm::errs());
-  }
-}
-
 void swift::simple_display(llvm::raw_ostream &out, const FileUnit *file) {
   if (!file) {
     out << "(null)";

test/SymbolGraph/ClangImporter/EmitWhileBuilding.swift

@@ -1,19 +1,15 @@
 // RUN: %empty-directory(%t)
 // RUN: cp -r %S/Inputs/EmitWhileBuilding/EmitWhileBuilding.framework %t
-// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -emit-module-path %t/EmitWhileBuilding.framework/Modules/EmitWhileBuilding.swiftmodule/%target-swiftmodule-name -import-underlying-module -F %t -module-name EmitWhileBuilding -disable-objc-attr-requires-foundation-module %s %S/Inputs/EmitWhileBuilding/Extra.swift -emit-symbol-graph -emit-symbol-graph-dir %t
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -emit-module-path %t/EmitWhileBuilding.framework/Modules/EmitWhileBuilding.swiftmodule/%target-swiftmodule-name -import-underlying-module -F %t -module-name EmitWhileBuilding -disable-objc-attr-requires-foundation-module %s -emit-symbol-graph -emit-symbol-graph-dir %t
 // RUN: %{python} -m json.tool %t/EmitWhileBuilding.symbols.json %t/EmitWhileBuilding.formatted.symbols.json
 // RUN: %FileCheck %s --input-file %t/EmitWhileBuilding.formatted.symbols.json
-// RUN: %FileCheck %s --input-file %t/EmitWhileBuilding.formatted.symbols.json --check-prefix HEADER
 
 // REQUIRES: objc_interop
 
 import Foundation
 
 public enum SwiftEnum {}
 
-// HEADER:       "precise": "c:@testVariable"
-
-// CHECK:        "precise": "s:17EmitWhileBuilding9SwiftEnumO",
 // CHECK:        "declarationFragments": [
 // CHECK-NEXT:       {
 // CHECK-NEXT:           "kind": "keyword",

test/SymbolGraph/ClangImporter/Inputs/EmitWhileBuilding/Extra.swift

@@ -0,0 +1,6 @@
+// RUN: %target-typecheck-verify-swift
+
+extension Array where Element == String {
+  typealias InternalTypeAlias = Int
+  func doSomething<R>(foo: (InternalTypeAlias) -> R) {}
+}