Merge pull request #67752 from nate-chandler/opaque-values/20230804/1/any-hashable-var

[OpaqueValues] Emit RValue of AnyHashable erasure into new context.

Author: nate-chandler

lib/SILGen/SILGenExpr.cpp

@@ -2059,10 +2059,10 @@ RValue RValueEmitter::visitAnyHashableErasureExpr(AnyHashableErasureExpr *E,
   auto sourceOrigType = AbstractionPattern::getOpaque();
   auto subExpr = E->getSubExpr();
   auto &sourceOrigTL = SGF.getTypeLowering(sourceOrigType, subExpr->getType());
-  auto source =
-      SGF.silConv.useLoweredAddresses()
-          ? SGF.emitMaterializedRValueAsOrig(subExpr, sourceOrigType)
-          : SGF.emitRValueAsOrig(subExpr, sourceOrigType, sourceOrigTL, C);
+  auto source = SGF.silConv.useLoweredAddresses()
+                    ? SGF.emitMaterializedRValueAsOrig(subExpr, sourceOrigType)
+                    : SGF.emitRValueAsOrig(subExpr, sourceOrigType,
+                                           sourceOrigTL, SGFContext());
 
   return SGF.emitAnyHashableErasure(E, source, subExpr->getType(),
                                     E->getConformance(), C);

test/SILGen/opaque_values_silgen.swift

@@ -760,3 +760,25 @@ func callMutatingFooOnInoutExistential(_ i: inout any MutatingFooable) {
 struct WeakBox<T : AnyObject> {
   weak var t: T?
 }
+
+// CHECK-LABEL: sil {{.*}}[ossa] @intIntoAnyHashableVar : {{.*}} {
+// CHECK:         [[VAR_BOX_ADDR:%[^,]+]] = project_box
+// CHECK:         [[INT:%[^,]+]] = apply
+// CHECK:         [[CONVERT:%[^,]+]] = function_ref @$ss21_convertToAnyHashableys0cD0VxSHRzlF
+// CHECK:         [[INSTANCE:%[^,]+]] = apply [[CONVERT]]<Int>([[INT]])
+// CHECK:         store [[INSTANCE]] to [init] [[VAR_BOX_ADDR]]
+// CHECK-LABEL: } // end sil function 'intIntoAnyHashableVar'
+@_silgen_name("intIntoAnyHashableVar")
+func intIntoAnyHashableVar() {
+  var anyHashable: AnyHashable = 0
+}
+
+// CHECK-LABEL: sil {{.*}}[ossa] @intIntoAnyHashableLet : {{.*}} {
+// CHECK:         [[INT:%[^,]+]] = apply
+// CHECK:         [[CONVERT:%[^,]+]] = function_ref @$ss21_convertToAnyHashableys0cD0VxSHRzlF
+// CHECK:         [[INSTANCE:%[^,]+]] = apply [[CONVERT]]<Int>([[INT]])
+// CHECK-LABEL: } // end sil function 'intIntoAnyHashableLet'
+@_silgen_name("intIntoAnyHashableLet")
+func intIntoAnyHashableLet() {
+  let anyHashable: AnyHashable = 0
+}