Merge pull request #3624 from swiftwasm/main

Author: MaxDesiatov

include/swift/AST/ASTContext.h

@@ -347,6 +347,9 @@ class ASTContext final {
   /// Cache of module names that fail the 'canImport' test in this context.
   mutable llvm::SmallPtrSet<Identifier, 8> FailedModuleImportNames;
 
+  /// Mapping between aliases and real (physical) names of imported or referenced modules.
+  mutable llvm::DenseMap<Identifier, Identifier> ModuleAliasMap;
+
   /// Retrieve the allocator for the given arena.
   llvm::BumpPtrAllocator &
   getAllocator(AllocationArena arena = AllocationArena::Permanent) const;
@@ -471,6 +474,16 @@ class ASTContext final {
   /// specified string.
   Identifier getIdentifier(StringRef Str) const;
 
+  /// Convert a given alias map to a map of Identifiers between module aliases and their actual names.
+  /// For example, if '-module-alias Foo=X -module-alias Bar=Y' input is passed in, the aliases Foo and Bar are
+  /// the names of the imported or referenced modules in source files in the main module, and X and Y
+  /// are the real (physical) module names on disk.
+  void setModuleAliases(const llvm::StringMap<StringRef> &aliasMap);
+
+  /// Retrieve the actual module name if a module alias is used via '-module-alias Foo=X', where Foo is
+  /// a module alias and X is the real (physical) name. Returns \p key if no aliasing is used.
+  Identifier getRealModuleName(Identifier key) const;
+
   /// Decide how to interpret two precedence groups.
   Associativity associateInfixOperators(PrecedenceGroupDecl *left,
                                         PrecedenceGroupDecl *right) const;

include/swift/AST/DiagnosticsParse.def

@@ -1030,6 +1030,8 @@ ERROR(expected_await_not_async,none,
 // Yield Statment
 ERROR(expected_expr_yield,PointsToFirstBadToken,
       "expected expression in 'yield' statement", ())
+ERROR(unexpected_label_yield,none,
+      "unexpected label in 'yield' statement", ())
 
 // Defer Statement
 ERROR(expected_lbrace_after_defer,PointsToFirstBadToken,

include/swift/AST/Module.h

@@ -357,6 +357,15 @@ class ModuleDecl
     ModuleABIName = name;
   }
 
+  /// Retrieve the actual module name of an alias used for this module (if any).
+  ///
+  /// For example, if '-module-alias Foo=Bar' is passed in when building the main module,
+  /// and this module is (a) not the main module and (b) is named Foo, then it returns
+  /// the real (physically on-disk) module name Bar.
+  ///
+  /// If no module aliasing is set, it will return getName(), i.e. Foo.
+  Identifier getRealName() const;
+
   /// User-defined module version number.
   llvm::VersionTuple UserModuleVersion;
   void setUserModuleVersion(llvm::VersionTuple UserVer) {
@@ -365,6 +374,7 @@ class ModuleDecl
   llvm::VersionTuple getUserModuleVersion() const {
     return UserModuleVersion;
   }
+
 private:
   /// A cache of this module's underlying module and required bystander if it's
   /// an underscored cross-import overlay.

include/swift/AST/SearchPathOptions.h

@@ -14,6 +14,7 @@
 #define SWIFT_AST_SEARCHPATHOPTIONS_H
 
 #include "swift/Basic/ArrayRefView.h"
+#include "swift/Basic/PathRemapper.h"
 #include "llvm/ADT/Hashing.h"
 
 #include <string>
@@ -97,6 +98,11 @@ class SearchPathOptions {
 
   /// A file containing modules we should perform batch scanning.
   std::string BatchScanInputFilePath;
+
+  /// Debug path mappings to apply to serialized search paths. These are
+  /// specified in LLDB from the target.source-map entries.
+  PathRemapper SearchPathRemapper;
+
 private:
   static StringRef
   pathStringFromFrameworkSearchPath(const FrameworkSearchPath &next) {

include/swift/Basic/LangOptions.h

@@ -771,6 +771,9 @@ namespace swift {
                           DisableOverlayModules,
                           EnableClangSPI);
     }
+
+    std::vector<std::string> getRemappedExtraArgs(
+        std::function<std::string(StringRef)> pathRemapCallback) const;
   };
 
 } // end namespace swift

include/swift/Basic/Statistics.def

@@ -268,6 +268,7 @@ FRONTEND_STATISTIC(Sema, NumUnloadedLazyIterableDeclContexts)
 #include "swift/AST/TypeCheckerTypeIDZone.def"
 #include "swift/Sema/IDETypeCheckingRequestIDZone.def"
 #include "swift/IDE/IDERequestIDZone.def"
+#include "swift/ClangImporter/ClangImporterTypeIDZone.def"
 #undef SWIFT_REQUEST
 
 #define SWIFT_REQUEST(ZONE, NAME, Sig, Caching, LocOptions) FRONTEND_STATISTIC(SILGen, NAME)

include/swift/Basic/TypeIDZones.def

@@ -1,37 +1,39 @@
 //===--- TypeIDZones.def - List of TypeID Zones -----------------*- C++ -*-===//
- //
- // This source file is part of the Swift.org open source project
- //
- // Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
- // Licensed under Apache License v2.0 with Runtime Library Exception
- //
- // See https://swift.org/LICENSE.txt for license information
- // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
- //
- //===----------------------------------------------------------------------===//
- //
- //  This definition file describes the zones for TypeID.
- //
- //===----------------------------------------------------------------------===//
-
- SWIFT_TYPEID_ZONE(C, 0)
- SWIFT_TYPEID_ZONE(AST, 1)
-
- SWIFT_TYPEID_ZONE(Parse, 8)
- SWIFT_TYPEID_ZONE(NameLookup, 9)
-
- SWIFT_TYPEID_ZONE(TypeChecker, 10)
- SWIFT_TYPEID_ZONE(AccessControl, 11)
- SWIFT_TYPEID_ZONE(SILGen, 12)
- SWIFT_TYPEID_ZONE(SILOptimizer, 13)
- SWIFT_TYPEID_ZONE(TBDGen, 14)
-
- SWIFT_TYPEID_ZONE(IRGen, 20)
-
- SWIFT_TYPEID_ZONE(IDETypeChecking, 97)
-
- SWIFT_TYPEID_ZONE(IDETypes, 136)
- SWIFT_TYPEID_ZONE(IDE, 137)
-
- // N.B. This is not a formal zone and exists solely to support the unit tests.
- SWIFT_TYPEID_ZONE(ArithmeticEvaluator, 255)
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+//
+//  This definition file describes the zones for TypeID.
+//
+//===----------------------------------------------------------------------===//
+
+SWIFT_TYPEID_ZONE(C, 0)
+SWIFT_TYPEID_ZONE(AST, 1)
+
+SWIFT_TYPEID_ZONE(Parse, 8)
+SWIFT_TYPEID_ZONE(NameLookup, 9)
+
+SWIFT_TYPEID_ZONE(TypeChecker, 10)
+SWIFT_TYPEID_ZONE(AccessControl, 11)
+SWIFT_TYPEID_ZONE(SILGen, 12)
+SWIFT_TYPEID_ZONE(SILOptimizer, 13)
+SWIFT_TYPEID_ZONE(TBDGen, 14)
+
+SWIFT_TYPEID_ZONE(IRGen, 20)
+
+SWIFT_TYPEID_ZONE(IDETypeChecking, 97)
+
+SWIFT_TYPEID_ZONE(IDETypes, 136)
+SWIFT_TYPEID_ZONE(IDE, 137)
+
+SWIFT_TYPEID_ZONE(ClangImporter, 139)
+
+// N.B. This is not a formal zone and exists solely to support the unit tests.
+SWIFT_TYPEID_ZONE(ArithmeticEvaluator, 255)

include/swift/ClangImporter/ClangImporterRequests.h

@@ -0,0 +1,48 @@
+//===--- ClangImporterRequests.h - Clang Importer Requests ------*- C++ -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2021 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+//
+//  This file defines clang-importer requests.
+//
+//===----------------------------------------------------------------------===//
+#ifndef SWIFT_CLANG_IMPORTER_REQUESTS_H
+#define SWIFT_CLANG_IMPORTER_REQUESTS_H
+
+#include "swift/AST/SimpleRequest.h"
+#include "swift/AST/ASTTypeIDs.h"
+#include "swift/AST/EvaluatorDependencies.h"
+
+namespace swift {
+
+#define SWIFT_TYPEID_ZONE ClangImporter
+#define SWIFT_TYPEID_HEADER "swift/ClangImporter/ClangImporterTypeIDZone.def"
+#include "swift/Basic/DefineTypeIDZone.h"
+#undef SWIFT_TYPEID_ZONE
+#undef SWIFT_TYPEID_HEADER
+
+// Set up reporting of evaluated requests.
+template<typename Request>
+void reportEvaluatedRequest(UnifiedStatsReporter &stats,
+                            const Request &request);
+
+#define SWIFT_REQUEST(Zone, RequestType, Sig, Caching, LocOptions)             \
+  template <>                                                                  \
+  inline void reportEvaluatedRequest(UnifiedStatsReporter &stats,              \
+                                     const RequestType &request) {             \
+    ++stats.getFrontendCounters().RequestType;                                 \
+  }
+#include "swift/ClangImporter/ClangImporterTypeIDZone.def"
+#undef SWIFT_REQUEST
+
+} // end namespace swift
+
+#endif // SWIFT_CLANG_IMPORTER_REQUESTS_H
+

include/swift/ClangImporter/ClangImporterTypeIDZone.def

@@ -0,0 +1,17 @@
+//===--- ClangImporterTypeIDZone.def ----------------------------*- C++ -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2021 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+//
+//  This definition file describes the types in the clang importer
+//  TypeID zone, for use with the TypeID template.
+//
+//===----------------------------------------------------------------------===//
+

include/swift/Frontend/FrontendOptions.h

@@ -182,6 +182,11 @@ class FrontendOptions {
   /// module appears to not be a public module.
   Optional<bool> SerializeOptionsForDebugging;
 
+  /// When true the debug prefix map entries will be applied to debugging
+  /// options before serialization. These can be reconstructed at debug time by
+  /// applying the inverse map in SearchPathOptions.SearchPathRemapper.
+  bool DebugPrefixSerializedDebuggingOptions = false;
+
   /// When true, check if all required SwiftOnoneSupport symbols are present in
   /// the module.
   bool CheckOnoneSupportCompleteness = false;

include/swift/Option/Options.td

@@ -559,7 +559,7 @@ def disable_bridging_pch : Flag<["-"], "disable-bridging-pch">,
 def lto : Joined<["-"], "lto=">,
   Flags<[FrontendOption, NoInteractiveOption]>,
   HelpText<"Specify the LTO type to either 'llvm-thin' or 'llvm-full'">;
-  
+
 def lto_library : Separate<["-"], "lto-library">,
   Flags<[FrontendOption, ArgumentIsPath, NoInteractiveOption]>,
   HelpText<"Perform LTO with <lto-library>">, MetaVarName<"<lto-library>">;
@@ -815,6 +815,10 @@ def debug_info_format : Joined<["-"], "debug-info-format=">,
   Flags<[FrontendOption]>,
   HelpText<"Specify the debug info format type to either 'dwarf' or 'codeview'">;
 
+def prefix_serialized_debugging_options : Flag<["-"], "prefix-serialized-debugging-options">,
+  Flags<[FrontendOption]>,
+  HelpText<"Apply debug prefix mappings to serialized debug info in Swiftmodule files">;
+
 // Verify debug info
 def verify_debug_info : Flag<["-"], "verify-debug-info">,
   Flags<[NoInteractiveOption, DoesNotAffectIncrementalBuild]>,

include/swift/Serialization/SerializationOptions.h

@@ -14,6 +14,7 @@
 #define SWIFT_SERIALIZATION_SERIALIZATIONOPTIONS_H
 
 #include "swift/Basic/LLVM.h"
+#include "swift/Basic/PathRemapper.h"
 #include "llvm/Support/VersionTuple.h"
 
 namespace swift {
@@ -42,7 +43,10 @@ namespace swift {
     StringRef ImportedHeader;
     StringRef ModuleLinkName;
     StringRef ModuleInterface;
-    ArrayRef<std::string> ExtraClangOptions;
+    std::vector<std::string> ExtraClangOptions;
+
+    /// Path prefixes that should be rewritten in debug info.
+    PathRemapper DebuggingOptionsPrefixMap;
 
     /// Describes a single-file dependency for this module, along with the
     /// appropriate strategy for how to verify if it's up-to-date.

include/swift/Subsystems.h

@@ -363,6 +363,12 @@ namespace swift {
   /// Calling registerIDERequestFunctions will invoke this function as well.
   void registerIDETypeCheckRequestFunctions(Evaluator &evaluator);
 
+  /// Register clang importer request functions with the evaluator.
+  ///
+  /// Clients that form an ASTContext and import any Clang APIs should call this function
+  /// after forming the ASTContext.
+  void registerClangImporterRequestFunctions(Evaluator &evaluator);
+
   /// Register SILOptimizer passes necessary for IRGen.
   void registerIRGenSILTransforms(ASTContext &ctx);
 

lib/AST/ASTContext.cpp

@@ -1642,6 +1642,23 @@ void ASTContext::addModuleInterfaceChecker(
   getImpl().InterfaceChecker = std::move(checker);
 }
 
+void ASTContext::setModuleAliases(const llvm::StringMap<StringRef> &aliasMap) {
+  for (auto k: aliasMap.keys()) {
+    auto val = aliasMap.lookup(k);
+    if (!val.empty()) {
+      ModuleAliasMap[getIdentifier(k)] = getIdentifier(val);
+    }
+  }
+}
+
+Identifier ASTContext::getRealModuleName(Identifier key) const {
+  auto found = ModuleAliasMap.find(key);
+  if (found != ModuleAliasMap.end()) {
+    return found->second;
+  }
+  return key;
+}
+
 Optional<ModuleDependencies> ASTContext::getModuleDependencies(
     StringRef moduleName, bool isUnderlyingClangModule,
     ModuleDependenciesCache &cache, InterfaceSubContextDelegate &delegate,

lib/AST/ArgumentList.cpp

@@ -220,28 +220,35 @@ Optional<unsigned> ArgumentList::findArgumentExpr(Expr *expr,
 Expr *ArgumentList::packIntoImplicitTupleOrParen(
     ASTContext &ctx, llvm::function_ref<Type(Expr *)> getType) const {
   assert(!hasAnyInOutArgs() && "Cannot construct bare tuple/paren with inout");
+
+  // Make sure to preserve the source location info here and below as it may be
+  // needed for e.g serialization of its textual representation.
   if (auto *unary = getUnlabeledUnaryExpr()) {
-    auto *paren = new (ctx) ParenExpr(SourceLoc(), unary, SourceLoc());
+    auto *paren = new (ctx) ParenExpr(getLParenLoc(), unary, getRParenLoc());
     if (auto ty = getType(unary))
       paren->setType(ParenType::get(ctx, ty));
     paren->setImplicit();
     return paren;
   }
 
-  SmallVector<Expr *, 8> argExprs;
-  SmallVector<Identifier, 8> argLabels;
-  SmallVector<TupleTypeElt, 8> tupleEltTypes;
+  SmallVector<Expr *, 2> argExprs;
+  SmallVector<Identifier, 2> argLabels;
+  SmallVector<SourceLoc, 2> argLabelLocs;
+  SmallVector<TupleTypeElt, 2> tupleEltTypes;
 
   for (auto arg : *this) {
     auto *argExpr = arg.getExpr();
     argExprs.push_back(argExpr);
     argLabels.push_back(arg.getLabel());
+    argLabelLocs.push_back(arg.getLabelLoc());
     if (auto ty = getType(argExpr))
       tupleEltTypes.emplace_back(ty, arg.getLabel());
   }
   assert(tupleEltTypes.empty() || tupleEltTypes.size() == argExprs.size());
 
-  auto *tuple = TupleExpr::createImplicit(ctx, argExprs, argLabels);
+  auto *tuple =
+      TupleExpr::create(ctx, getLParenLoc(), argExprs, argLabels, argLabelLocs,
+                        getRParenLoc(), /*implicit*/ true);
   if (empty() || !tupleEltTypes.empty())
     tuple->setType(TupleType::get(tupleEltTypes, ctx));
 

lib/AST/Module.cpp

@@ -475,7 +475,6 @@ ModuleDecl::ModuleDecl(Identifier name, ASTContext &ctx,
   ctx.addDestructorCleanup(*this);
   setImplicit();
   setInterfaceType(ModuleType::get(this));
-
   setAccess(AccessLevel::Public);
 
   Bits.ModuleDecl.StaticLibrary = 0;
@@ -1564,6 +1563,11 @@ ImportedModule::removeDuplicates(SmallVectorImpl<ImportedModule> &imports) {
   imports.erase(last, imports.end());
 }
 
+Identifier ModuleDecl::getRealName() const {
+  // This will return the real name for an alias (if used) or getName()
+  return getASTContext().getRealModuleName(getName());
+}
+
 Identifier ModuleDecl::getABIName() const {
   if (!ModuleABIName.empty())
     return ModuleABIName;

lib/AST/NameLookupRequests.cpp

@@ -19,6 +19,7 @@
 #include "swift/AST/Evaluator.h"
 #include "swift/AST/Module.h"
 #include "swift/AST/SourceFile.h"
+#include "swift/ClangImporter/ClangImporterRequests.h"
 #include "swift/Subsystems.h"
 
 using namespace swift;