---

yaml
---
r: 315387
b: refs/heads/master-next
c: 33be0c8
h: refs/heads/master
i:
  315385: 204e7ec
  315383: 4d6aa6a

Author: compnerd

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 3fe9333052029c114ef816ea805c335eb1ee8a99
-refs/heads/master-next: f4e9bef832146f7bd014f26e4be6a048d56036ec
+refs/heads/master-next: 33be0c80439d7523039b5416208b3036da36dd4e
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/include/swift/AST/ASTNode.h

@@ -36,10 +36,10 @@ namespace swift {
   enum class DeclKind : uint8_t;
   enum class StmtKind;
 
-  struct ASTNode : public llvm::PointerUnion<Expr*, Stmt*, Decl*> {
+  struct ASTNode : public llvm::PointerUnion3<Expr*, Stmt*, Decl*> {
     // Inherit the constructors from PointerUnion.
-    using PointerUnion::PointerUnion;
-
+    using PointerUnion3::PointerUnion3;
+    
     SourceRange getSourceRange() const;
 
     /// Return the location of the start of the statement.

branches/master-next/include/swift/AST/Decl.h

@@ -4806,7 +4806,7 @@ class VarDecl : public AbstractStorageDecl {
   };
 
 protected:
-  PointerUnion<PatternBindingDecl *, Stmt *, VarDecl *> Parent;
+  PointerUnion3<PatternBindingDecl *, Stmt *, VarDecl *> Parent;
 
   VarDecl(DeclKind kind, bool isStatic, Introducer introducer,
           bool issCaptureList, SourceLoc nameLoc, Identifier name,

branches/master-next/include/swift/AST/DiagnosticsClangImporter.def

@@ -91,6 +91,10 @@ WARNING(implicit_bridging_header_imported_from_module,none,
         "is deprecated and will be removed in a later version of Swift",
         (StringRef, Identifier))
 
+WARNING(clang_vfs_overlay_is_ignored,none,
+        "ignoring '-ivfsoverlay' options provided to '-Xcc' in favor of "
+        "'-vfsoverlay'", ())
+
 #ifndef DIAG_NO_UNDEF
 # if defined(DIAG)
 #  undef DIAG

branches/master-next/include/swift/AST/GenericSignatureBuilder.h

@@ -92,10 +92,10 @@ class GenericSignatureBuilder {
   class ResolvedType;
 
   using UnresolvedRequirementRHS =
-      llvm::PointerUnion<Type, PotentialArchetype *, LayoutConstraint>;
+      llvm::PointerUnion3<Type, PotentialArchetype *, LayoutConstraint>;
 
   using RequirementRHS =
-    llvm::PointerUnion<Type, PotentialArchetype *, LayoutConstraint>;
+    llvm::PointerUnion3<Type, PotentialArchetype *, LayoutConstraint>;
 
   /// The location of a requirement as written somewhere in the source.
   typedef llvm::PointerUnion<const TypeRepr *, const RequirementRepr *>
@@ -1374,8 +1374,8 @@ class GenericSignatureBuilder::FloatingRequirementSource {
   } kind;
 
   using Storage =
-    llvm::PointerUnion<const RequirementSource *, const TypeRepr *,
-                       const RequirementRepr *>;
+    llvm::PointerUnion3<const RequirementSource *, const TypeRepr *,
+                        const RequirementRepr *>;
 
   Storage storage;
 

branches/master-next/include/swift/AST/ModuleLoader.h

@@ -24,10 +24,6 @@
 #include "llvm/ADT/SmallSet.h"
 #include "llvm/ADT/TinyPtrVector.h"
 
-namespace llvm {
-class FileCollector;
-}
-
 namespace clang {
 class DependencyCollector;
 }
@@ -58,9 +54,8 @@ enum class Bridgeability : unsigned {
 class DependencyTracker {
   std::shared_ptr<clang::DependencyCollector> clangCollector;
 public:
-  explicit DependencyTracker(
-      bool TrackSystemDeps,
-      std::shared_ptr<llvm::FileCollector> FileCollector = {});
+
+  explicit DependencyTracker(bool TrackSystemDeps);
 
   /// Adds a file as a dependency.
   ///

branches/master-next/include/swift/AST/TypeCheckRequests.h

@@ -367,7 +367,7 @@ struct WhereClauseOwner {
 
   /// The source of the where clause, which can be a generic parameter list
   /// or a declaration that can have a where clause.
-  llvm::PointerUnion<GenericParamList *, Decl *, SpecializeAttr *> source;
+  llvm::PointerUnion3<GenericParamList *, Decl *, SpecializeAttr *> source;
 
   WhereClauseOwner(Decl *decl);
 

branches/master-next/include/swift/Basic/LLVM.h

@@ -42,7 +42,8 @@ namespace llvm {
   template<typename T> class MutableArrayRef;
   template<typename T> class TinyPtrVector;
   template<typename T> class Optional;
-  template <typename ...PTs> class PointerUnion;
+  template <typename PT1, typename PT2> class PointerUnion;
+  template <typename PT1, typename PT2, typename PT3> class PointerUnion3;
   class SmallBitVector;
 
   // Other common classes.
@@ -67,6 +68,7 @@ namespace swift {
   using llvm::None;
   using llvm::Optional;
   using llvm::PointerUnion;
+  using llvm::PointerUnion3;
   using llvm::SmallBitVector;
   using llvm::SmallPtrSet;
   using llvm::SmallPtrSetImpl;

branches/master-next/include/swift/ClangImporter/ClangImporter.h

@@ -23,7 +23,6 @@
 
 namespace llvm {
   class Triple;
-  class FileCollector;
   template<typename Fn> class function_ref;
 }
 
@@ -130,8 +129,7 @@ class ClangImporter final : public ClangModuleLoader {
   /// Create a new clang::DependencyCollector customized to
   /// ClangImporter's specific uses.
   static std::shared_ptr<clang::DependencyCollector>
-  createDependencyCollector(bool TrackSystemDeps,
-                            std::shared_ptr<llvm::FileCollector> FileCollector);
+  createDependencyCollector(bool TrackSystemDeps);
 
   /// Append visible module names to \p names. Note that names are possibly
   /// duplicated, and not guaranteed to be ordered in any way.

branches/master-next/include/swift/ClangImporter/ClangImporterOptions.h

@@ -96,6 +96,10 @@ class ClangImporterOptions {
   /// When set, don't enforce warnings with -Werror.
   bool DebuggerSupport = false;
 
+  /// When set, clobber the Clang instance's virtual file system with the Swift
+  /// virtual file system.
+  bool ForceUseSwiftVirtualFileSystem = false;
+
   /// Return a hash code of any components from these options that should
   /// contribute to a Swift Bridging PCH hash.
   llvm::hash_code getPCHHashComponents() const {

branches/master-next/include/swift/LLVMPasses/Passes.h

@@ -30,14 +30,8 @@ namespace swift {
                     const llvm::PreservedAnalyses &) { return false; }
 
     using AAResultBase::getModRefInfo;
-    llvm::ModRefInfo getModRefInfo(const llvm::CallBase *Call,
-                                   const llvm::MemoryLocation &Loc) {
-      llvm::AAQueryInfo AAQI;
-      return getModRefInfo(Call, Loc, AAQI);
-    }
-    llvm::ModRefInfo getModRefInfo(const llvm::CallBase *Call,
-                                   const llvm::MemoryLocation &Loc,
-                                   llvm::AAQueryInfo &AAQI);
+    llvm::ModRefInfo getModRefInfo(llvm::ImmutableCallSite CS,
+                                   const llvm::MemoryLocation &Loc);
   };
 
   class SwiftAAWrapperPass : public llvm::ImmutablePass {

branches/master-next/include/swift/Parse/Parser.h

@@ -40,7 +40,7 @@
 #include "llvm/ADT/SetVector.h"
 
 namespace llvm {
-  template <typename...  PTs> class PointerUnion;
+  template <typename PT1, typename PT2, typename PT3> class PointerUnion3;
 }
 
 namespace swift {

branches/master-next/include/swift/SIL/SILInstruction.h

@@ -962,7 +962,7 @@ class MultipleValueInstructionTrailingObjects<Derived, DerivedResult,
                                       MultipleValueInstruction *,
                                       DerivedResult,
                                       FinalOtherTrailingTypes...> {
-  static_assert(std::is_final<DerivedResult>(),
+  static_assert(LLVM_IS_FINAL(DerivedResult),
                 "Expected DerivedResult to be final");
   static_assert(
       std::is_base_of<MultipleValueInstructionResult, DerivedResult>::value,

branches/master-next/include/swift/SILOptimizer/Analysis/LoopRegionAnalysis.h

@@ -384,7 +384,7 @@ class LoopRegion {
 private:
   /// A pointer to one of a Loop, Basic Block, or Function represented by this
   /// region.
-  llvm::PointerUnion<FunctionTy *, LoopTy *, BlockTy *> Ptr;
+  llvm::PointerUnion3<FunctionTy *, LoopTy *, BlockTy *> Ptr;
 
   /// The ID of this region.
   unsigned ID;

branches/master-next/include/swift/Serialization/BCReadingExtras.h

@@ -13,7 +13,7 @@
 #ifndef SWIFT_SERIALIZATION_BCREADINGEXTRAS_H
 #define SWIFT_SERIALIZATION_BCREADINGEXTRAS_H
 
-#include "llvm/Bitstream/BitstreamReader.h"
+#include "llvm/Bitcode/BitstreamReader.h"
 
 namespace swift {
 namespace serialization {
@@ -38,8 +38,7 @@ class BCOffsetRAII {
 
   ~BCOffsetRAII() {
     if (Cursor)
-      cantFail(Cursor->JumpToBit(Offset),
-               "BCOffsetRAII must be able to go back");
+      Cursor->JumpToBit(Offset);
   }
 };
 

branches/master-next/include/swift/Serialization/ModuleFile.h

@@ -25,7 +25,7 @@
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/TinyPtrVector.h"
-#include "llvm/Bitstream/BitstreamReader.h"
+#include "llvm/Bitcode/BitstreamReader.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/MemoryBuffer.h"
 
@@ -502,15 +502,6 @@ class ModuleFile
   /// Emits one last diagnostic, logs the error, and then aborts for the stack
   /// trace.
   LLVM_ATTRIBUTE_NORETURN void fatal(llvm::Error error);
-  void fatalIfNotSuccess(llvm::Error error) {
-    if (error)
-      fatal(std::move(error));
-  }
-  template <typename T> T fatalIfUnexpected(llvm::Expected<T> expected) {
-    if (expected)
-      return std::move(expected.get());
-    fatal(expected.takeError());
-  }
 
   ASTContext &getContext() const {
     assert(FileContext && "no associated context yet");

branches/master-next/include/swift/Serialization/ModuleFormat.h

@@ -22,7 +22,7 @@
 #include "swift/AST/Decl.h"
 #include "swift/AST/Types.h"
 #include "llvm/Bitcode/RecordLayout.h"
-#include "llvm/Bitstream/BitCodes.h"
+#include "llvm/Bitcode/BitCodes.h"
 #include "llvm/ADT/PointerEmbeddedInt.h"
 
 namespace swift {

branches/master-next/lib/AST/Builtins.cpp

@@ -1352,7 +1352,6 @@ Type IntrinsicTypeDecoder::decodeImmediate() {
   case IITDescriptor::HalfVecArgument:
   case IITDescriptor::VarArg:
   case IITDescriptor::Token:
-  case IITDescriptor::VecElementArgument:
   case IITDescriptor::VecOfAnyPtrsToElt:
     // These types cannot be expressed in swift yet.
     return Type();

branches/master-next/lib/AST/ModuleLoader.cpp

@@ -18,21 +18,17 @@
 #include "clang/Frontend/Utils.h"
 #include "swift/ClangImporter/ClangImporter.h"
 
-namespace llvm {
-class FileCollector;
-}
-
 namespace swift {
 
-DependencyTracker::DependencyTracker(
-    bool TrackSystemDeps, std::shared_ptr<llvm::FileCollector> FileCollector)
-    // NB: The ClangImporter believes it's responsible for the construction of
-    // this instance, and it static_cast<>s the instance pointer to its own
-    // subclass based on that belief. If you change this to be some other
-    // instance, you will need to change ClangImporter's code to handle the
-    // difference.
-    : clangCollector(ClangImporter::createDependencyCollector(TrackSystemDeps,
-                                                              FileCollector)) {}
+DependencyTracker::DependencyTracker(bool TrackSystemDeps)
+  // NB: The ClangImporter believes it's responsible for the construction of
+  // this instance, and it static_cast<>s the instance pointer to its own
+  // subclass based on that belief. If you change this to be some other
+  // instance, you will need to change ClangImporter's code to handle the
+  // difference.
+  : clangCollector(ClangImporter::createDependencyCollector(TrackSystemDeps))
+{
+}
 
 void
 DependencyTracker::addDependency(StringRef File, bool IsSystem) {

branches/master-next/lib/Basic/CMakeLists.txt

@@ -30,7 +30,7 @@ macro(find_first_existing_vc_file out_var path)
     )
 endmacro()
 
-set(generate_vcs_version_script "${LLVM_MAIN_SRC_DIR}/cmake/modules/GenerateVersionFromVCS.cmake")
+set(get_svn_script "${LLVM_MAIN_SRC_DIR}/cmake/modules/GetSVN.cmake")
 
 function(generate_revision_inc revision_inc_var name dir)
   find_first_existing_vc_file(dep_file "${dir}")
@@ -39,12 +39,12 @@ function(generate_revision_inc revision_inc_var name dir)
   string(TOUPPER ${name} upper_name)
   if(DEFINED dep_file)
     add_custom_command(OUTPUT "${revision_inc}"
-      DEPENDS "${dep_file}" "${generate_vcs_version_script}"
+      DEPENDS "${dep_file}" "${get_svn_script}"
       COMMAND
-      ${CMAKE_COMMAND} "-DNAMES=${upper_name}"
-                       "-D${upper_name}_SOURCE_DIR=${dir}"
+      ${CMAKE_COMMAND} "-DFIRST_SOURCE_DIR=${dir}"
+                       "-DFIRST_NAME=${upper_name}"
                        "-DHEADER_FILE=${revision_inc}"
-                       -P "${generate_vcs_version_script}")
+                       -P "${get_svn_script}")
   else()
     # Generate an empty Revision.inc file if we are not using git or SVN.
     file(WRITE "${revision_inc}" "")

branches/master-next/lib/Basic/FileSystem.cpp

@@ -197,16 +197,16 @@ std::error_code swift::moveFileIfDifferent(const llvm::Twine &source,
       same = true;
     } else {
       std::error_code sourceRegionErr;
-      fs::mapped_file_region sourceRegion(
-          fs::convertFDToNativeFile(sourceFile.fd),
-          fs::mapped_file_region::readonly, size, 0, sourceRegionErr);
+      fs::mapped_file_region sourceRegion(sourceFile.fd,
+                                          fs::mapped_file_region::readonly,
+                                          size, 0, sourceRegionErr);
       if (sourceRegionErr)
         return sourceRegionErr;
 
       std::error_code destRegionErr;
-      fs::mapped_file_region destRegion(fs::convertFDToNativeFile(destFile.fd),
-                                        fs::mapped_file_region::readonly, size,
-                                        0, destRegionErr);
+      fs::mapped_file_region destRegion(destFile.fd,
+                                        fs::mapped_file_region::readonly,
+                                        size, 0, destRegionErr);
 
       if (!destRegionErr) {
         same = (0 == memcmp(sourceRegion.const_data(), destRegion.const_data(),

branches/master-next/lib/Basic/Platform.cpp

@@ -141,7 +141,6 @@ StringRef swift::getPlatformNameForTriple(const llvm::Triple &triple) {
   case llvm::Triple::Ananas:
   case llvm::Triple::CloudABI:
   case llvm::Triple::DragonFly:
-  case llvm::Triple::Emscripten:
   case llvm::Triple::Fuchsia:
   case llvm::Triple::KFreeBSD:
   case llvm::Triple::Lv2:
@@ -162,7 +161,6 @@ StringRef swift::getPlatformNameForTriple(const llvm::Triple &triple) {
   case llvm::Triple::AMDPAL:
   case llvm::Triple::HermitCore:
   case llvm::Triple::Hurd:
-  case llvm::Triple::WASI:
     return "";
   case llvm::Triple::Darwin:
   case llvm::Triple::MacOSX:

branches/master-next/lib/ClangImporter/ClangAdapter.cpp

@@ -436,21 +436,6 @@ OmissionTypeName importer::getClangTypeNameForOmission(clang::ASTContext &ctx,
     // OpenMP types that don't have Swift equivalents.
     case clang::BuiltinType::OMPArraySection:
       return OmissionTypeName();
-
-    // SVE builtin types that don't have Swift equivalents.
-    case clang::BuiltinType::SveInt8:
-    case clang::BuiltinType::SveInt16:
-    case clang::BuiltinType::SveInt32:
-    case clang::BuiltinType::SveInt64:
-    case clang::BuiltinType::SveUint8:
-    case clang::BuiltinType::SveUint16:
-    case clang::BuiltinType::SveUint32:
-    case clang::BuiltinType::SveUint64:
-    case clang::BuiltinType::SveFloat16:
-    case clang::BuiltinType::SveFloat32:
-    case clang::BuiltinType::SveFloat64:
-    case clang::BuiltinType::SveBool:
-      return OmissionTypeName();
     }
   }