Merge pull request #29744 from apple/master-rebranch

Merge master-rebranch into master to support new llvm branch apple/stable/20200108

Author: shahmishal

CMakeLists.txt

@@ -32,6 +32,11 @@ endif()
 
 ENABLE_LANGUAGE(C)
 
+# Use C++14.
+set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard to conform to")
+set(CMAKE_CXX_STANDARD_REQUIRED YES)
+set(CMAKE_CXX_EXTENSIONS NO)
+
 # First include general CMake utilities.
 include(SwiftUtils)
 include(CheckSymbolExists)

cmake/modules/SwiftXcodeSupport.cmake

@@ -100,8 +100,8 @@ macro(swift_common_xcode_cxx_config)
   # Force usage of Clang.
   set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvm.clang.1_0"
       CACHE STRING "Xcode Compiler")
-  # Use C++'11.
-  set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11"
+  # Use C++'14.
+  set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++14"
       CACHE STRING "Xcode C++ Language Standard")
   # Use libc++.
   set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++"

include/swift/ABI/TrailingObjects.h

@@ -55,6 +55,7 @@
 #ifndef SWIFT_ABI_TRAILINGOBJECTS_H
 #define SWIFT_ABI_TRAILINGOBJECTS_H
 
+#include "llvm/Support/Alignment.h"
 #include "llvm/Support/AlignOf.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/MathExtras.h"
@@ -175,7 +176,7 @@ class TrailingObjectsImpl<Align, BaseTy, TopTrailingObj, PrevTy, NextTy,
 
     if (requiresRealignment())
       return reinterpret_cast<const NextTy *>(
-          llvm::alignAddr(Ptr, alignof(NextTy)));
+          llvm::alignAddr(Ptr, llvm::Align(alignof(NextTy))));
     else
       return reinterpret_cast<const NextTy *>(Ptr);
   }
@@ -189,7 +190,8 @@ class TrailingObjectsImpl<Align, BaseTy, TopTrailingObj, PrevTy, NextTy,
                     Obj, TrailingObjectsBase::OverloadToken<PrevTy>());
 
     if (requiresRealignment())
-      return reinterpret_cast<NextTy *>(llvm::alignAddr(Ptr, alignof(NextTy)));
+      return reinterpret_cast<NextTy *>(
+          llvm::alignAddr(Ptr, llvm::Align(alignof(NextTy))));
     else
       return reinterpret_cast<NextTy *>(Ptr);
   }

include/swift/ABI/TypeIdentity.h

@@ -19,6 +19,7 @@
 #define SWIFT_ABI_TYPEIDENTITY_H
 
 #include "swift/Basic/LLVM.h"
+#include <llvm/ADT/StringRef.h>
 
 namespace swift {
 template <class> class TargetTypeContextDescriptor;

include/swift/AST/Evaluator.h

@@ -345,7 +345,7 @@ class Evaluator {
     // Check for a cycle.
     if (checkDependency(activeReq)) {
       return llvm::Error(
-        llvm::make_unique<CyclicalRequestError<Request>>(request, *this));
+          std::make_unique<CyclicalRequestError<Request>>(request, *this));
     }
 
     // Make sure we remove this from the set of active requests once we're

include/swift/AST/SimpleRequest.h

@@ -195,7 +195,7 @@ class SimpleRequest<Derived, Output(Inputs...), Caching> {
 
   template<size_t ...Indices>
   llvm::Expected<Output>
-  callDerived(Evaluator &evaluator, llvm::index_sequence<Indices...>) const {
+  callDerived(Evaluator &evaluator, std::index_sequence<Indices...>) const {
     static_assert(sizeof...(Indices) > 0, "Subclass must define evaluate()");
     return asDerived().evaluate(evaluator, std::get<Indices>(storage)...);
   }
@@ -217,7 +217,7 @@ class SimpleRequest<Derived, Output(Inputs...), Caching> {
   static llvm::Expected<OutputType>
   evaluateRequest(const Derived &request, Evaluator &evaluator) {
     return request.callDerived(evaluator,
-                               llvm::index_sequence_for<Inputs...>());
+                               std::index_sequence_for<Inputs...>());
   }
 
   /// Retrieve the nearest source location to which this request applies.

include/swift/Basic/Statistic.h

@@ -25,8 +25,7 @@
 
 #define SWIFT_FUNC_STAT_NAMED(DEBUG_TYPE)                               \
   do {                                                                  \
-    static llvm::Statistic FStat =                                      \
-      {DEBUG_TYPE, __func__, __func__, {0}, {false}};                   \
+    static llvm::Statistic FStat = {DEBUG_TYPE, __func__, __func__};    \
     ++FStat;                                                            \
   } while (0)
 

include/swift/Frontend/Frontend.h

@@ -482,7 +482,7 @@ class CompilerInstance {
 
   void createDependencyTracker(bool TrackSystemDeps) {
     assert(!Context && "must be called before setup()");
-    DepTracker = llvm::make_unique<DependencyTracker>(TrackSystemDeps);
+    DepTracker = std::make_unique<DependencyTracker>(TrackSystemDeps);
   }
   DependencyTracker *getDependencyTracker() { return DepTracker.get(); }
   const DependencyTracker *getDependencyTracker() const { return DepTracker.get(); }

include/swift/LLVMPasses/Passes.h

@@ -15,6 +15,8 @@
 
 #include "swift/LLVMPasses/PassesFwd.h"
 #include "llvm/Analysis/AliasAnalysis.h"
+#include "llvm/Analysis/Passes.h"
+#include "llvm/InitializePasses.h"
 #include "llvm/Pass.h"
 
 namespace swift {

include/swift/Reflection/TypeRef.h

@@ -150,6 +150,9 @@ class alignas(void *) TypeRef {
   void dump() const;
   void dump(FILE *file, unsigned Indent = 0) const;
 
+  /// Build a demangle tree from this TypeRef.
+  Demangle::NodePointer getDemangling(Demangle::Demangler &Dem) const;
+
   bool isConcrete() const;
   bool isConcreteAfterSubstitutions(const GenericArgumentMap &Subs) const;