Merge pull request #1254 from swiftwasm/master

[pull] swiftwasm from master

Author: pull[bot]

include/swift/AST/CMakeLists.txt

@@ -0,0 +1,3 @@
+swift_install_in_component(DIRECTORY diagnostics
+                           DESTINATION "share/swift/"
+                           COMPONENT compiler)

include/swift/AST/DiagnosticEngine.h

@@ -58,6 +58,11 @@ namespace swift {
     DiagID ID;
   };
 
+  struct DiagnosticNode {
+    DiagID id;
+    std::string msg;
+  };
+
   namespace detail {
     /// Describes how to pass a diagnostic argument of the given type.
     ///
@@ -629,7 +634,26 @@ namespace swift {
     DiagnosticState(DiagnosticState &&) = default;
     DiagnosticState &operator=(DiagnosticState &&) = default;
   };
-    
+
+  class LocalizationProducer {
+  public:
+    /// If the  message isn't available/localized in the current `yaml` file,
+    /// return the fallback default message.
+    virtual std::string getMessageOr(DiagID id,
+                                     std::string defaultMessage) const {
+      return defaultMessage;
+    }
+
+    virtual ~LocalizationProducer() {}
+  };
+
+  class YAMLLocalizationProducer final : public LocalizationProducer {
+  public:
+    std::vector<std::string> diagnostics;
+    explicit YAMLLocalizationProducer(std::string locale, std::string path);
+    std::string getMessageOr(DiagID id,
+                             std::string defaultMessage) const override;
+  };
   /// Class responsible for formatting diagnostics and presenting them
   /// to the user.
   class DiagnosticEngine {
@@ -663,6 +687,10 @@ namespace swift {
     /// but rather stored until all transactions complete.
     llvm::StringSet<llvm::BumpPtrAllocator &> TransactionStrings;
 
+    /// Diagnostic producer to handle the logic behind retriving a localized
+    /// diagnostic message.
+    std::unique_ptr<LocalizationProducer> localization;
+
     /// The number of open diagnostic transactions. Diagnostics are only
     /// emitted once all transactions have closed.
     unsigned TransactionCount = 0;
@@ -734,6 +762,11 @@ namespace swift {
       return diagnosticDocumentationPath;
     }
 
+    void setLocalization(std::string locale, std::string path) {
+      if (!locale.empty() && !path.empty())
+        localization = std::make_unique<YAMLLocalizationProducer>(locale, path);
+    }
+
     void ignoreDiagnostic(DiagID id) {
       state.setDiagnosticBehavior(id, DiagnosticState::Behavior::Ignore);
     }
@@ -955,8 +988,7 @@ namespace swift {
     void emitTentativeDiagnostics();
 
   public:
-    static const char *diagnosticStringFor(const DiagID id,
-                                           bool printDiagnosticName);
+    const char *diagnosticStringFor(const DiagID id, bool printDiagnosticName);
 
     /// If there is no clear .dia file for a diagnostic, put it in the one
     /// corresponding to the SourceLoc given here.

include/swift/AST/DiagnosticMessageFormat.h

@@ -0,0 +1,42 @@
+//===--- DiagnosticMessageFormat.h - YAML format for Diagnostic Messages ---*-
+//C++ -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2020 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 the YAML format for diagnostic messages.
+//
+//===----------------------------------------------------------------------===//
+
+#include "DiagnosticList.cpp"
+#include "llvm/Support/YAMLTraits.h"
+
+namespace llvm {
+namespace yaml {
+
+template <> struct ScalarEnumerationTraits<swift::DiagID> {
+  static void enumeration(IO &io, swift::DiagID &value) {
+#define DIAG(KIND, ID, Options, Text, Signature)                               \
+  io.enumCase(value, #ID, swift::DiagID::ID);
+#include "swift/AST/DiagnosticsAll.def"
+  }
+};
+
+template <> struct MappingTraits<swift::DiagnosticNode> {
+  static void mapping(IO &io, swift::DiagnosticNode &node) {
+    io.mapRequired("id", node.id);
+    io.mapRequired("msg", node.msg);
+  }
+};
+
+} // namespace yaml
+} // namespace llvm
+
+LLVM_YAML_IS_SEQUENCE_VECTOR(swift::DiagnosticNode)

include/swift/AST/Diagnostics/fr.yaml

@@ -0,0 +1,19 @@
+#===--- fr.yaml - Localized diagnostic messages for French ---*- YAML -*-===#
+#
+# This source file is part of the Swift.org open source project
+#
+# Copyright (c) 2014 - 2020 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 the diagnostic messages for French language.
+# Each diagnostic is described in the following format:
+# - id: <diagnostic-id>
+#   msg: <diagnostic-message>
+# 
+#===----------------------------------------------------------------------===#
+

include/swift/AST/DiagnosticsFrontend.def

@@ -247,6 +247,14 @@ ERROR(previous_installname_map_corrupted,none,
       "previous install name map from %0 is malformed",
       (StringRef))
 
+ERROR(explicit_swift_module_map_missing,none,
+      "cannot open explicit Swift module map from %0",
+      (StringRef))
+
+ERROR(explicit_swift_module_map_corrupted,none,
+      "explicit Swift module map from %0 is malformed",
+      (StringRef))
+
 REMARK(default_previous_install_name, none,
       "default previous install name for %0 is %1", (StringRef, StringRef))
 

include/swift/AST/SearchPathOptions.h

@@ -85,6 +85,8 @@ class SearchPathOptions {
   /// The paths to a set of explicitly built modules from interfaces.
   std::vector<std::string> ExplicitSwiftModules;
 
+  /// A map of explict Swift module information.
+  std::string ExplicitSwiftModuleMap;
 private:
   static StringRef
   pathStringFromFrameworkSearchPath(const FrameworkSearchPath &next) {

include/swift/AST/diagnostics/en.yaml

@@ -0,0 +1,19 @@
+#===--- en.yaml - Localized diagnostic messages for English ---*- YAML -*-===#
+#
+# This source file is part of the Swift.org open source project
+#
+# Copyright (c) 2014 - 2020 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 the diagnostic messages for English language.
+# Each diagnostic is described in the following format:
+# - id: <diagnostic-id>
+#   msg: <diagnostic-message>
+# 
+#===----------------------------------------------------------------------===#
+

include/swift/Frontend/ModuleInterfaceLoader.h

@@ -150,6 +150,7 @@ class ExplicitSwiftModuleLoader: public SerializedModuleLoaderBase {
   create(ASTContext &ctx,
          DependencyTracker *tracker, ModuleLoadingMode loadMode,
          ArrayRef<std::string> ExplicitModulePaths,
+         StringRef ExplicitSwiftModuleMap,
          bool IgnoreSwiftSourceInfoFile);
 
   /// Append visible module names to \p names. Note that names are possibly

include/swift/Option/FrontendOptions.td

@@ -220,6 +220,10 @@ def disable_implicit_swift_modules: Flag<["-"], "disable-implicit-swift-modules"
 def swift_module_file
   : Separate<["-"], "swift-module-file">, MetaVarName<"<path>">,
     HelpText<"Specify Swift module explicitly built from textual interface">;
+
+def explict_swift_module_map
+  : Separate<["-"], "explicit-swift-module-map-file">, MetaVarName<"<path>">,
+    HelpText<"Specify a JSON file containing information of explict Swift modules">;
 }
 
 

include/swift/Reflection/ReflectionContext.h

@@ -838,6 +838,18 @@ class ReflectionContext
     return 0;
   }
 
+  /// Get the name of a metadata tag, if known.
+  llvm::Optional<std::string> metadataAllocationTagName(int Tag) {
+    switch (Tag) {
+#define TAG(name, value)                                                       \
+  case value:                                                                  \
+    return std::string(#name);
+#include "../../../stdlib/public/runtime/MetadataAllocatorTags.def"
+    default:
+      return llvm::None;
+    }
+  }
+
   /// Iterate the metadata allocations in the target process, calling Call with
   /// each allocation found. Returns None on success, and a string describing
   /// the error on failure.

include/swift/Runtime/Metadata.h

@@ -29,29 +29,9 @@ namespace swift {
 // allocator. This is encoded in a header on each allocation when metadata
 // iteration is enabled, and allows tools to know where each allocation came
 // from.
-//
-// Some of these values are also declared in SwiftRemoteMirrorTypes.h. Those
-// values must be kept stable to preserve compatibility.
 enum MetadataAllocatorTags : uint16_t {
-  UnusedTag = 0,
-  BoxesTag,
-  ObjCClassWrappersTag,
-  FunctionTypesTag,
-  MetatypeTypesTag,
-  ExistentialMetatypeValueWitnessTablesTag,
-  ExistentialMetatypesTag,
-  ExistentialTypesTag,
-  OpaqueExistentialValueWitnessTablesTag,
-  ClassExistentialValueWitnessTablesTag,
-  ForeignWitnessTablesTag,
-  ResilientMetadataAllocatorTag,
-  MetadataTag,
-  TupleCacheTag,
-  GenericMetadataCacheTag,
-  ForeignMetadataCacheTag,
-  GenericWitnessTableCacheTag,
-  GenericClassMetadataTag,
-  GenericValueMetadataTag,
+#define TAG(name, value) name##Tag = value,
+#include "../../../stdlib/public/runtime/MetadataAllocatorTags.def"
 };
 
 template <typename Runtime> struct MetadataAllocationBacktraceHeader {

include/swift/SwiftRemoteMirror/SwiftRemoteMirror.h

@@ -324,16 +324,24 @@ const char *swift_reflection_iterateMetadataAllocations(
 /// Given a metadata allocation, return the metadata it points to. Returns NULL
 /// on failure. Despite the name, not all allocations point to metadata.
 /// Currently, this will return a metadata only for allocations with tag
-/// SWIFT_GENERIC_METADATA_CACHE_ALLOCATION. Support for additional tags may be
-/// added in the future. The caller must gracefully handle failure.
+/// GenericMetadataCache. Support for additional tags may be added in the
+/// future. The caller must gracefully handle failure.
 SWIFT_REMOTE_MIRROR_LINKAGE
 swift_reflection_ptr_t swift_reflection_allocationMetadataPointer(
   SwiftReflectionContextRef ContextRef,
   swift_metadata_allocation_t Allocation);
 
+/// Return the name of a metadata allocation tag, or NULL if the tag is unknown.
+/// This pointer remains valid until the next swift_reflection call on the given
+/// context.
+SWIFT_REMOTE_MIRROR_LINKAGE
+const char *
+swift_reflection_metadataAllocationTagName(SwiftReflectionContextRef ContextRef,
+                                           swift_metadata_allocation_tag_t Tag);
+
 /// Backtrace iterator callback passed to
 /// swift_reflection_iterateMetadataAllocationBacktraces
-typedef void (*swift_metadataAllocationIterator)(
+typedef void (*swift_metadataAllocationBacktraceIterator)(
     swift_reflection_ptr_t AllocationPtr, size_t Count,
     const swift_reflection_ptr_t Ptrs[], void *ContextPtr);
 
@@ -350,8 +358,8 @@ typedef void (*swift_metadataAllocationIterator)(
 /// swift_reflection call on the given context.
 SWIFT_REMOTE_MIRROR_LINKAGE
 const char *swift_reflection_iterateMetadataAllocationBacktraces(
-    SwiftReflectionContextRef ContextRef, swift_metadataAllocationIterator Call,
-    void *ContextPtr);
+    SwiftReflectionContextRef ContextRef,
+    swift_metadataAllocationBacktraceIterator Call, void *ContextPtr);
 
 #ifdef __cplusplus
 } // extern "C"

lib/AST/ASTDumper.cpp

@@ -1884,6 +1884,10 @@ class PrintExpr : public ExprVisitor<PrintExpr> {
 
   void visitCodeCompletionExpr(CodeCompletionExpr *E) {
     printCommon(E, "code_completion_expr");
+    if (E->getBase()) {
+      OS << '\n';
+      printRec(E->getBase());
+    }
     PrintWithColorRAII(OS, ParenthesisColor) << ')';
   }
 

lib/AST/Attr.cpp

@@ -1711,9 +1711,8 @@ void DifferentiableAttr::setParameterIndices(IndexSubset *paramIndices) {
 
 GenericEnvironment *DifferentiableAttr::getDerivativeGenericEnvironment(
     AbstractFunctionDecl *original) const {
-  GenericEnvironment *derivativeGenEnv = original->getGenericEnvironment();
   if (auto derivativeGenSig = getDerivativeGenericSignature())
-    return derivativeGenEnv = derivativeGenSig->getGenericEnvironment();
+    return derivativeGenSig->getGenericEnvironment();
   return original->getGenericEnvironment();
 }