---

yaml
---
r: 348725
b: refs/heads/master
c: a4fcd26
h: refs/heads/master
i:
  348723: 930a4d9

Author: rintaro

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: f88fb20a01aaaa21d19264c0a33ce87513d329fb
+refs/heads/master: a4fcd26b38e87ccae4fc9c934236edb3d5ea86fc
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/docs/Diagnostics.md

@@ -104,3 +104,19 @@ Most diagnostics have no reason to change behavior under editor mode. An example
 - `%error` - Represents a branch in a `%select` that should never be taken. In debug builds of the compiler this produces an assertion failure.
 
 - `%%` - Emits a literal percent sign.
+
+### Diagnostic Verifier ###
+
+(This section is specific to the Swift compiler's diagnostic engine.)
+
+If the `-verify` frontend flag is used, the Swift compiler will check emitted diagnostics against specially formatted comments in the source. This feature is used extensively throughout the test suite to ensure diagnostics are emitted with the correct message and source location.
+
+An expected diagnostic is denoted by a comment which begins with `expected-error`, `expected-warning`, `expected-note`, or `expected-remark`. It is followed by:
+
+- (Optional) Location information. By default, the comment will match any diagnostic emitted on the same line. However, it's possible to override this behavior and/or specify column information as well. `// expected-error@-1 ...` looks for an error on the previous line, `// expected-warning@+1:3 ...` looks for a warning on the next line at the third column, and `// expected-note@:7 ...` looks for a note on the same line at the seventh column.
+
+- (Optional) A match count which specifies how many times the diagnostic is expected to appear. This may be a positive integer or `*`, which allows for zero or more matches. The match count must be surrounded by whitespace if present. For example, `// expected-error 2 ...` looks for two matching errors, and `// expected-warning * ...` looks for any number of matching warnings.
+
+- (Required) The expected error message. The message should be enclosed in double curly braces and should not include the `error:`/`warning:`/`note:`/`remark:` prefix. For example, `// expected-error {{invalid redeclaration of 'y'}}` would match an error with that message on the same line. The expected message does not need to match the emitted message verbatim. As long as the expected message is a substring of the original message, they will match.
+
+- (Optional) Expected fix-its. These are each enclosed in double curly braces and appear after the expected message. An expected fix-it consists of a column range followed by the text it's expected to be replaced with. For example, `let r : Int i = j // expected-error{{consecutive statements}} {{12-12=;}}` will match a fix-it attached to the consecutive statements error which inserts a semicolon at column 12, just after the 't' in 'Int'. The special {{none}} specifier is also supported, which will cause the diagnostic match to fail if unexpected fix-its are produced.

trunk/docs/Testing.md

@@ -232,7 +232,7 @@ code for the target that is not the build machine:
 
 * ``%target-typecheck-verify-swift``: parse and type check the current Swift file
   for the target platform and verify diagnostics, like ``swift -frontend -typecheck -verify
-  %s``.
+  %s``. For further explanation of `-verify` mode, see [Diagnostics.md](Diagnostics.md).
 
   Use this substitution for testing semantic analysis in the compiler.
 

trunk/include/swift/AST/ASTNode.h

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

trunk/include/swift/AST/Decl.h

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

trunk/include/swift/AST/DiagnosticsClangImporter.def

@@ -91,10 +91,6 @@ 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

trunk/include/swift/AST/GenericSignatureBuilder.h

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

trunk/include/swift/AST/ModuleLoader.h

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

trunk/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::PointerUnion3<GenericParamList *, Decl *, SpecializeAttr *> source;
+  llvm::PointerUnion<GenericParamList *, Decl *, SpecializeAttr *> source;
 
   WhereClauseOwner(Decl *decl);
 

trunk/include/swift/Basic/LLVM.h

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

trunk/include/swift/ClangImporter/ClangImporter.h

@@ -23,6 +23,7 @@
 
 namespace llvm {
   class Triple;
+  class FileCollector;
   template<typename Fn> class function_ref;
 }
 
@@ -149,7 +150,8 @@ 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);
+  createDependencyCollector(bool TrackSystemDeps,
+                            std::shared_ptr<llvm::FileCollector> FileCollector);
 
   /// Append visible module names to \p names. Note that names are possibly
   /// duplicated, and not guaranteed to be ordered in any way.

trunk/include/swift/ClangImporter/ClangImporterOptions.h

@@ -96,10 +96,6 @@ 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 {

trunk/include/swift/LLVMPasses/Passes.h

@@ -30,8 +30,14 @@ namespace swift {
                     const llvm::PreservedAnalyses &) { return false; }
 
     using AAResultBase::getModRefInfo;
-    llvm::ModRefInfo getModRefInfo(llvm::ImmutableCallSite CS,
-                                   const llvm::MemoryLocation &Loc);
+    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);
   };
 
   class SwiftAAWrapperPass : public llvm::ImmutablePass {

trunk/include/swift/Parse/Parser.h

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

trunk/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::PointerUnion3<FunctionTy *, LoopTy *, BlockTy *> Ptr;
+  llvm::PointerUnion<FunctionTy *, LoopTy *, BlockTy *> Ptr;
 
   /// The ID of this region.
   unsigned ID;

trunk/lib/AST/Builtins.cpp

@@ -1378,6 +1378,7 @@ 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();

trunk/lib/AST/Decl.cpp

@@ -5079,6 +5079,10 @@ bool VarDecl::isSettable(const DeclContext *UseDC,
   if (!isLet())
     return supportsMutation();
 
+  // Debugger expression 'let's are initialized through a side-channel.
+  if (isDebuggerVar())
+    return false;
+
   // We have a 'let'; we must be checking settability from a specific
   // DeclContext to go on further.
   if (UseDC == nullptr)

trunk/lib/AST/ModuleLoader.cpp

@@ -18,17 +18,21 @@
 #include "clang/Frontend/Utils.h"
 #include "swift/ClangImporter/ClangImporter.h"
 
+namespace llvm {
+class FileCollector;
+}
+
 namespace swift {
 
-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))
-{
-}
+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)) {}
 
 void
 DependencyTracker::addDependency(StringRef File, bool IsSystem) {

trunk/lib/Basic/CMakeLists.txt

@@ -30,7 +30,7 @@ macro(find_first_existing_vc_file out_var path)
     )
 endmacro()
 
-set(get_svn_script "${LLVM_MAIN_SRC_DIR}/cmake/modules/GetSVN.cmake")
+set(generate_vcs_version_script "${LLVM_MAIN_SRC_DIR}/cmake/modules/GenerateVersionFromVCS.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}" "${get_svn_script}"
+      DEPENDS "${dep_file}" "${generate_vcs_version_script}"
       COMMAND
-      ${CMAKE_COMMAND} "-DFIRST_SOURCE_DIR=${dir}"
-                       "-DFIRST_NAME=${upper_name}"
+      ${CMAKE_COMMAND} "-DNAMES=${upper_name}"
+                       "-D${upper_name}_SOURCE_DIR=${dir}"
                        "-DHEADER_FILE=${revision_inc}"
-                       -P "${get_svn_script}")
+                       -P "${generate_vcs_version_script}")
   else()
     # Generate an empty Revision.inc file if we are not using git or SVN.
     file(WRITE "${revision_inc}" "")

trunk/lib/Basic/Platform.cpp

@@ -141,6 +141,7 @@ 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:
@@ -161,6 +162,7 @@ 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:

trunk/lib/ClangImporter/ClangAdapter.cpp

@@ -436,6 +436,21 @@ 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();
     }
   }