Merge pull request #58861 from meg-gupta/silgenfixes

Some SILGen fixes for opaque values

Author: meg-gupta

lib/SILGen/SILGenApply.cpp

@@ -3962,15 +3962,20 @@ SILGenFunction::emitBeginApply(SILLocation loc, ManagedValue fn,
   // Manage all the yielded values.
   auto yieldInfos = substFnType->getYields();
   assert(yieldValues.size() == yieldInfos.size());
+  bool useLoweredAddresses = silConv.useLoweredAddresses();
   for (auto i : indices(yieldValues)) {
     auto value = yieldValues[i];
     auto info = yieldInfos[i];
     if (info.isIndirectInOut()) {
       yields.push_back(ManagedValue::forLValue(value));
     } else if (info.isConsumed()) {
-      yields.push_back(emitManagedRValueWithCleanup(value));
+      !useLoweredAddresses && value->getType().isTrivial(getFunction())
+          ? yields.push_back(ManagedValue::forTrivialRValue(value))
+          : yields.push_back(emitManagedRValueWithCleanup(value));
     } else if (info.isGuaranteed()) {
-      yields.push_back(ManagedValue::forBorrowedRValue(value));
+      !useLoweredAddresses && value->getType().isTrivial(getFunction())
+          ? yields.push_back(ManagedValue::forTrivialRValue(value))
+          : yields.push_back(ManagedValue::forBorrowedRValue(value));
     } else {
       yields.push_back(ManagedValue::forTrivialRValue(value));
     }

lib/SILGen/SILGenExpr.cpp

@@ -1941,11 +1941,14 @@ RValue RValueEmitter::visitAnyHashableErasureExpr(AnyHashableErasureExpr *E,
                                                   SGFContext C) {
   // Emit the source value into a temporary.
   auto sourceOrigType = AbstractionPattern::getOpaque();
+  auto subExpr = E->getSubExpr();
+  auto &sourceOrigTL = SGF.getTypeLowering(sourceOrigType, subExpr->getType());
   auto source =
-    SGF.emitMaterializedRValueAsOrig(E->getSubExpr(), sourceOrigType);
+      SGF.silConv.useLoweredAddresses()
+          ? SGF.emitMaterializedRValueAsOrig(subExpr, sourceOrigType)
+          : SGF.emitRValueAsOrig(subExpr, sourceOrigType, sourceOrigTL, C);
 
-  return SGF.emitAnyHashableErasure(E, source,
-                                    E->getSubExpr()->getType(),
+  return SGF.emitAnyHashableErasure(E, source, subExpr->getType(),
                                     E->getConformance(), C);
 }
 

lib/SILGen/SILGenPattern.cpp

@@ -2850,7 +2850,11 @@ void SILGenFunction::emitSwitchStmt(SwitchStmt *S) {
     }
 
     // If then we have an object, return it at +0.
+    // For opaque values, return at +1
     if (subjectMV.getType().isObject()) {
+      if (subjectMV.getType().isAddressOnly(F)) {
+        return {subjectMV.copy(*this, S), CastConsumptionKind::TakeAlways};
+      }
       return {subjectMV, CastConsumptionKind::BorrowAlways};
     }
 

test/SILGen/opaque_values_silgen.swift

@@ -461,3 +461,20 @@ class TestGeneric<T> {
 // CHECK:   unwind
 // CHECK-LABEL: } // end sil function '$s20opaque_values_silgen11TestGenericC08borrowedE0xvr'
 
+// CHECK-LABEL: sil hidden [ossa] @$s20opaque_values_silgen8TestEnumO5_codeSivg :
+// CHECK: bb0(%0 : @guaranteed $TestEnum<T>):
+// CHECK:   [[COPY:%.*]] = copy_value %0 : $TestEnum<T>
+// CHECK:   switch_enum [[COPY]] : $TestEnum<T>, case #TestEnum.invalidValue!enumelt: bb1
+// CHECK: bb1([[VAL:%.*]] : @owned $Any):
+// CHECK:   destroy_value [[VAL]] : $Any
+// CHECK-LABEL: } // end sil function '$s20opaque_values_silgen8TestEnumO5_codeSivg'
+enum TestEnum<T> {
+  case invalidValue(Any)
+
+  var _code: Int {
+     switch self {
+     case .invalidValue: return 4866
+     }
+  }
+}
+