---

yaml
---
r: 349133
b: refs/heads/master
c: a29a5f1
h: refs/heads/master
i:
  349131: 8c6ad33

Author: DougGregor

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: b6b310fd7a2ca90e63f5789ed3a283b768a97b05
+refs/heads/master: a29a5f1a34388e2ce131a07b6df041d995b71d9b
 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}")
@@ -377,10 +375,6 @@ option(SWIFT_ENABLE_STDLIBCORE_EXCLUSIVITY_CHECKING
   "Build stdlibCore with exclusivity checking enabled"
   FALSE)
 
-option(SWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING
-  "Enable experimental Swift differentiable programming features"
-  FALSE)
-
 #
 # End of user-configurable options.
 #

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/benchmark/single-source/UTF8Decode.swift

@@ -42,18 +42,6 @@ public let UTF8Decode = [
       name: "UTF8Decode_InitFromBytes_ascii",
       runFunction: run_UTF8Decode_InitFromBytes_ascii,
       tags: [.validation, .api, .String]),
-    BenchmarkInfo(
-      name: "UTF8Decode_InitFromData_ascii_as_ascii",
-      runFunction: run_UTF8Decode_InitFromData_ascii_as_ascii,
-      tags: [.validation, .api, .String]),
-    BenchmarkInfo(
-      name: "UTF8Decode_InitDecoding_ascii_as_ascii",
-      runFunction: run_UTF8Decode_InitDecoding_ascii_as_ascii,
-      tags: [.validation, .api, .String]),
-    BenchmarkInfo(
-      name: "UTF8Decode_InitFromBytes_ascii_as_ascii",
-      runFunction: run_UTF8Decode_InitFromBytes_ascii_as_ascii,
-      tags: [.validation, .api, .String]),
 ]
 
 // 1-byte sequences
@@ -141,26 +129,4 @@ public func run_UTF8Decode_InitFromBytes_ascii(_ N: Int) {
   }
 }
 
-@inline(never)
-public func run_UTF8Decode_InitFromData_ascii_as_ascii(_ N: Int) {
-  let input = asciiData
-  for _ in 0..<1_000*N {
-    blackHole(String(data: input, encoding: .ascii))
-  }
-}
-@inline(never)
-public func run_UTF8Decode_InitDecoding_ascii_as_ascii(_ N: Int) {
-  let input = asciiBytes
-  for _ in 0..<1_000*N {
-    blackHole(String(decoding: input, as: Unicode.ASCII.self))
-  }
-}
-@inline(never)
-public func run_UTF8Decode_InitFromBytes_ascii_as_ascii(_ N: Int) {
-  let input = asciiBytes
-  for _ in 0..<1_000*N {
-    blackHole(String(bytes: input, encoding: .ascii))
-  }
-}
-
 

trunk/cmake/modules/AddSwift.cmake

@@ -422,10 +422,6 @@ function(_add_variant_swift_compile_flags
     list(APPEND result "-D" "SWIFT_ENABLE_RUNTIME_FUNCTION_COUNTERS")
   endif()
 
-  if(SWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING)
-    list(APPEND result "-D" "SWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING")
-  endif()
-
   set("${result_var_name}" "${result}" PARENT_SCOPE)
 endfunction()
 

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/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

@@ -71,7 +71,6 @@ namespace swift {
   class GenericTypeParamDecl;
   class GenericTypeParamType;
   class ModuleDecl;
-  class NamedPattern;
   class EnumCaseDecl;
   class EnumElementDecl;
   class ParameterList;
@@ -2022,8 +2021,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;
@@ -2127,11 +2126,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);
   }
 
@@ -4774,8 +4773,6 @@ enum class PropertyWrapperSynthesizedPropertyKind {
 
 /// VarDecl - 'var' and 'let' declarations.
 class VarDecl : public AbstractStorageDecl {
-  NamedPattern *NamingPattern = nullptr;
-
 public:
   enum class Introducer : uint8_t {
     Let = 0,
@@ -4789,6 +4786,10 @@ class VarDecl : public AbstractStorageDecl {
           bool issCaptureList, SourceLoc nameLoc, Identifier name,
           DeclContext *dc, StorageIsMutable_t supportsMutation);
 
+  TypeRepr *ParentRepr = nullptr;
+
+  Type typeInContext;
+
 public:
   VarDecl(bool isStatic, Introducer introducer, bool isCaptureList,
           SourceLoc nameLoc, Identifier name, DeclContext *dc)
@@ -4805,10 +4806,26 @@ 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; }
+
+  bool hasType() const {
+    // We have a type if either the type has been computed already or if
+    // this is a deserialized declaration with an interface type.
+    return !typeInContext.isNull();
+  }
+
   /// Get the type of the variable within its context. If the context is generic,
   /// this will use archetypes.
   Type getType() const;
 
+  /// Set the type of the variable within its context.
+  void setType(Type t);
+
+  void markInvalid();
+
   /// Retrieve the source range of the variable type, or an invalid range if the
   /// variable's type is not explicitly written in the source.
   ///
@@ -4847,14 +4864,6 @@ class VarDecl : public AbstractStorageDecl {
   ///
   Pattern *getParentPattern() const;
 
-  /// Returns the parsed type of this variable declaration.  For parameters, this
-  /// is the parsed type the user explicitly wrote.  For variables, this is the
-  /// type the user wrote in the typed pattern that binds this variable.
-  ///
-  /// Note that there are many cases where the user may elide types.  This will
-  /// return null in those cases.
-  TypeRepr *getTypeReprOrParentPatternTypeRepr() const;
-
   /// Return the statement that owns the pattern associated with this VarDecl,
   /// if one exists.
   ///
@@ -4895,9 +4904,6 @@ class VarDecl : public AbstractStorageDecl {
     Parent = v;
   }
 
-  NamedPattern *getNamingPattern() const { return NamingPattern; }
-  void setNamingPattern(NamedPattern *Pat) { NamingPattern = Pat; }
-
   /// If this is a VarDecl that does not belong to a CaseLabelItem's pattern,
   /// return this. Otherwise, this VarDecl must belong to a CaseStmt's
   /// CaseLabelItem. In that case, return the first case label item of the first
@@ -5152,8 +5158,6 @@ class ParamDecl : public VarDecl {
   SourceLoc ArgumentNameLoc;
   SourceLoc SpecifierLoc;
 
-  TypeRepr *TyRepr = nullptr;
-
   struct StoredDefaultArgument {
     PointerUnion<Expr *, VarDecl *> DefaultArg;
     Initializer *InitContext = nullptr;
@@ -5199,10 +5203,6 @@ class ParamDecl : public VarDecl {
 
   SourceLoc getSpecifierLoc() const { return SpecifierLoc; }
 
-  /// Retrieve the TypeRepr corresponding to the parsed type of the parameter, if it exists.
-  TypeRepr *getTypeRepr() const { return TyRepr; }
-  void setTypeRepr(TypeRepr *repr) { TyRepr = repr; }
-
   DefaultArgumentKind getDefaultArgumentKind() const {
     return static_cast<DefaultArgumentKind>(Bits.ParamDecl.defaultArgumentKind);
   }
@@ -5237,12 +5237,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
@@ -5814,8 +5814,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(),

trunk/include/swift/AST/DiagnosticsSema.def

@@ -1509,9 +1509,6 @@ ERROR(pattern_binds_no_variables,none,
       "%select{property|global variable}0 declaration does not bind any "
       "variables",
       (unsigned))
-ERROR(variable_bound_by_no_pattern,none,
-      "variable %0 is not bound by any pattern",
-      (DeclName))
 
 WARNING(optional_ambiguous_case_ref,none,
         "assuming you mean '%0.%2'; did you mean '%1.%2' instead?",

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.

trunk/include/swift/AST/Initializer.h

@@ -150,6 +150,12 @@ class SerializedPatternBindingInitializer : public SerializedLocalDeclContext {
 /// A default argument expression.  The parent context is the function
 /// (possibly a closure) for which this is a default argument.
 class DefaultArgumentInitializer : public Initializer {
+  friend class ASTContext; // calls reset on unused contexts
+  void reset(DeclContext *parent, unsigned index) {
+    setParent(parent);
+    SpareBits = index;
+  }
+
 public:
   explicit DefaultArgumentInitializer(DeclContext *parent, unsigned index)
       : Initializer(InitializerKind::DefaultArgument, parent) {

trunk/include/swift/SIL/MemoryLifetime.h

@@ -22,16 +22,6 @@
 
 namespace swift {
 
-void printBitsAsArray(llvm::raw_ostream &OS, const SmallBitVector &bits);
-
-inline llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
-                                     const SmallBitVector &bits) {
-  printBitsAsArray(OS, bits);
-  return OS;
-}
-
-void dumpBits(const SmallBitVector &bits);
-
 /// The MemoryLocations utility provides functions to analyze memory locations.
 ///
 /// Memory locations are limited to addresses which are guaranteed to