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

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>

include/swift/Parse/ParsedRawSyntaxNode.h

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

include/swift/SIL/SILLocation.h

@@ -65,7 +65,7 @@ class SILLocation {
     using type = Pattern;
   };
 
-  using ASTNodeTy = llvm::PointerUnion4<Stmt *, Expr *, Decl *, Pattern *>;
+  using ASTNodeTy = llvm::PointerUnion<Stmt *, Expr *, Decl *, Pattern *>;
 
 public:
   enum LocationKind : unsigned {

include/swift/SIL/SILNode.h

@@ -19,6 +19,7 @@
 
 #include "llvm/Support/Compiler.h"
 #include "llvm/ADT/DenseMapInfo.h"
+#include "llvm/Support/PointerLikeTypeTraits.h"
 #include "swift/Basic/InlineBitfield.h"
 #include "swift/Basic/LLVM.h"
 #include <type_traits>

include/swift/SILOptimizer/Analysis/DominanceAnalysis.h

@@ -24,7 +24,7 @@ class SILInstruction;
 class DominanceAnalysis : public FunctionAnalysisBase<DominanceInfo> {
 protected:
   virtual void verify(DominanceInfo *DI) const override {
-    if (DI->getRoots().empty())
+    if (DI->roots().empty())
       return;
     DI->verify();
   }
@@ -52,7 +52,7 @@ class DominanceAnalysis : public FunctionAnalysisBase<DominanceInfo> {
 class PostDominanceAnalysis : public FunctionAnalysisBase<PostDominanceInfo> {
 protected:
   virtual void verify(PostDominanceInfo *PDI) const override {
-    if (PDI->getRoots().empty())
+    if (PDI->roots().empty())
       return;
     PDI->verify();
   }

include/swift/Subsystems.h

@@ -29,6 +29,7 @@
 #include <memory>
 
 namespace llvm {
+  class raw_pwrite_stream;
   class GlobalVariable;
   class MemoryBuffer;
   class Module;

lib/AST/ASTDumper.cpp

@@ -3781,7 +3781,9 @@ namespace {
       if (!T->getClangTypeInfo().empty()) {
         std::string s;
         llvm::raw_string_ostream os(s);
-        T->getClangTypeInfo().dump(os);
+        auto &ctx = T->getASTContext().getClangModuleLoader()
+          ->getClangASTContext();
+        T->getClangTypeInfo().dump(os, ctx);
         printField("clang_type", os.str());
       }
       printAnyFunctionParams(T->getParams(), "input");

lib/AST/ASTPrinter.cpp

@@ -48,6 +48,7 @@
 #include "clang/AST/Decl.h"
 #include "clang/AST/DeclObjC.h"
 #include "clang/Basic/Module.h"
+#include "clang/Basic/SourceManager.h"
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/ConvertUTF.h"

lib/AST/Builtins.cpp

@@ -1747,12 +1747,12 @@ Type IntrinsicTypeDecoder::decodeImmediate() {
   IITDescriptor D = Table.front();
   Table = Table.slice(1);
   switch (D.Kind) {
+  case IITDescriptor::BFloat:
   case IITDescriptor::MMX:
   case IITDescriptor::Metadata:
   case IITDescriptor::ExtendArgument:
   case IITDescriptor::TruncArgument:
   case IITDescriptor::HalfVecArgument:
-  case IITDescriptor::ScalableVecArgument:
   case IITDescriptor::VarArg:
   case IITDescriptor::Token:
   case IITDescriptor::VecElementArgument:
@@ -1781,7 +1781,7 @@ Type IntrinsicTypeDecoder::decodeImmediate() {
   case IITDescriptor::Vector: {
     Type eltType = decodeImmediate();
     if (!eltType) return Type();
-    return makeVector(eltType, D.Vector_Width);
+    return makeVector(eltType, D.Vector_Width.Min);
   }
 
   // A pointer to an immediate type.

lib/AST/Decl.cpp

@@ -59,6 +59,7 @@
 #include "swift/Demangling/ManglingMacros.h"
 
 #include "clang/Basic/CharInfo.h"
+#include "clang/Basic/Module.h"
 #include "clang/AST/Attr.h"
 #include "clang/AST/DeclObjC.h"
 

lib/AST/Expr.cpp

@@ -833,16 +833,15 @@ APInt BuiltinIntegerWidth::parse(StringRef text, unsigned radix, bool negate,
 static APFloat getFloatLiteralValue(bool IsNegative, StringRef Text,
                                     const llvm::fltSemantics &Semantics) {
   APFloat Val(Semantics);
-  llvm::Expected<APFloat::opStatus> MaybeRes =
-      Val.convertFromString(Text, llvm::APFloat::rmNearestTiesToEven);
-  assert(MaybeRes && *MaybeRes != APFloat::opInvalidOp &&
-         "Sema didn't reject invalid number");
-  (void)MaybeRes;
+  auto Res =
+    Val.convertFromString(Text, llvm::APFloat::rmNearestTiesToEven);
+  assert(Res && "Sema didn't reject invalid number");
+  consumeError(Res.takeError());
   if (IsNegative) {
     auto NegVal = APFloat::getZero(Semantics, /*negative*/ true);
-    auto Res = NegVal.subtract(Val, llvm::APFloat::rmNearestTiesToEven);
-    assert(Res != APFloat::opInvalidOp && "Sema didn't reject invalid number");
-    (void)Res;
+    Res = NegVal.subtract(Val, llvm::APFloat::rmNearestTiesToEven);
+    assert(Res && "Sema didn't reject invalid number");
+    consumeError(Res.takeError());
     return NegVal;
   }
   return Val;

lib/AST/ExtInfo.cpp

@@ -23,12 +23,10 @@ static void assertIsFunctionType(const clang::Type *type) {
 #ifndef NDEBUG
   if (!(type->isFunctionPointerType() || type->isBlockPointerType() ||
         type->isFunctionReferenceType())) {
-    llvm::SmallString<256> buf;
-    llvm::raw_svector_ostream os(buf);
-    os << "Expected a Clang function type wrapped in a pointer type or "
-       << "a block pointer type but found:\n";
-    type->dump(os);
-    llvm_unreachable(os.str().data());
+    llvm::errs() << "Expected a Clang function type wrapped in a pointer type "
+                 << "or a block pointer type but found:\n";
+    type->dump();
+    llvm_unreachable("\nUnexpected Clang type when creating ExtInfo!");
   }
 #endif
 }
@@ -57,9 +55,10 @@ void ClangTypeInfo::printType(ClangModuleLoader *cml,
   cml->printClangType(type, os);
 }
 
-void ClangTypeInfo::dump(llvm::raw_ostream &os) const {
+void ClangTypeInfo::dump(llvm::raw_ostream &os,
+                         const clang::ASTContext &ctx) const {
   if (type) {
-    type->dump(os);
+    type->dump(os, ctx);
   } else {
     os << "<nullptr>";
   }

lib/AST/PrettyStackTrace.cpp

@@ -217,7 +217,7 @@ void PrettyStackTraceClangType::print(llvm::raw_ostream &out) const {
     out << "NULL clang type!\n";
     return;
   }
-  TheType->dump(out);
+  TheType->dump(out, Context);
 }
 
 void PrettyStackTraceTypeRepr::print(llvm::raw_ostream &out) const {