Merge branch 'master' into artiodactyla

Author: jrose-apple

benchmark/single-source/ExistentialPerformance.swift

@@ -264,17 +264,6 @@ func caRef1() { ca(Ref1.self) }
 func caRef2() { ca(Ref2.self) }
 func caRef3() { ca(Ref3.self) }
 func caRef4() { ca(Ref4.self) }
-@inline(never)
-func grabArray() -> [Existential] { // transfer array ownership to caller
-  // FIXME: This is causing Illegal Instruction: 4 crash
-  // defer { array = nil }
-  // return array
-  // This doesn't work either:
-  // let a = array!
-  // array = nil
-  // return a
-  return array!
-}
 
 // `setUpFunctions` that determine which existential type will be tested
 var existentialType: Existential.Type!
@@ -540,7 +529,7 @@ func run_Array_init(_ N: Int) {
 }
 
 func run_Array_method1x(_ N: Int) {
-  let existentialArray = grabArray()
+  let existentialArray = array!
   for _ in 0 ..< N * 100 {
     for elt in existentialArray {
       if !elt.doIt()  {
@@ -551,7 +540,7 @@ func run_Array_method1x(_ N: Int) {
 }
 
 func run_Array_method2x(_ N: Int) {
-  let existentialArray = grabArray()
+  let existentialArray = array!
   for _ in 0 ..< N * 100 {
     for elt in existentialArray {
       if !elt.doIt() || !elt.reallyDoIt() {
@@ -562,8 +551,8 @@ func run_Array_method2x(_ N: Int) {
 }
 
 func run_ArrayMutating(_ N: Int) {
-  var existentialArray = grabArray()
-  for _ in 0 ..< N * 100 {
+  var existentialArray = array!
+  for _ in 0 ..< N * 500 {
     for i in 0 ..< existentialArray.count {
       if !existentialArray[i].mutateIt()  {
         fatalError("expected true")
@@ -573,7 +562,7 @@ func run_ArrayMutating(_ N: Int) {
 }
 
 func run_ArrayShift(_ N: Int) {
-  var existentialArray = grabArray()
+  var existentialArray = array!
   for _ in 0 ..< N * 25 {
     for i in 0 ..< existentialArray.count-1 {
       existentialArray.swapAt(i, i+1)
@@ -582,7 +571,7 @@ func run_ArrayShift(_ N: Int) {
 }
 
 func run_ArrayConditionalShift(_ N: Int) {
-  var existentialArray = grabArray()
+  var existentialArray = array!
   for _ in 0 ..< N * 25 {
     for i in 0 ..< existentialArray.count-1 {
       let curr = existentialArray[i]

benchmark/single-source/ExistentialPerformance.swift.gyb

@@ -36,8 +36,8 @@ Setup = """
   let existential = existentialType.init()
   let existential2 = existentialType.init()
   var existential = existentialType.init()
-  let existentialArray = grabArray()
-  var existentialArray = grabArray()
+  let existentialArray = array!
+  var existentialArray = array!
 """.splitlines()
 Setup = [Setup[0], Setup[1], '\n'.join(Setup[1:3]), Setup[3], Setup[4], Setup[5]]
 
@@ -90,7 +90,7 @@ Workloads = [
       }
     }
 """),
-  ('Array.Mutating', Setup[5], '100', """
+  ('Array.Mutating', Setup[5], '500', """
     for i in 0 ..< existentialArray.count {
       if !existentialArray[i].mutateIt()  {
         fatalError("expected true")
@@ -151,17 +151,6 @@ func ca<T: Existential>(_: T.Type) {
 % for Variant in Vals + Refs:
 func ca${Variant}() { ca(${Variant}.self) }
 % end
-@inline(never)
-func grabArray() -> [Existential] { // transfer array ownership to caller
-  // FIXME: This is causing Illegal Instruction: 4 crash
-  // defer { array = nil }
-  // return array
-  // This doesn't work either:
-  // let a = array!
-  // array = nil
-  // return a
-  return array!
-}
 
 // `setUpFunctions` that determine which existential type will be tested
 var existentialType: Existential.Type!

include/swift/AST/DiagnosticsSema.def

@@ -3075,10 +3075,15 @@ NOTE(silence_debug_description_in_interpolation_segment_call,none,
 NOTE(noescape_parameter,none,
     "parameter %0 is implicitly non-escaping",
      (Identifier))
+NOTE(generic_parameters_always_escaping,none,
+     "generic parameters are always considered '@escaping'", ())
 
 ERROR(passing_noescape_to_escaping,none,
       "passing non-escaping parameter %0 to function expecting an @escaping closure",
       (Identifier))
+ERROR(converting_noespace_param_to_generic_type,none,
+      "converting non-escaping parameter %0 to generic parameter %1 may allow it to escape",
+      (Identifier, Type))
 ERROR(assigning_noescape_to_escaping,none,
       "assigning non-escaping parameter %0 to an @escaping closure",
       (Identifier))

include/swift/AST/Evaluator.h

@@ -285,6 +285,24 @@ class Evaluator {
       (*this)(requests)...);
   }
 
+  /// Cache a precomputed value for the given request, so that it will not
+  /// be computed.
+  template<typename Request,
+           typename std::enable_if<Request::hasExternalCache>::type* = nullptr>
+  void cacheOutput(const Request &request,
+                   typename Request::OutputType &&output) {
+    request.cacheResult(std::move(output));
+  }
+
+  /// Cache a precomputed value for the given request, so that it will not
+  /// be computed.
+  template<typename Request,
+           typename std::enable_if<!Request::hasExternalCache>::type* = nullptr>
+  void cacheOutput(const Request &request,
+                   typename Request::OutputType &&output) {
+    cache.insert({getCanonicalRequest(request), std::move(output)});
+  }
+
   /// Clear the cache stored within this evaluator.
   ///
   /// Note that this does not clear the caches of requests that use external

include/swift/SIL/TypeSubstCloner.h

@@ -193,6 +193,13 @@ class TypeSubstCloner : public SILClonerWithScopes<ImplClass> {
                                  Helper.getArguments(), Inst->isNonThrowing(),
                                  GenericSpecializationInformation::create(
                                    Inst, getBuilder()));
+    // Specialization can return noreturn applies that were not identified as
+    // such before.
+    if (N->isCalleeNoReturn() &&
+        !isa<UnreachableInst>(*std::next(SILBasicBlock::iterator(Inst)))) {
+      noReturnApplies.push_back(N);
+    }
+
     recordClonedInstruction(Inst, N);
   }
 
@@ -381,6 +388,9 @@ class TypeSubstCloner : public SILClonerWithScopes<ImplClass> {
   SILFunction &Original;
   /// True, if used for inlining.
   bool Inlining;
+  // Generic specialization can create noreturn applications that where
+  // previously not identifiable as such.
+  SmallVector<ApplyInst *, 16> noReturnApplies;
 };
 
 } // end namespace swift

include/swift/SILOptimizer/Utils/GenericCloner.h

@@ -74,6 +74,8 @@ class GenericCloner
     return SC.getCloned();
   }
 
+  void fixUp(SILFunction *calleeFunction);
+
 protected:
   void visitTerminator(SILBasicBlock *BB);
 

include/swift/Serialization/ModuleFormat.h

@@ -52,7 +52,7 @@ const uint16_t SWIFTMODULE_VERSION_MAJOR = 0;
 /// describe what change you made. The content of this comment isn't important;
 /// it just ensures a conflict if two people change the module format.
 /// Don't worry about adhering to the 80-column limit for this line.
-const uint16_t SWIFTMODULE_VERSION_MINOR = 489; // dependency directories
+const uint16_t SWIFTMODULE_VERSION_MINOR = 490; // dependency directories
 
 using DeclIDField = BCFixed<31>;
 
@@ -1054,7 +1054,8 @@ namespace decls_block {
     AccessLevelField, // access level
     AccessLevelField, // setter access, if applicable
     DeclIDField, // opaque return type decl
-    BCArray<TypeIDField> // accessors and dependencies
+    BCFixed<2>,  // # of property delegate backing properties
+    BCArray<TypeIDField> // accessors, backing properties, and dependencies
   >;
 
   using ParamLayout = BCRecordLayout<

lib/SILOptimizer/Utils/GenericCloner.cpp

@@ -191,3 +191,12 @@ const SILDebugScope *GenericCloner::remapScope(const SILDebugScope *DS) {
   RemappedScopeCache.insert({DS, RemappedScope});
   return RemappedScope;
 }
+
+void GenericCloner::fixUp(SILFunction *f) {
+  for (auto *apply : noReturnApplies) {
+    auto applyBlock = apply->getParent();
+    applyBlock->split(std::next(SILBasicBlock::iterator(apply)));
+    getBuilder().setInsertionPoint(applyBlock);
+    getBuilder().createUnreachable(apply->getLoc());
+  }
+}

lib/Sema/CSDiag.cpp

@@ -173,17 +173,26 @@ void constraints::simplifyLocator(Expr *&anchor,
       continue;
 
     case ConstraintLocator::NamedTupleElement:
-    case ConstraintLocator::TupleElement:
+    case ConstraintLocator::TupleElement: {
       // Extract tuple element.
+      unsigned index = path[0].getValue();
       if (auto tupleExpr = dyn_cast<TupleExpr>(anchor)) {
-        unsigned index = path[0].getValue();
         if (index < tupleExpr->getNumElements()) {
           anchor = tupleExpr->getElement(index);
           path = path.slice(1);
           continue;
         }
       }
+
+      if (auto *CE = dyn_cast<CollectionExpr>(anchor)) {
+        if (index < CE->getNumElements()) {
+          anchor = CE->getElement(index);
+          path = path.slice(1);
+          continue;
+        }
+      }
       break;
+    }
 
     case ConstraintLocator::ApplyArgToParam:
       // Extract tuple element.
@@ -1994,34 +2003,9 @@ bool FailureDiagnosis::diagnoseNonEscapingParameterToEscaping(
   if (!srcFT || !dstFT || !srcFT->isNoEscape() || dstFT->isNoEscape())
     return false;
 
-  // Pick a specific diagnostic for the specific use
-  auto paramDecl = cast<ParamDecl>(declRef->getDecl());
-  switch (dstPurpose) {
-  case CTP_CallArgument:
-    CS.TC.diagnose(declRef->getLoc(), diag::passing_noescape_to_escaping,
-                   paramDecl->getName());
-    break;
-  case CTP_AssignSource:
-    CS.TC.diagnose(declRef->getLoc(), diag::assigning_noescape_to_escaping,
-                   paramDecl->getName());
-    break;
-
-  default:
-    CS.TC.diagnose(declRef->getLoc(), diag::general_noescape_to_escaping,
-                   paramDecl->getName());
-    break;
-  }
-
-  // Give a note and fixit
-  InFlightDiagnostic note = CS.TC.diagnose(
-      paramDecl->getLoc(), diag::noescape_parameter, paramDecl->getName());
-
-  if (!paramDecl->isAutoClosure()) {
-    note.fixItInsert(paramDecl->getTypeLoc().getSourceRange().Start,
-                     "@escaping ");
-  } // TODO: add in a fixit for autoclosure
-
-  return true;
+  NoEscapeFuncToTypeConversionFailure failure(
+      expr, CS, CS.getConstraintLocator(expr), dstType);
+  return failure.diagnoseAsError();
 }
 
 bool FailureDiagnosis::diagnoseContextualConversionError(