Merge remote-tracking branch 'origin/master' into master-next

Author: swift-ci

lib/SILGen/SILGenExpr.cpp

@@ -2672,6 +2672,10 @@ static SILFunction *getOrCreateKeyPathGetter(SILGenModule &SGM,
   auto genericSig = genericEnv
     ? genericEnv->getGenericSignature()->getCanonicalSignature()
     : nullptr;
+  if (genericSig && genericSig->areAllParamsConcrete()) {
+    genericSig = nullptr;
+    genericEnv = nullptr;
+  }
 
   // Build the signature of the thunk as expected by the keypath runtime.
   CanType loweredBaseTy, loweredPropTy;
@@ -2801,6 +2805,11 @@ static SILFunction *getOrCreateKeyPathSetter(SILGenModule &SGM,
     ? genericEnv->getGenericSignature()->getCanonicalSignature()
     : nullptr;
 
+  if (genericSig && genericSig->areAllParamsConcrete()) {
+    genericSig = nullptr;
+    genericEnv = nullptr;
+  }
+
   // Build the signature of the thunk as expected by the keypath runtime.
   CanType loweredBaseTy, loweredPropTy;
   {
@@ -2957,6 +2966,11 @@ getOrCreateKeyPathEqualsAndHash(SILGenModule &SGM,
     ? genericEnv->getGenericSignature()->getCanonicalSignature()
     : nullptr;
 
+  if (genericSig && genericSig->areAllParamsConcrete()) {
+    genericSig = nullptr;
+    genericEnv = nullptr;
+  }
+
   auto &C = SGM.getASTContext();
   auto unsafeRawPointerTy = C.getUnsafeRawPointerDecl()->getDeclaredType()
                                                        ->getCanonicalType();

lib/SILGen/SILGenPoly.cpp

@@ -3327,17 +3327,20 @@ SILGenFunction::createWithoutActuallyEscapingClosure(
 
   // Create it in our current function.
   auto thunkValue = B.createFunctionRefFor(loc, thunk);
+
+  // Create a copy for the noescape value, so we can mark_dependence upon the
+  // original value.
   SILValue noEscapeValue =
-      noEscapingFunctionValue.ensurePlusOne(*this, loc).forward(*this);
+      noEscapingFunctionValue.copy(*this, loc).forward(*this);
   SingleValueInstruction *thunkedFn = B.createPartialApply(
       loc, thunkValue,
       SILType::getPrimitiveObjectType(substFnTy),
       interfaceSubs,
       noEscapeValue,
       SILType::getPrimitiveObjectType(escapingFnTy));
   // We need to ensure the 'lifetime' of the trivial values context captures. As
-  // long as we rerpresent these captures by the same value the following works.
-  thunkedFn = B.createMarkDependence(loc, thunkedFn, noEscapeValue);
+  // long as we represent these captures by the same value the following works.
+  thunkedFn = B.createMarkDependence(loc, thunkedFn, noEscapingFunctionValue.getValue());
 
   return emitManagedRValueWithCleanup(thunkedFn);
 }

test/Interpreter/enforce_exclusive_access.swift

@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-build-swift -swift-version 4 %s -o %t/a.out -enforce-exclusivity=checked -Onone
+// RUN: %target-build-swift -Xfrontend -verify-sil-ownership -swift-version 4 %s -o %t/a.out -enforce-exclusivity=checked -Onone
 //
 // RUN: %target-codesign %t/a.out
 // RUN: %target-run %t/a.out

test/SILGen/keypath_property_descriptors.swift

@@ -154,3 +154,17 @@ public struct FixedLayout {
   // RESILIENT-LABEL: sil_property #FixedLayout.c (stored_property
   public var c: Int
 }
+
+public class Foo {}
+extension Array where Element == Foo {
+  public class Bar {
+    // NONRESILIENT-LABEL: sil_property #Array.Bar.dontCrash<τ_0_0 where τ_0_0 == Foo> (settable_property $Int
+    public private(set) var dontCrash : Int {
+      get {
+        return 10
+      }
+      set {
+      }
+    }
+  }
+}