---

yaml
---
r: 348949
b: refs/heads/master
c: a58a980
h: refs/heads/master
i:
  348947: 9a3f606

Author: aschwaighofer

[refs]

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

trunk/.gitattributes

@@ -333,11 +333,6 @@ function(_compile_swift_files
            "-emit-module-interface-path" "${interface_file}")
     endif()
 
-    if (NOT SWIFTFILE_IS_STDLIB_CORE)
-      list(APPEND swift_module_flags
-           "-Xfrontend" "-experimental-skip-non-inlinable-function-bodies")
-    endif()
-
     # If we have extra regexp flags, check if we match any of the regexps. If so
     # add the relevant flags to our swift_flags.
     if (SWIFT_EXPERIMENTAL_EXTRA_REGEXP_FLAGS OR SWIFT_EXPERIMENTAL_EXTRA_NEGATIVE_REGEXP_FLAGS)

trunk/cmake/modules/SwiftSource.cmake

@@ -1672,7 +1672,7 @@ class DeclAttributes {
 public:
   template <typename ATTR, bool AllowInvalid>
   using AttributeKindRange =
-      OptionalTransformRange<iterator_range<const_iterator>,
+      OptionalTransformRange<llvm::iterator_range<const_iterator>,
                              ToAttributeKind<ATTR, AllowInvalid>,
                              const_iterator>;
 

trunk/include/swift/AST/Attr.h

@@ -667,7 +667,7 @@ class DeclIterator {
 
 /// The range of declarations stored within an iterable declaration
 /// context.
-using DeclRange = iterator_range<DeclIterator>;
+typedef IteratorRange<DeclIterator> DeclRange;
 
 /// The kind of an \c IterableDeclContext.
 enum class IterableDeclContextKind : uint8_t {  

trunk/include/swift/AST/DeclContext.h

@@ -970,8 +970,6 @@ ERROR(expected_expr_throw,PointsToFirstBadToken,
 // Yield Statment
 ERROR(expected_expr_yield,PointsToFirstBadToken,
       "expected expression in 'yield' statement", ())
-ERROR(unexpected_arg_label_yield,none,
-      "unexpected argument label in 'yield' statement", ())
 
 // Defer Statement
 ERROR(expected_lbrace_after_defer,PointsToFirstBadToken,

trunk/include/swift/AST/DiagnosticsParse.def

@@ -3493,8 +3493,6 @@ ERROR(single_tuple_parameter_mismatch_special,none,
 ERROR(single_tuple_parameter_mismatch_normal,none,
       "%0 %1 expects a single parameter of type %2%3",
       (DescriptiveDeclKind, DeclBaseName, Type, StringRef))
-NOTE(note_maybe_forgot_to_form_tuple,none,
-     "did you mean to pass a tuple?", ())
 ERROR(unknown_single_tuple_parameter_mismatch,none,
       "single parameter of type %0 is expected in call", (Type))
 ERROR(cannot_convert_single_tuple_into_multiple_arguments,none,

trunk/include/swift/AST/DiagnosticsSema.def

@@ -653,7 +653,7 @@ struct TupleTypeReprElement {
   TypeRepr *Type;
   SourceLoc TrailingCommaLoc;
 
-  TupleTypeReprElement(): Type(nullptr) {}
+  TupleTypeReprElement() {}
   TupleTypeReprElement(TypeRepr *Type): Type(Type) {}
 };
 

trunk/include/swift/AST/TypeRepr.h

@@ -3965,11 +3965,13 @@ class SILFunctionType final : public TypeBase, public llvm::FoldingSetNode,
   };
   using IndirectFormalResultIter =
       llvm::filter_iterator<const SILResultInfo *, IndirectFormalResultFilter>;
-  using IndirectFormalResultRange = iterator_range<IndirectFormalResultIter>;
+  using IndirectFormalResultRange = IteratorRange<IndirectFormalResultIter>;
 
   /// A range of SILResultInfo for all formally indirect results.
   IndirectFormalResultRange getIndirectFormalResults() const {
-    return llvm::make_filter_range(getResults(), IndirectFormalResultFilter());
+    auto filter =
+        llvm::make_filter_range(getResults(), IndirectFormalResultFilter());
+    return makeIteratorRange(filter.begin(), filter.end());
   }
 
   struct DirectFormalResultFilter {
@@ -3979,11 +3981,13 @@ class SILFunctionType final : public TypeBase, public llvm::FoldingSetNode,
   };
   using DirectFormalResultIter =
       llvm::filter_iterator<const SILResultInfo *, DirectFormalResultFilter>;
-  using DirectFormalResultRange = iterator_range<DirectFormalResultIter>;
+  using DirectFormalResultRange = IteratorRange<DirectFormalResultIter>;
 
   /// A range of SILResultInfo for all formally direct results.
   DirectFormalResultRange getDirectFormalResults() const {
-    return llvm::make_filter_range(getResults(), DirectFormalResultFilter());
+    auto filter =
+        llvm::make_filter_range(getResults(), DirectFormalResultFilter());
+    return makeIteratorRange(filter.begin(), filter.end());
   }
 
   /// Get a single non-address SILType that represents all formal direct

trunk/include/swift/AST/Types.h

@@ -67,14 +67,14 @@ class BlotSetVector {
 
   ArrayRef<Optional<ValueT>> getArray() const { return vector; }
 
-  iterator_range<const_iterator> getRange() const {
+  llvm::iterator_range<const_iterator> getRange() const {
     return {begin(), end()};
   }
 
   using const_reverse_iterator = typename VectorT::const_reverse_iterator;
   const_reverse_iterator rbegin() const { return vector.rbegin(); }
   const_reverse_iterator rend() const { return vector.rend(); }
-  iterator_range<const_reverse_iterator> getReverseRange() const {
+  llvm::iterator_range<const_reverse_iterator> getReverseRange() const {
     return {rbegin(), rend()};
   }
 

trunk/include/swift/Basic/BlotSetVector.h

@@ -43,7 +43,6 @@ namespace llvm {
   template<typename T> class TinyPtrVector;
   template<typename T> class Optional;
   template <typename ...PTs> class PointerUnion;
-  template <typename IteratorT> class iterator_range;
   class SmallBitVector;
 
   // Other common classes.
@@ -64,7 +63,6 @@ namespace swift {
 
   // Containers.
   using llvm::ArrayRef;
-  using llvm::iterator_range;
   using llvm::MutableArrayRef;
   using llvm::None;
   using llvm::Optional;

trunk/include/swift/Basic/LLVM.h

@@ -44,6 +44,7 @@
 
 namespace swift {
   using llvm::make_range;
+  using llvm::iterator_range;
 
   template<typename T>
   inline auto reversed(T &&container)

trunk/include/swift/Basic/Range.h

@@ -251,13 +251,37 @@ inline Iterator prev_or_begin(Iterator it, Iterator begin) {
 
 /// @}
 
+/// A range of iterators.
+/// TODO: Add `llvm::iterator_range::empty()`, then remove this helper, along
+/// with the superfluous TransformIterator.
+template<typename Iterator>
+class IteratorRange {
+  Iterator First, Last;
+
+public:
+  using iterator = Iterator;
+
+  IteratorRange(Iterator first, Iterator last) : First(first), Last(last) { }
+  iterator begin() const { return First; }
+  iterator end() const { return Last; }
+  bool empty() const { return First == Last; }
+
+  typename std::iterator_traits<iterator>::value_type front() const { 
+    assert(!empty() && "Front of empty range");
+    return *begin(); 
+  }
+};
+
+/// Create a new iterator range.
+template<typename Iterator>
+inline IteratorRange<Iterator> 
+makeIteratorRange(Iterator first, Iterator last) {
+  return IteratorRange<Iterator>(first, last);
+}
 
 /// An iterator that transforms the result of an underlying bidirectional
 /// iterator with a given operation.
 ///
-/// Slightly different semantics from llvm::map_iterator, but we should
-/// probably figure out how to merge them eventually.
-///
 /// \tparam Iterator the underlying iterator.
 ///
 /// \tparam Operation A function object that transforms the underlying

trunk/include/swift/Basic/STLExtras.h

@@ -37,9 +37,6 @@ class ASTGen {
 
   // FIXME: remove when Syntax can represent all types and ASTGen can handle
   // them
-  /// Exprs that cannot be represented by Syntax or generated by ASTGen.
-  llvm::DenseMap<SourceLoc, Expr *> Exprs;
-
   /// Decl attributes that cannot be represented by Syntax or generated by
   /// ASTGen.
   llvm::DenseMap<SourceLoc, DeclAttributes> ParsedDeclAttrs;
@@ -84,10 +81,6 @@ class ASTGen {
 
   Expr *generate(const syntax::ExprSyntax &Expr, const SourceLoc Loc);
   Expr *generate(const syntax::IdentifierExprSyntax &Expr, const SourceLoc Loc);
-  Expr *generate(const syntax::SuperRefExprSyntax &Expr, const SourceLoc Loc);
-  Expr *generate(const syntax::ArrayExprSyntax &Expr, const SourceLoc Loc);
-  Expr *generate(const syntax::DictionaryExprSyntax &Expr, const SourceLoc Loc);
-  Expr *generate(const syntax::TupleExprSyntax &E, const SourceLoc Loc);
   Expr *generate(const syntax::EditorPlaceholderExprSyntax &Expr,
                  const SourceLoc Loc);
   Expr *generate(const syntax::SpecializeExprSyntax &Expr, const SourceLoc Loc);
@@ -113,14 +106,7 @@ class ASTGen {
       const Optional<syntax::DeclNameArgumentsSyntax> &args,
       const SourceLoc Loc);
 
-  void generateExprTupleElementList(const syntax::TupleExprElementListSyntax &elements,
-                                    const SourceLoc Loc, bool isForCallArguments,
-                                    SmallVectorImpl<Expr *> &exprs,
-                                    SmallVectorImpl<Identifier> &exprLabels,
-                                    SmallVectorImpl<SourceLoc> &exprLabelLocs);
-
 private:
-  void validateCollectionElement(Expr *elementExpr);
 
   Expr *generateMagicIdentifierLiteralExpression(
       const syntax::TokenSyntax &PoundToken, const SourceLoc Loc);
@@ -224,13 +210,6 @@ class ASTGen {
   static SourceLoc advanceLocBegin(const SourceLoc &Loc,
                                    const syntax::Syntax &Node);
 
-  /// Advance \p Loc to the last non-missing token of the \p Node or, if it
-  /// doesn't contain any, the last non-missing token preceding it in the tree.
-  /// \p Loc must be the leading trivia of the first token in the tree in which
-  /// \p Node resides
-  static SourceLoc advanceLocEnd(const SourceLoc &Loc,
-                                 const syntax::Syntax &Node);
-
   ValueDecl *lookupInScope(DeclName Name);
 
   void addToScope(ValueDecl *D, bool diagnoseRedefinitions = true);
@@ -240,13 +219,9 @@ class ASTGen {
   TypeRepr *lookupType(syntax::TypeSyntax Type);
 
 public:
-  void addExpr(Expr *Expr, const SourceLoc Loc);
-  bool hasExpr(const SourceLoc Loc) const;
-  Expr *takeExpr(const SourceLoc Loc);
-
   void addDeclAttributes(DeclAttributes attrs, const SourceLoc Loc);
   bool hasDeclAttributes(SourceLoc Loc) const;
-  DeclAttributes takeDeclAttributes(const SourceLoc Loc);
+  DeclAttributes getDeclAttributes(const SourceLoc Loc) const;
 };
 } // namespace swift
 

trunk/include/swift/Parse/ASTGen.h

@@ -52,7 +52,6 @@ class ParsedRawSyntaxNode {
   };
   struct DeferredLayoutNode {
     MutableArrayRef<ParsedRawSyntaxNode> Children;
-    CharSourceRange Range;
   };
   struct DeferredTokenNode {
     const ParsedTriviaPiece *TriviaPieces;
@@ -73,9 +72,9 @@ class ParsedRawSyntaxNode {
   /// Primary used for capturing a deferred missing token.
   bool IsMissing = false;
 
-  ParsedRawSyntaxNode(syntax::SyntaxKind k, CharSourceRange r,
+  ParsedRawSyntaxNode(syntax::SyntaxKind k,
                       MutableArrayRef<ParsedRawSyntaxNode> deferredNodes)
-    : DeferredLayout({deferredNodes, r}),
+    : DeferredLayout({deferredNodes}),
       SynKind(uint16_t(k)), TokKind(uint16_t(tok::unknown)),
       DK(DataKind::DeferredLayout) {
     assert(getKind() == k && "Syntax kind with too large value!");
@@ -212,12 +211,14 @@ class ParsedRawSyntaxNode {
     return copy;
   }
 
-  CharSourceRange getDeferredRange() const {
+  CharSourceRange getDeferredRange(bool includeTrivia) const {
     switch (DK) { 
     case DataKind::DeferredLayout:
-      return getDeferredLayoutRange();
+      return getDeferredLayoutRange(includeTrivia);
     case DataKind::DeferredToken:
-      return getDeferredTokenRangeWithTrivia();
+      return includeTrivia
+        ? getDeferredTokenRangeWithTrivia()
+        : getDeferredTokenRange();
     default:
       llvm_unreachable("node not deferred");
     }
@@ -242,9 +243,20 @@ class ParsedRawSyntaxNode {
 
   // Deferred Layout Data ====================================================//
 
-  CharSourceRange getDeferredLayoutRange() const {
+  CharSourceRange getDeferredLayoutRange(bool includeTrivia) const {
     assert(DK == DataKind::DeferredLayout);
-    return DeferredLayout.Range;
+    auto HasValidRange = [includeTrivia](const ParsedRawSyntaxNode &Child) {
+      return !Child.isNull() && !Child.isMissing() &&
+        Child.getDeferredRange(includeTrivia).isValid();
+    };
+    auto first = llvm::find_if(getDeferredChildren(), HasValidRange);
+    if (first == getDeferredChildren().end())
+      return CharSourceRange();
+    auto last = llvm::find_if(llvm::reverse(getDeferredChildren()),
+                              HasValidRange);
+    auto firstRange = first->getDeferredRange(includeTrivia);
+    firstRange.widen(last->getDeferredRange(includeTrivia));
+    return firstRange;
   }
   ArrayRef<ParsedRawSyntaxNode> getDeferredChildren() const {
     assert(DK == DataKind::DeferredLayout);

trunk/include/swift/Parse/ParsedRawSyntaxNode.h

@@ -32,9 +32,6 @@ namespace swift {
 %   if not node.is_syntax_collection():
 class Parsed${node.name};
 %   end
-%   if node.is_buildable():
-class Parsed${node.name}Builder;
-%   end
 % end
 
 % for node in SYNTAX_NODES + PARSEONLY_NODES:
@@ -82,10 +79,6 @@ public:
   static bool classof(const ParsedSyntax *S) {
     return kindof(S->getKind());
   }
-
-%     if node.is_buildable():
-  using Builder = Parsed${node.name}Builder;
-%     end
 };
 
 %   end