---

yaml
---
r: 445650
b: refs/heads/master-rebranch
c: 3e0e8ce
h: refs/heads/master

Author: varungandhi-apple

[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: aa4ff7cfff16576eae11f9131ba74d0a1a3f1180
+refs/heads/master-rebranch: 3e0e8cec7a5129f3cb7495bbb371085608f52a2f
 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/ASTContext.h

@@ -254,6 +254,11 @@ class ASTContext final {
   /// The request-evaluator that is used to process various requests.
   Evaluator evaluator;
 
+  /// The set of top-level modules we have loaded.
+  /// This map is used for iteration, therefore it's a MapVector and not a
+  /// DenseMap.
+  llvm::MapVector<Identifier, ModuleDecl*> LoadedModules;
+
   /// The builtin module.
   ModuleDecl * const TheBuiltinModule;
 
@@ -782,24 +787,8 @@ class ASTContext final {
   /// The loader is owned by the AST context.
   ClangModuleLoader *getDWARFModuleLoader() const;
 
-public:
   namelookup::ImportCache &getImportCache() const;
 
-  /// Returns an iterator over the modules that are known by this context
-  /// to be loaded.
-  ///
-  /// Iteration order is guaranteed to match the order in which
-  /// \c addLoadedModule was called to register the loaded module
-  /// with this context.
-  iterator_range<llvm::MapVector<Identifier, ModuleDecl *>::const_iterator>
-  getLoadedModules() const;
-
-  /// Returns the number of loaded modules known by this context to be loaded.
-  unsigned getNumLoadedModules() const {
-    auto eltRange = getLoadedModules();
-    return std::distance(eltRange.begin(), eltRange.end());
-  }
-
   /// Asks every module loader to verify the ASTs it has loaded.
   ///
   /// Does nothing in non-asserts (NDEBUG) builds.
@@ -839,11 +828,6 @@ class ASTContext final {
     return const_cast<ASTContext *>(this)->getStdlibModule(false);
   }
 
-  /// Insert an externally-sourced module into the set of known loaded modules
-  /// in this context.
-  void addLoadedModule(ModuleDecl *M);
-
-public:
   /// Retrieve the current generation number, which reflects the
   /// number of times a module import has caused mass invalidation of
   /// lookup tables.

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

@@ -19,7 +19,6 @@
 #include "swift/Basic/Range.h"
 #include "swift/Basic/ReferenceDependencyKeys.h"
 #include "llvm/ADT/Hashing.h"
-#include "llvm/ADT/SetVector.h"
 #include "llvm/Support/MD5.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/YAMLParser.h"
@@ -685,7 +684,7 @@ class SourceFileDepGraphNode : public DepGraphNode {
   size_t sequenceNumber = ~0;
 
   /// Holds the sequence numbers of definitions I depend upon.
-  llvm::SetVector<size_t> defsIDependUpon;
+  std::unordered_set<size_t> defsIDependUpon;
 
   /// True iff a Decl exists for this node.
   /// If a provides and a depends in the existing system both have the same key,

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

@@ -85,8 +85,6 @@ 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/DiagnosticsFrontend.def

@@ -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/FineGrainedDependencies.h

@@ -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,7 +150,6 @@ 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
@@ -245,6 +244,7 @@ struct InterfaceSubContextDelegateImpl: InterfaceSubContextDelegate {
   llvm::StringSaver ArgSaver;
   std::vector<StringRef> GenericArgs;
   CompilerInvocation subInvocation;
+  std::vector<SupplementaryOutputPaths> ModuleOutputPaths;
 
   template<typename ...ArgTypes>
   InFlightDiagnostic diagnose(StringRef interfacePath,