---

yaml
---
r: 445642
b: refs/heads/master-rebranch
c: ec9cd91
h: refs/heads/master

Author: nkcsgexi

[refs]

@@ -1701,7 +1701,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-12-19-a: 550bd4128211e1135c31ab186d2a9
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-12-20-a: f3e865a19683d7e9664718c41e4e956686efb1b3
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-12-21-a: 0852188b163c7ebd7054379e729cedc41c361f95
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-12-22-a: 4832e0c5e8723b7b4a2c626ac6a8a523576f1317
-refs/heads/master-rebranch: 518bbb3d40b3c6c55ca6baff239ee3117427d3e1
+refs/heads/master-rebranch: ec9cd91c1b11884f68d640da025a0625fa49878a
 refs/heads/revert-29064-handle-csdiag-coerce-diagnostics: 69656f1629e2cde21bb7f44179c535c1f3ad5dfd
 refs/heads/swift-5.1-DEVELOPMENT-SNAPSHOT-2018-11-16-a: 51fe19105062bb86b997c7698bb3f83ffc536d2c
 refs/heads/tgmath-derivatives-wip: 00adac82d118281f701c26fe8702ecb4bbe33e82

branches/master-rebranch/include/swift/AST/CMakeLists.txt

@@ -48,8 +48,8 @@ class ClangNode {
   template <typename T>
   using Box = detail::ClangNodeBox<T>;
 
-  llvm::PointerUnion<Box<clang::Decl>, Box<clang::MacroInfo>,
-                     Box<clang::ModuleMacro>, Box<clang::Module>> Ptr;
+  llvm::PointerUnion4<Box<clang::Decl>, Box<clang::MacroInfo>,
+                      Box<clang::ModuleMacro>, Box<clang::Module>> Ptr;
 
 public:
   ClangNode() = default;

branches/master-rebranch/include/swift/AST/ClangNode.h

@@ -58,11 +58,6 @@ namespace swift {
     DiagID ID;
   };
 
-  struct DiagnosticNode {
-    DiagID id;
-    std::string msg;
-  };
-
   namespace detail {
     /// Describes how to pass a diagnostic argument of the given type.
     ///
@@ -634,26 +629,7 @@ 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 {
@@ -687,10 +663,6 @@ 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;
@@ -762,11 +734,6 @@ 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);
     }
@@ -988,7 +955,8 @@ namespace swift {
     void emitTentativeDiagnostics();
 
   public:
-    const char *diagnosticStringFor(const DiagID id, bool printDiagnosticName);
+    static 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.

branches/master-rebranch/include/swift/AST/DiagnosticEngine.h

@@ -251,6 +251,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))
 

branches/master-rebranch/include/swift/AST/DiagnosticMessageFormat.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) {

branches/master-rebranch/include/swift/AST/Diagnostics/fr.yaml

@@ -24,7 +24,6 @@
 #include "swift/Basic/TypeID.h"
 #include "llvm/ADT/Hashing.h"
 #include "llvm/ADT/STLExtras.h"
-#include "llvm/Support/Error.h"
 #include <tuple>
 #include <type_traits>
 

branches/master-rebranch/include/swift/AST/DiagnosticsFrontend.def

@@ -688,11 +688,9 @@ struct DenseMapInfo<swift::SourceFile::ImportedModuleDesc> {
                               StringRefDMI::getTombstoneKey());
   }
   static inline unsigned getHashValue(const ImportedModuleDesc &import) {
-    return detail::combineHashValue(
-        ImportedModuleDMI::getHashValue(import.module),
-        detail::combineHashValue(
-            ImportOptionsDMI::getHashValue(import.importOptions),
-            StringRefDMI::getHashValue(import.filename)));
+    return combineHashValue(ImportedModuleDMI::getHashValue(import.module),
+           combineHashValue(ImportOptionsDMI::getHashValue(import.importOptions),
+                            StringRefDMI::getHashValue(import.filename)));
   }
   static bool isEqual(const ImportedModuleDesc &a,
                       const ImportedModuleDesc &b) {

branches/master-rebranch/include/swift/AST/SearchPathOptions.h

@@ -69,6 +69,51 @@ struct function_traits<R (T::*)(Args...) const> {
   using argument_types = std::tuple<Args...>;
 };
 
+} // end namespace swift
+
+#if !defined(swiftCore_EXPORTS)
+namespace llvm {
+
+/// @{
+
+/// An STL-style algorithm similar to std::for_each that applies a second
+/// functor between every pair of elements.
+///
+/// This provides the control flow logic to, for example, print a
+/// comma-separated list:
+/// \code
+///   interleave(names.begin(), names.end(),
+///              [&](StringRef name) { OS << name; },
+///              [&] { OS << ", "; });
+/// \endcode
+template <typename ForwardIterator, typename UnaryFunctor,
+          typename NullaryFunctor>
+inline void interleave(ForwardIterator begin, ForwardIterator end,
+                       UnaryFunctor each_fn,
+                       NullaryFunctor between_fn) {
+  if (begin == end)
+    return;
+  each_fn(*begin);
+  ++begin;
+  for (; begin != end; ++begin) {
+    between_fn();
+    each_fn(*begin);
+  }
+}
+
+template <typename Container, typename UnaryFunctor, typename NullaryFunctor>
+inline void interleave(const Container &c, UnaryFunctor each_fn,
+                       NullaryFunctor between_fn) {
+  interleave(c.begin(), c.end(), each_fn, between_fn);
+}
+
+/// @}
+
+} // end namespace llvm
+#endif
+
+namespace swift {
+
 /// @{
 
 /// The equivalent of std::for_each, but for two lists at once.

branches/master-rebranch/include/swift/AST/SimpleRequest.h

@@ -19,7 +19,6 @@
 #include "swift/AST/FileUnit.h"
 #include "swift/ClangImporter/ClangImporter.h"
 #include "clang/AST/ExternalASTSource.h"
-#include "clang/Basic/Module.h"
 
 namespace clang {
   class ASTContext;
@@ -38,7 +37,7 @@ class ClangModuleUnit final : public LoadedFile {
   llvm::PointerIntPair<ModuleDecl *, 1, bool> overlayModule;
   mutable Optional<ArrayRef<ModuleDecl::ImportedModule>> importedModulesForLookup;
   /// The metadata of the underlying Clang module.
-  clang::ASTSourceDescriptor ASTSourceDescriptor;
+  clang::ExternalASTSource::ASTSourceDescriptor ASTSourceDescriptor;
 
 public:
   /// True if the given Module contains an imported Clang module unit.
@@ -116,7 +115,8 @@ class ClangModuleUnit final : public LoadedFile {
 
   /// Returns the ASTSourceDescriptor of the associated Clang module if one
   /// exists.
-  Optional<clang::ASTSourceDescriptor> getASTSourceDescriptor() const;
+  Optional<clang::ExternalASTSource::ASTSourceDescriptor>
+  getASTSourceDescriptor() const;
 
   virtual StringRef getModuleDefiningPath() const override;
 

branches/master-rebranch/include/swift/AST/SourceFile.h

@@ -17,7 +17,6 @@
 #include "swift/Basic/SupplementaryOutputPaths.h"
 #include "swift/Frontend/InputFile.h"
 #include "llvm/ADT/Hashing.h"
-#include "llvm/ADT/StringMap.h"
 
 #include <string>
 #include <vector>

branches/master-rebranch/include/swift/AST/diagnostics/en.yaml

@@ -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

branches/master-rebranch/include/swift/Basic/STLExtras.h

@@ -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">;
 }
 
 

branches/master-rebranch/include/swift/ClangImporter/ClangModule.h

@@ -98,8 +98,8 @@ class ParsedRawSyntaxNode {
     assert(DeferredToken.NumTrailingTrivia == numTrailingTrivia &&
            "numLeadingTrivia is too large value!");
   }
-  ParsedRawSyntaxNode(const ParsedRawSyntaxNode &other) = delete;
-  ParsedRawSyntaxNode &operator=(const ParsedRawSyntaxNode &other) = delete;
+  ParsedRawSyntaxNode(ParsedRawSyntaxNode &other) = delete;
+  ParsedRawSyntaxNode &operator=(ParsedRawSyntaxNode &other) = delete;
 
 public:
   ParsedRawSyntaxNode()

branches/master-rebranch/include/swift/Frontend/FrontendInputsAndOutputs.h

@@ -838,18 +838,6 @@ 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.

branches/master-rebranch/include/swift/Frontend/ModuleInterfaceLoader.h

@@ -29,9 +29,29 @@ 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 {
-#define TAG(name, value) name##Tag = value,
-#include "../../../stdlib/public/runtime/MetadataAllocatorTags.def"
+  UnusedTag = 0,
+  BoxesTag,
+  ObjCClassWrappersTag,
+  FunctionTypesTag,
+  MetatypeTypesTag,
+  ExistentialMetatypeValueWitnessTablesTag,
+  ExistentialMetatypesTag,
+  ExistentialTypesTag,
+  OpaqueExistentialValueWitnessTablesTag,
+  ClassExistentialValueWitnessTablesTag,
+  ForeignWitnessTablesTag,
+  ResilientMetadataAllocatorTag,
+  MetadataTag,
+  TupleCacheTag,
+  GenericMetadataCacheTag,
+  ForeignMetadataCacheTag,
+  GenericWitnessTableCacheTag,
+  GenericClassMetadataTag,
+  GenericValueMetadataTag,
 };
 
 template <typename Runtime> struct MetadataAllocationBacktraceHeader {