---

yaml
---
r: 349103
b: refs/heads/master
c: 185d3bc
h: refs/heads/master
i:
  349101: 36375b1
  349099: ed5b1e7
  349095: 899386d
  349087: b44ac4d

Author: theblixguy

[refs]

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

trunk/CMakeLists.txt

@@ -11,8 +11,6 @@ endif()
 list(APPEND CMAKE_MODULE_PATH
     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
 
-set(CMAKE_DISABLE_IN_SOURCE_BUILD YES)
-
 if(DEFINED CMAKE_JOB_POOLS)
   # CMake < 3.11 doesn't support CMAKE_JOB_POOLS. Manually set the property.
   set_property(GLOBAL PROPERTY JOB_POOLS "${CMAKE_JOB_POOLS}")

trunk/benchmark/scripts/run_smoke_bench

@@ -93,10 +93,6 @@ def main():
     argparser.add_argument(
         '-num-samples', type=int,
         help='The (minimum) number of samples to run', default=3)
-    argparser.add_argument(
-        '-num-reruns', type=int,
-        help="The number of re-runs until it's assumed to be a real change",
-        default=8)
     argparser.add_argument(
         '-platform', type=str,
         help='The benchmark build platform', default='macosx')
@@ -124,7 +120,7 @@ def test_opt_levels(args):
             if test_performance(opt_level, args.oldbuilddir[0],
                                 args.newbuilddir[0],
                                 float(args.threshold) / 100, args.num_samples,
-                                args.num_reruns, output_file):
+                                output_file):
                 changes = True
 
         # There is no point in reporting code size for Onone.
@@ -175,7 +171,7 @@ def merge(results, other_results):
 
 
 def test_performance(opt_level, old_dir, new_dir, threshold, num_samples,
-                     num_reruns, output_file):
+                     output_file):
     """Detect performance changes in benchmarks.
 
     Start fast with few samples per benchmark and gradually spend more time
@@ -189,7 +185,7 @@ def test_performance(opt_level, old_dir, new_dir, threshold, num_samples,
     tests = TestComparator(results[0], results[1], threshold)
     changed = tests.decreased + tests.increased
 
-    while len(changed) > 0 and unchanged_length_count < num_reruns:
+    while len(changed) > 0 and unchanged_length_count < 10:
         i += 1
         if VERBOSE:
             log('        test again: ' + str([test.name for test in changed]))

trunk/cmake/modules/SwiftSource.cmake

@@ -333,6 +333,11 @@ 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/docs/WindowsBuild.md

@@ -99,7 +99,8 @@ mklink "%VCToolsInstallDir%\include\visualc.apinotes" S:\swift\stdlib\public\Pla
 Warning: Creating the above links usually requires administrator privileges. The quick and easy way to do this is to open a second developer prompt by right clicking whatever shortcut you used to open the first one, choosing Run As Administrator, and pasting the above commands into the resulting window. You can then close the privileged prompt; this is the only step which requires elevation.
 
 ## 6. Build LLVM/Clang
-- This must be done from within a developer command prompt. Make sure that the build
+- This must be done from within a developer command prompt. LLVM and Clang are
+  large projects, so building might take a few hours. Make sure that the build
   type for LLVM/Clang is compatible with the build type for Swift. That is,
   either build everything `Debug` or some variant of `Release` (e.g. `Release`,
   `RelWithDebInfo`).
@@ -125,8 +126,8 @@ ninja
 path S:\b\llvm\bin;%PATH%
 ```
 ## 7. Build CMark
-- This must be done from within a developer command prompt.
-
+- This must be done from within a developer command prompt. CMark is a fairly
+  small project and should only take a few minutes to build.
 ```cmd
 md "S:\b\cmark"
 cd "S:\b\cmark"
@@ -179,8 +180,8 @@ cmake -G "Visual Studio 2017" -A x64 -T "host=x64"^ ...
 ```
 
 ## 9. Build lldb
-- This must be done from within a developer command prompt.
-
+- This must be done from within a developer command prompt and could take hours
+  depending on your system.
 ```cmd
 md "S:\b\lldb"
 cd "S:\b\lldb"

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

@@ -52,13 +52,13 @@ class AnyFunctionRef {
     }
   }
 
-  CaptureInfo getCaptureInfo() const {
+  const CaptureInfo &getCaptureInfo() const {
     if (auto *AFD = TheFunction.dyn_cast<AbstractFunctionDecl *>())
       return AFD->getCaptureInfo();
     return TheFunction.get<AbstractClosureExpr *>()->getCaptureInfo();
   }
 
-  void setCaptureInfo(CaptureInfo captures) const {
+  void setCaptureInfo(const CaptureInfo &captures) const {
     if (auto *AFD = TheFunction.dyn_cast<AbstractFunctionDecl *>()) {
       AFD->setCaptureInfo(captures);
       return;

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
   );
@@ -2021,8 +2028,8 @@ class PatternBindingEntry {
   /// from the source range.
   SourceRange getSourceRange(bool omitAccessors = false) const;
 
-  CaptureInfo getCaptureInfo() const { return Captures; }
-  void setCaptureInfo(CaptureInfo captures) { Captures = captures; }
+  const CaptureInfo &getCaptureInfo() const { return Captures; }
+  void setCaptureInfo(const CaptureInfo &captures) { Captures = captures; }
 
 private:
   SourceLoc getLastAccessorEndLoc() const;
@@ -2126,11 +2133,11 @@ class PatternBindingDecl final : public Decl,
     return getPatternList()[i].getInitContext();
   }
 
-  CaptureInfo getCaptureInfo(unsigned i) const {
+  const CaptureInfo &getCaptureInfo(unsigned i) const {
     return getPatternList()[i].getCaptureInfo();
   }
 
-  void setCaptureInfo(unsigned i, CaptureInfo captures) {
+  void setCaptureInfo(unsigned i, const CaptureInfo &captures) {
     getMutablePatternList()[i].setCaptureInfo(captures);
   }
 
@@ -2978,6 +2985,9 @@ class TypeAliasDecl : public GenericTypeDecl {
   /// Retrieve a sugared interface type containing the structure of the interface
   /// type before any semantic validation has occured.
   Type getStructuralType() const;
+
+  /// Set the interface type of this typealias declaration from the underlying type.
+  void computeType();
 
   bool isCompatibilityAlias() const {
     return Bits.TypeAliasDecl.IsCompatibilityAlias;
@@ -3166,6 +3176,10 @@ class AssociatedTypeDecl : public AbstractTypeParamDecl {
     TrailingWhere = trailingWhereClause;
   }
 
+  /// Set the interface type of this associated type declaration to a dependent
+  /// member type of 'Self'.
+  void computeType();
+
   /// Retrieve the associated type "anchor", which is the associated type
   /// declaration that will be used to describe this associated type in the
   /// ABI.
@@ -3355,6 +3369,10 @@ class NominalTypeDecl : public GenericTypeDecl, public IterableDeclContext {
     Bits.NominalTypeDecl.AddedImplicitInitializers = true;
   }
 
+  /// Set the interface type of this nominal type to the metatype of the
+  /// declared interface type.
+  void computeType();
+
   /// getDeclaredType - Retrieve the type declared by this entity, without
   /// any generic parameters bound if this is a generic type.
   Type getDeclaredType() const;
@@ -4786,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;
 
@@ -4806,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
@@ -5184,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; }
@@ -5202,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);
   }
@@ -5237,12 +5259,12 @@ class ParamDecl : public VarDecl {
 
   void setDefaultArgumentInitContext(Initializer *initContext);
 
-  CaptureInfo getDefaultArgumentCaptureInfo() const {
+  const CaptureInfo &getDefaultArgumentCaptureInfo() const {
     assert(DefaultValueAndFlags.getPointer());
     return DefaultValueAndFlags.getPointer()->Captures;
   }
 
-  void setDefaultArgumentCaptureInfo(CaptureInfo captures);
+  void setDefaultArgumentCaptureInfo(const CaptureInfo &captures);
 
   /// Extracts the text of the default argument attached to the provided
   /// ParamDecl, removing all inactive #if clauses and providing only the
@@ -5473,6 +5495,10 @@ class SubscriptDecl : public GenericContext, public AbstractStorageDecl {
   TypeLoc &getElementTypeLoc() { return ElementTy; }
   const TypeLoc &getElementTypeLoc() const { return ElementTy; }
 
+  /// Compute the interface type of this subscript from the parameter and
+  /// element types.
+  void computeType();
+
   /// Determine the kind of Objective-C subscripting this declaration
   /// implies.
   ObjCSubscriptKind getObjCSubscriptKind() const;
@@ -5814,8 +5840,8 @@ class AbstractFunctionDecl : public GenericContext, public ValueDecl {
   /// Retrieve the source range of the function declaration name + patterns.
   SourceRange getSignatureSourceRange() const;
 
-  CaptureInfo getCaptureInfo() const { return Captures; }
-  void setCaptureInfo(CaptureInfo captures) { Captures = captures; }
+  const CaptureInfo &getCaptureInfo() const { return Captures; }
+  void setCaptureInfo(const CaptureInfo &captures) { Captures = captures; }
 
   /// Retrieve the Objective-C selector that names this method.
   ObjCSelector getObjCSelector(DeclName preferredName = DeclName(),
@@ -6343,6 +6369,10 @@ class EnumElementDecl : public DeclContext, public ValueDecl {
     return hasName() ? getBaseName().getIdentifier().str() : "_";
   }
 
+  /// Set the interface type of this enum element to the constructor function
+  /// type; (Self.Type) -> Self or (Self.Type) -> (Args...) -> Self.
+  void computeType();
+
   Type getArgumentInterfaceType() const;
 
   void setParameterList(ParameterList *params);

trunk/include/swift/AST/DiagnosticsCommon.def

@@ -163,11 +163,6 @@ ERROR(circular_protocol_def,none,
 NOTE(kind_declname_declared_here,none,
      "%0 %1 declared here", (DescriptiveDeclKind, DeclName))
 
-WARNING(warn_property_wrapper_module_scope,none,
-        "ignoring associated type %0 in favor of module-scoped property "
-        "wrapper %0; please qualify the reference with %1",
-        (DeclName, Identifier))
-
 #ifndef DIAG_NO_UNDEF
 # if defined(DIAG)
 #  undef DIAG

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",
@@ -4533,6 +4533,8 @@ ERROR(property_wrapper_wrong_initial_value_init, none,
       (DeclName, Type, Type))
 ERROR(property_wrapper_failable_init, none,
       "%0 cannot be failable", (DeclName))
+ERROR(property_wrapper_ambiguous_default_value_init, none,
+  "property wrapper type %0 has multiple default-value initializers", (Type))
 ERROR(property_wrapper_type_requirement_not_accessible,none,
       "%select{private|fileprivate|internal|public|open}0 %1 %2 cannot have "
       "more restrictive access than its enclosing property wrapper type %3 "

trunk/include/swift/AST/Expr.h

@@ -3449,7 +3449,7 @@ class AbstractClosureExpr : public DeclContext, public Expr {
     Bits.AbstractClosureExpr.Discriminator = Discriminator;
   }
 
-  CaptureInfo getCaptureInfo() const { return Captures; }
+  const CaptureInfo &getCaptureInfo() const { return Captures; }
   void setCaptureInfo(CaptureInfo captures) { Captures = captures; }
 
   /// Retrieve the parameters of this closure.