SILGen: Fix inout re-abstraction for default witnesses

This came up when a requirement was mutating whereas the witness was not.
danielgindi · Mar 10, 2016 · 0029448 · 0029448
1 parent 46ce8b4
commit 0029448
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/lib/SILGen/SILGenDecl.cpp b/lib/SILGen/SILGenDecl.cpp
@@ -1814,13 +1814,10 @@ SILGenModule::emitProtocolWitness(ProtocolConformance *conformance,
     if (conformance) {
       selfType = conformance->getType();
 
-    // For default implementations, Self is the contextual type of the
-    // extension (or, once we add default implementations inside protocols,
-    // the protocol's Self type).
+    // For default implementations, Self is the protocol archetype.
     } else {
-      DeclContext *dc = witness.getDecl()->getDeclContext();
-      assert(dc->getAsProtocolOrProtocolExtensionContext());
-      selfType = dc->getDeclaredTypeOfContext();
+      auto *proto = cast<ProtocolDecl>(requirement.getDecl()->getDeclContext());
+      selfType = proto->getProtocolSelf()->getArchetype();
     }
   }
 

diff --git a/test/SILGen/protocol_resilience.swift b/test/SILGen/protocol_resilience.swift
@@ -99,6 +99,8 @@ public protocol ResilientStorage {
   var mutableGenericPropertyWithDefault: T { get set }
 
   subscript(x: T) -> T { get set }
+
+  var mutatingGetterWithNonMutatingDefault: Int { mutating get set }
 }
 
 extension ResilientStorage {
@@ -151,6 +153,18 @@ extension ResilientStorage {
     set { }
   }
 
+// CHECK-LABEL: sil [transparent] [thunk] @_TFP19protocol_resilience16ResilientStorageg36mutatingGetterWithNonMutatingDefaultSi
+// CHECK-LABEL: sil @_TFE19protocol_resiliencePS_16ResilientStorageg36mutatingGetterWithNonMutatingDefaultSi
+// CHECK-LABEL: sil [transparent] [thunk] @_TFP19protocol_resilience16ResilientStorages36mutatingGetterWithNonMutatingDefaultSi
+// CHECK-LABEL: sil @_TFE19protocol_resiliencePS_16ResilientStorages36mutatingGetterWithNonMutatingDefaultSi
+// CHECK-LABEL: sil [transparent] [thunk] @_TFP19protocol_resilience16ResilientStoragem36mutatingGetterWithNonMutatingDefaultSi
+// CHECK-LABEL: sil [transparent] @_TFFP19protocol_resilience16ResilientStoragem36mutatingGetterWithNonMutatingDefaultSiU_T_
+  public var mutatingGetterWithNonMutatingDefault: Int {
+    get {
+      return 0
+    }
+    set { }
+  }
 }
 
 
@@ -248,6 +262,9 @@ protocol InternalProtocol {
 // CHECK-NEXT:   method #ResilientStorage.subscript!getter.1: @_TFP19protocol_resilience16ResilientStorageg9subscriptFwx1TwxS1_
 // CHECK-NEXT:   method #ResilientStorage.subscript!setter.1: @_TFP19protocol_resilience16ResilientStorages9subscriptFwx1TwxS1_
 // CHECK-NEXT:   method #ResilientStorage.subscript!materializeForSet.1: @_TFP19protocol_resilience16ResilientStoragem9subscriptFwx1TwxS1_
+// CHECK-NEXT:   method #ResilientStorage.mutatingGetterWithNonMutatingDefault!getter.1: @_TFP19protocol_resilience16ResilientStorageg36mutatingGetterWithNonMutatingDefaultSi
+// CHECK-NEXT:   method #ResilientStorage.mutatingGetterWithNonMutatingDefault!setter.1: @_TFP19protocol_resilience16ResilientStorages36mutatingGetterWithNonMutatingDefaultSi
+// CHECK-NEXT:   method #ResilientStorage.mutatingGetterWithNonMutatingDefault!materializeForSet.1: @_TFP19protocol_resilience16ResilientStoragem36mutatingGetterWithNonMutatingDefaultSi
 // CHECK-NEXT: }
 
 // CHECK-LABEL: sil_default_witness_table ResilientOperators {