Merge pull request swiftlang#33731 from apple/master-rebranch

Merge master-rebranch into Swift master branch to support updating llvm-project update

Author: shahmishal

docs/Modules.rst

@@ -441,10 +441,6 @@ Glossary
 
     __ https://en.wikipedia.org/wiki/Name_mangling#C.2B.2B
 
-  module
-    An entity containing the API for a library, to be `imported <import>` into
-    a source file.
-
   qualified name
     A multi-piece name like ``Foundation.NSWindow``, which names an entity
     within a particular context. This document is concerned with the case where
@@ -463,9 +459,3 @@ Glossary
   SIL
     "Swift Intermediate Language", a stable IR for the distribution of
     inlineable code.
-
-
-  target
-    A dynamic library, framework, plug-in, or application to be built.
-    A natural LTO boundary, and roughly the same as what Xcode requires
-    separate targets to build.

include/swift/AST/Builtins.h

@@ -26,7 +26,7 @@
 #include "llvm/Support/ErrorHandling.h"
 
 namespace llvm {
-enum class AtomicOrdering;
+enum class AtomicOrdering : unsigned;
 }
 
 namespace swift {

include/swift/AST/ClangNode.h

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

include/swift/AST/ExtInfo.h

@@ -30,6 +30,7 @@
 
 namespace clang {
 class Type;
+class ASTContext;
 } // namespace clang
 
 namespace swift {
@@ -77,7 +78,7 @@ class ClangTypeInfo {
   /// Use the ClangModuleLoader to print the Clang type as a string.
   void printType(ClangModuleLoader *cml, llvm::raw_ostream &os) const;
 
-  void dump(llvm::raw_ostream &os) const;
+  void dump(llvm::raw_ostream &os, const clang::ASTContext &ctx) const;
 };
 
 // MARK: - FunctionTypeRepresentation

include/swift/AST/PrettyStackTrace.h

@@ -26,6 +26,7 @@
 
 namespace clang {
   class Type;
+  class ASTContext;
 }
 
 namespace swift {
@@ -141,11 +142,13 @@ class PrettyStackTraceType : public llvm::PrettyStackTraceEntry {
 /// PrettyStackTraceClangType - Observe that we are processing a
 /// specific Clang type.
 class PrettyStackTraceClangType : public llvm::PrettyStackTraceEntry {
+  const clang::ASTContext &Context;
   const clang::Type *TheType;
   const char *Action;
 public:
-  PrettyStackTraceClangType(const char *action, const clang::Type *type)
-    : TheType(type), Action(action) {}
+  PrettyStackTraceClangType(clang::ASTContext &ctx,
+                            const char *action, const clang::Type *type)
+    : Context(ctx), TheType(type), Action(action) {}
   virtual void print(llvm::raw_ostream &OS) const override;
 };
 

include/swift/AST/SimpleRequest.h

@@ -24,6 +24,7 @@
 #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>
 

include/swift/AST/SourceFile.h

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

include/swift/Basic/STLExtras.h

@@ -69,51 +69,6 @@ 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.

include/swift/ClangImporter/ClangModule.h

@@ -19,6 +19,7 @@
 #include "swift/AST/FileUnit.h"
 #include "swift/ClangImporter/ClangImporter.h"
 #include "clang/AST/ExternalASTSource.h"
+#include "clang/Basic/Module.h"
 
 namespace clang {
   class ASTContext;
@@ -37,7 +38,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::ExternalASTSource::ASTSourceDescriptor ASTSourceDescriptor;
+  clang::ASTSourceDescriptor ASTSourceDescriptor;
 
 public:
   /// True if the given Module contains an imported Clang module unit.
@@ -115,8 +116,7 @@ class ClangModuleUnit final : public LoadedFile {
 
   /// Returns the ASTSourceDescriptor of the associated Clang module if one
   /// exists.
-  Optional<clang::ExternalASTSource::ASTSourceDescriptor>
-  getASTSourceDescriptor() const;
+  Optional<clang::ASTSourceDescriptor> getASTSourceDescriptor() const;
 
   virtual StringRef getModuleDefiningPath() const override;
 

include/swift/Frontend/FrontendInputsAndOutputs.h

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