---

yaml
---
r: 326207
b: refs/heads/master-next
c: 1584e87
h: refs/heads/master
i:
  326205: a9648a6
  326203: 3cc993d
  326199: ce90873
  326191: 9d6b18e
  326175: 1ab78dc
  326143: a994ee4

Author: rintaro

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: e052da7d8886fa0439677852e8f7830b20c2e1da
-refs/heads/master-next: da140a852a020d674b93f080280b819e2344395e
+refs/heads/master-next: 1584e87aa7dc92f1c4515da39367a63de1991e3a
 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/cmake/modules/SwiftHandleGybSources.cmake

@@ -121,9 +121,7 @@ function(handle_gyb_sources dependency_out_var_name sources_var_name arch)
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/DeclNodes.py"
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/ExprNodes.py"
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/GenericNodes.py"
-      "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/NodeSerializationCodes.py"
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/PatternNodes.py"
-      "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/SILOnlyNodes.py"
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/StmtNodes.py"
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/TypeNodes.py"
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/Token.py"

branches/master-next/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++'14.
-  set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++14"
+  # Use C++'11.
+  set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11"
       CACHE STRING "Xcode C++ Language Standard")
   # Use libc++.
   set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++"

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

@@ -4800,7 +4800,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/Evaluator.h

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

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 *>
@@ -1373,8 +1373,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/SimpleRequest.h

@@ -195,7 +195,7 @@ class SimpleRequest<Derived, Output(Inputs...), Caching> {
 
   template<size_t ...Indices>
   llvm::Expected<Output>
-  callDerived(Evaluator &evaluator, std::index_sequence<Indices...>) const {
+  callDerived(Evaluator &evaluator, llvm::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,
-                               std::index_sequence_for<Inputs...>());
+                               llvm::index_sequence_for<Inputs...>());
   }
 
   /// Retrieve the nearest source location to which this request applies.

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

@@ -365,7 +365,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;
 }
 
@@ -150,8 +149,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/Frontend/Frontend.h

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

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/ASTGen.h

@@ -22,24 +22,21 @@
 
 namespace swift {
 /// Generates AST nodes from Syntax nodes.
-class Parser;
 class ASTGen {
   ASTContext &Context;
 
   /// Type cache to prevent multiple transformations of the same syntax node.
   llvm::DenseMap<syntax::SyntaxNodeId, TypeRepr *> TypeCache;
 
-  Parser &P;
+  PersistentParserState **ParserState;
 
   // FIXME: remove when Syntax can represent all types and ASTGen can handle them
   /// Types that cannot be represented by Syntax or generated by ASTGen.
   llvm::DenseMap<SourceLoc, TypeRepr *> Types;
 
-  llvm::DenseMap<SourceLoc, DeclAttributes> ParsedDeclAttrs;
-
 public:
-  ASTGen(ASTContext &Context, Parser &P)
-      : Context(Context), P(P) {}
+  ASTGen(ASTContext &Context, PersistentParserState **ParserState)
+      : Context(Context), ParserState(ParserState) {}
 
   SourceLoc generate(syntax::TokenSyntax Tok, SourceLoc &Loc);
 
@@ -73,15 +70,6 @@ class ASTGen {
   llvm::SmallVector<TypeRepr *, 4>
   generate(syntax::GenericArgumentListSyntax Args, SourceLoc &Loc);
 
-  GenericParamList *
-  generate(syntax::GenericParameterClauseListSyntax clause, SourceLoc &Loc);
-  GenericParamList *
-  generate(syntax::GenericParameterClauseSyntax clause, SourceLoc &Loc);
-  Optional<RequirementRepr>
-  generate(syntax::GenericRequirementSyntax req, SourceLoc &Loc);
-  LayoutConstraint
-  generate(syntax::LayoutConstraintSyntax req, SourceLoc &Loc);
-
   /// Copy a numeric literal value into AST-owned memory, stripping underscores
   /// so the semantic part of the value can be parsed by APInt/APFloat parsers.
   static StringRef copyAndStripUnderscores(StringRef Orig, ASTContext &Context);
@@ -114,8 +102,6 @@ class ASTGen {
 
   ValueDecl *lookupInScope(DeclName Name);
 
-  void addToScope(ValueDecl *D, bool diagnoseRedefinitions = true);
-
   TypeRepr *cacheType(syntax::TypeSyntax Type, TypeRepr *TypeAST);
 
   TypeRepr *lookupType(syntax::TypeSyntax Type);
@@ -126,10 +112,6 @@ class ASTGen {
   bool hasType(const SourceLoc &Loc) const;
 
   TypeRepr *getType(const SourceLoc &Loc) const;
-
-  void addDeclAttributes(DeclAttributes attrs, SourceLoc Loc);
-  bool hasDeclAttributes(SourceLoc Loc) const;
-  DeclAttributes getDeclAttributes(SourceLoc Loc) const;
 };
 } // namespace swift
 

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

@@ -200,8 +200,8 @@ class Lexer {
            ParsedTrivia &TrailingTriviaResult) {
     Result = NextToken;
     if (TriviaRetention == TriviaRetentionMode::WithTrivia) {
-      std::swap(LeadingTriviaResult, LeadingTrivia);
-      std::swap(TrailingTriviaResult, TrailingTrivia);
+      LeadingTriviaResult = {LeadingTrivia};
+      TrailingTriviaResult = {TrailingTrivia};
     }
     if (Result.isNot(tok::eof))
       lexImpl();

branches/master-next/include/swift/Parse/ParsedSyntaxBuilders.h.gyb

@@ -30,7 +30,7 @@ namespace swift {
 class ParsedRawSyntaxRecorder;
 class SyntaxParsingContext;
 
-% for node in SYNTAX_NODES + SILONLY_NODES:
+% for node in SYNTAX_NODES:
 %   if node.is_buildable():
 %     child_count = len(node.children)
 class Parsed${node.name}Builder {

branches/master-next/include/swift/Parse/ParsedSyntaxNodes.h.gyb

@@ -28,20 +28,20 @@ namespace swift {
 % # Emit the non-collection classes first, then emit the collection classes
 % # that reference these classes.
 
-% for node in SYNTAX_NODES + SILONLY_NODES:
+% for node in SYNTAX_NODES:
 %   if not node.is_syntax_collection():
 class Parsed${node.name};
 %   end
 % end
 
-% for node in SYNTAX_NODES + SILONLY_NODES:
+% for node in SYNTAX_NODES:
 %   if node.is_syntax_collection():
 using Parsed${node.name} =
   ParsedSyntaxCollection<syntax::SyntaxKind::${node.syntax_kind}>;
 %   end
 % end
 
-% for node in SYNTAX_NODES + SILONLY_NODES:
+% for node in SYNTAX_NODES:
 %   if not node.is_syntax_collection():
 %     qualifier = "" if node.is_base() else "final"
 %     for line in dedented_lines(node.description):

branches/master-next/include/swift/Parse/ParsedSyntaxRecorder.h.gyb

@@ -31,7 +31,7 @@ class SyntaxParsingContext;
 
 struct ParsedSyntaxRecorder {
 
-% for node in SYNTAX_NODES + SILONLY_NODES:
+% for node in SYNTAX_NODES:
 %   if node.children:
 %     child_params = []
 %     for child in node.children:

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 {
@@ -695,19 +695,11 @@ class Parser {
   /// plain Tok.is(T1) check).
   bool skipUntilTokenOrEndOfLine(tok T1);
 
-  //-------------------------------------------------------------------------//
-  // Ignore token APIs.
-  // This is used when we skip gabage text in the source text. 
-
-  /// Ignore the current single token.
   void ignoreToken();
   void ignoreToken(tok Kind) {
-  /// Ignore the current single token asserting its kind.
     assert(Tok.is(Kind));
     ignoreToken();
   }
-  /// Conditionally ignore the current single token if it matches with the \p
-  /// Kind.
   bool ignoreIf(tok Kind) {
     if (!Tok.is(Kind))
       return false;
@@ -1181,8 +1173,7 @@ class Parser {
   using TypeASTResult = ParserResult<TypeRepr>;
   using TypeResult = ParsedSyntaxResult<ParsedTypeSyntax>;
 
-  ParsedSyntaxResult<ParsedLayoutConstraintSyntax>
-  parseLayoutConstraintSyntax();
+  LayoutConstraint parseLayoutConstraint(Identifier LayoutConstraintID);
 
   TypeResult parseTypeSyntax();
   TypeResult parseTypeSyntax(Diag<> MessageID, bool HandleCodeCompletion = true,
@@ -1606,19 +1597,8 @@ class Parser {
   //===--------------------------------------------------------------------===//
   // Generics Parsing
 
-  ParserResult<GenericParamList> parseSILGenericParams();
-
-  ParserStatus parseSILGenericParamsSyntax(
-      Optional<ParsedGenericParameterClauseListSyntax> &result);
-
-  ParsedSyntaxResult<ParsedGenericParameterClauseSyntax>
-  parseGenericParameterClauseSyntax();
-
-  ParsedSyntaxResult<ParsedGenericWhereClauseSyntax>
-  parseGenericWhereClauseSyntax(bool &FirstTypeInComplete,
-                                bool AllowLayoutConstraints = false);
-
   ParserResult<GenericParamList> parseGenericParameters();
+  ParserResult<GenericParamList> parseGenericParameters(SourceLoc LAngleLoc);
   ParserStatus parseGenericParametersBeforeWhere(SourceLoc LAngleLoc,
                         SmallVectorImpl<GenericTypeParamDecl *> &GenericParams);
   ParserResult<GenericParamList> maybeParseGenericParams();