---

yaml
---
r: 349039
b: refs/heads/master
c: 05e24c0
h: refs/heads/master
i:
  349037: 66fed9e
  349035: 2b8d877
  349031: def82f1
  349023: 5e9bffe

Author: ravikandhadai

[refs]

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

trunk/include/swift/AST/ASTContext.h

@@ -109,7 +109,6 @@ namespace swift {
   class TypeAliasDecl;
   class VarDecl;
   class UnifiedStatsReporter;
-  class IndexSubset;
 
   enum class KnownProtocolKind : uint8_t;
 

trunk/include/swift/AST/Decl.h

@@ -369,14 +369,21 @@ class alignas(1 << DeclAlignInBits) Decl {
     IsPropertyWrapperBackingProperty : 1
   );
 
-  SWIFT_INLINE_BITFIELD(ParamDecl, VarDecl, 1+2+NumDefaultArgumentKindBits,
+  SWIFT_INLINE_BITFIELD(ParamDecl, VarDecl, 1+2+1+NumDefaultArgumentKindBits,
     /// Whether we've computed the specifier yet.
     SpecifierComputed : 1,
 
     /// The specifier associated with this parameter.  This determines
     /// the storage semantics of the value e.g. mutability.
     Specifier : 2,
 
+    /// True if the type is implicitly specified in the source, but this has an
+    /// apparently valid typeRepr.  This is used in accessors, which look like:
+    ///    set (value) {
+    /// but need to get the typeRepr from the property as a whole so Sema can
+    /// resolve the type.
+    IsTypeLocImplicit : 1,
+
     /// Information about a symbolic default argument, like #file.
     defaultArgumentKind : NumDefaultArgumentKindBits
   );
@@ -4797,7 +4804,8 @@ class VarDecl : public AbstractStorageDecl {
           bool issCaptureList, SourceLoc nameLoc, Identifier name,
           DeclContext *dc, StorageIsMutable_t supportsMutation);
 
-  TypeRepr *ParentRepr = nullptr;
+  /// This is the type specified, including location information.
+  TypeLoc typeLoc;
 
   Type typeInContext;
 
@@ -4817,10 +4825,8 @@ class VarDecl : public AbstractStorageDecl {
     return hasName() ? getBaseName().getIdentifier().str() : "_";
   }
 
-  /// Retrieve the TypeRepr corresponding to the parsed type of the parent
-  /// pattern, if it exists.
-  TypeRepr *getTypeRepr() const { return ParentRepr; }
-  void setTypeRepr(TypeRepr *repr) { ParentRepr = repr; }
+  TypeLoc &getTypeLoc() { return typeLoc; }
+  TypeLoc getTypeLoc() const { return typeLoc; }
 
   bool hasType() const {
     // We have a type if either the type has been computed already or if
@@ -5195,8 +5201,10 @@ class ParamDecl : public VarDecl {
             Identifier argumentName, SourceLoc parameterNameLoc,
             Identifier parameterName, DeclContext *dc);
 
-  /// Create a new ParamDecl identical to the first except without the interface type.
-  static ParamDecl *cloneWithoutType(const ASTContext &Ctx, ParamDecl *PD);
+  /// Clone constructor, allocates a new ParamDecl identical to the first.
+  /// Intentionally not defined as a typical copy constructor to avoid
+  /// accidental copies.
+  ParamDecl(ParamDecl *PD, bool withTypes);
 
   /// Retrieve the argument (API) name for this function parameter.
   Identifier getArgumentName() const { return ArgumentName; }
@@ -5213,7 +5221,10 @@ class ParamDecl : public VarDecl {
   SourceLoc getParameterNameLoc() const { return ParameterNameLoc; }
 
   SourceLoc getSpecifierLoc() const { return SpecifierLoc; }
-
+    
+  bool isTypeLocImplicit() const { return Bits.ParamDecl.IsTypeLocImplicit; }
+  void setIsTypeLocImplicit(bool val) { Bits.ParamDecl.IsTypeLocImplicit = val; }
+  
   DefaultArgumentKind getDefaultArgumentKind() const {
     return static_cast<DefaultArgumentKind>(Bits.ParamDecl.defaultArgumentKind);
   }

trunk/include/swift/AST/DiagnosticsSema.def

@@ -381,8 +381,8 @@ ERROR(cannot_convert_argument_value,none,
       (Type,Type))
 
 NOTE(candidate_has_invalid_argument_at_position,none,
-     "candidate expects %select{|in-out }2value of type %0 for parameter #%1",
-     (Type, unsigned, bool))
+     "candidate expects value of type %0 for parameter #%1",
+     (Type, unsigned))
 
 ERROR(cannot_convert_array_to_variadic,none,
       "cannot pass array of type %0 as variadic arguments of type %1",

trunk/include/swift/AST/IndexSubset.h

@@ -111,6 +111,8 @@ class alignas(ParamDecl *) ParameterList final :
     /// The cloned pattern is for an inherited constructor; mark default
     /// arguments as inherited, and mark unnamed arguments as named.
     Inherited = 0x02,
+    /// The cloned pattern will strip type information.
+    WithoutTypes = 0x04,
   };
 
   friend OptionSet<CloneFlags> operator|(CloneFlags flag1, CloneFlags flag2) {

trunk/include/swift/AST/ParameterList.h

@@ -108,8 +108,6 @@ class ASTGen {
                  const SourceLoc Loc);
   Expr *generate(const syntax::PoundDsohandleExprSyntax &Expr,
                  const SourceLoc Loc);
-  Expr *generate(const syntax::ObjcKeyPathExprSyntax &Expr,
-                 const SourceLoc Loc);
   Expr *generate(const syntax::ObjectLiteralExprSyntax &Expr,
                  const SourceLoc Loc);
   Expr *generate(const syntax::CodeCompletionExprSyntax &Expr,

trunk/include/swift/Parse/ASTGen.h

@@ -1452,7 +1452,6 @@ class Parser {
   ParserResult<Expr> parseExprPrimary(Diag<> ID, bool isExprBasic);
   ParserResult<Expr> parseExprUnary(Diag<> ID, bool isExprBasic);
   ParserResult<Expr> parseExprKeyPathObjC();
-  ParsedSyntaxResult<ParsedExprSyntax> parseExprObjcKeyPathSyntax();
   ParserResult<Expr> parseExprKeyPath();
   ParserResult<Expr> parseExprSelector();
   ParserResult<Expr> parseExprSuper();