[SIL-opaque] Various SILGen fixes

Author: atrick

lib/SILGen/SILGenApply.cpp

@@ -3964,7 +3964,7 @@ SILGenFunction::emitBeginApply(SILLocation loc, ManagedValue fn,
       yields.push_back(ManagedValue::forLValue(value));
     } else if (info.isConsumed()) {
       yields.push_back(emitManagedRValueWithCleanup(value));
-    } else if (info.isDirectGuaranteed()) {
+    } else if (info.isGuaranteed()) {
       yields.push_back(ManagedValue::forBorrowedRValue(value));
     } else {
       yields.push_back(ManagedValue::forTrivialRValue(value));

lib/SILGen/SILGenDynamicCast.cpp

@@ -252,7 +252,7 @@ namespace {
       }
 
       ManagedValue result;
-      if (!origTargetTL.isAddressOnly()) {
+      if (!origTargetTL.isAddressOnly() || !SGF.useLoweredAddresses()) {
         result = SGF.emitLoad(Loc, buffer, origTargetTL, ctx, IsTake);
       } else {
         result = SGF.emitManagedBufferWithCleanup(buffer, origTargetTL);
@@ -450,7 +450,7 @@ RValue Lowering::emitConditionalCheckedCast(
   SILValue resultObjectBuffer;
   Optional<TemporaryInitialization> resultObjectTemp;
   SGFContext resultObjectCtx;
-  if ((resultTL.isAddressOnly())
+  if ((resultTL.isAddressOnly() && SGF.useLoweredAddresses())
       || (C.getEmitInto()
           && C.getEmitInto()->canPerformInPlaceInitialization())) {
     SILType resultTy = resultTL.getLoweredType();

lib/SILGen/SILGenExpr.cpp

@@ -4726,7 +4726,7 @@ ManagedValue SILGenFunction::emitBindOptional(SILLocation loc,
 
   // If optValue was loadable, we emitted a switch_enum. In such a case, return
   // the argument from hasValueBB.
-  if (optValue.getType().isLoadable(F)) {
+  if (optValue.getType().isLoadable(F) || !silConv.useLoweredAddresses()) {
     return emitManagedRValueWithCleanup(hasValueBB->getArgument(0));
   }
 

lib/SILGen/SILGenFunction.cpp

@@ -271,6 +271,7 @@ void SILGenFunction::emitCaptures(SILLocation loc,
         break;
       case CaptureKind::Immutable:
       case CaptureKind::StorageAddress:
+        // FIXME_addrlower: only call getAddressType for M.useLoweredAddresses()
         capturedArgs.push_back(emitUndef(getLoweredType(type).getAddressType()));
         break;
       case CaptureKind::Box: {
@@ -290,11 +291,13 @@ void SILGenFunction::emitCaptures(SILLocation loc,
     // Get an address value for a SILValue if it is address only in an type
     // expansion context without opaque archetype substitution.
     auto getAddressValue = [&](SILValue entryValue) -> SILValue {
-      if (SGM.Types.getTypeLowering(
-            valueType,
-            TypeExpansionContext::noOpaqueTypeArchetypesSubstitution(
-              expansion.getResilienceExpansion()))
-          .isAddressOnly()
+      if (SGM.M.useLoweredAddresses()
+          && SGM.Types
+                 .getTypeLowering(
+                     valueType,
+                     TypeExpansionContext::noOpaqueTypeArchetypesSubstitution(
+                         expansion.getResilienceExpansion()))
+                 .isAddressOnly()
           && !entryValue->getType().isAddress()) {
 
         auto addr = emitTemporaryAllocation(vd, entryValue->getType());
@@ -342,13 +345,15 @@ void SILGenFunction::emitCaptures(SILLocation loc,
     }
     case CaptureKind::Immutable: {
       if (canGuarantee) {
-        auto entryValue = getAddressValue(Entry.value);
         // No-escaping stored declarations are captured as the
         // address of the value.
-        assert(entryValue->getType().isAddress() && "no address for captured var!");
-        capturedArgs.push_back(ManagedValue::forLValue(entryValue));
+        auto entryValue = getAddressValue(Entry.value);
+        capturedArgs.push_back(ManagedValue::forBorrowedRValue(entryValue));
       }
-      else {
+      else if (!silConv.useLoweredAddresses()) {
+        capturedArgs.push_back(
+          B.createCopyValue(loc, ManagedValue::forUnmanaged(Entry.value)));
+      } else {
         auto entryValue = getAddressValue(Entry.value);
         // We cannot pass a valid SILDebugVariable while creating the temp here
         // See rdar://60425582

lib/SILGen/SILGenPoly.cpp

@@ -1167,6 +1167,10 @@ namespace {
                                    outputOrigEltType, outputEltType,
                                    elt, loweredOutputEltTy);
 
+        // Aggregation of address-only values requires ownership.
+        if (loweredOutputTy.isAddressOnly(SGF.F)) {
+          elt = elt.ensurePlusOne(SGF, Loc);
+        }
         elements.push_back(elt);
       }
 
@@ -1175,7 +1179,10 @@ namespace {
         forwarded.push_back(elt.forward(SGF));
 
       auto tuple = SGF.B.createTuple(Loc, loweredOutputTy, forwarded);
-      return SGF.emitManagedRValueWithCleanup(tuple);
+      if (tuple->getOwnershipKind() == OwnershipKind::Owned)
+        return SGF.emitManagedRValueWithCleanup(tuple);
+
+      return ManagedValue::forUnmanaged(tuple);
     }
 
     /// Handle a tuple that has been exploded in the input but wrapped in

lib/SILGen/SILGenProlog.cpp

@@ -456,11 +456,18 @@ static void emitCaptureArguments(SILGenFunction &SGF,
   case CaptureKind::StorageAddress: {
     // Non-escaping stored decls are captured as the address of the value.
     auto type = getVarTypeInCaptureContext();
-    SILType ty = SGF.getLoweredType(type).getAddressType();
-    SILValue addr = SGF.F.begin()->createFunctionArgument(ty, VD);
-    SGF.VarLocs[VD] = SILGenFunction::VarLoc::get(addr);
+    SILType ty = SGF.getLoweredType(type);
+    if (SGF.SGM.M.useLoweredAddresses()) {
+      ty = ty.getAddressType();
+    }
+    SILValue arg = SGF.F.begin()->createFunctionArgument(ty, VD);
+    SGF.VarLocs[VD] = SILGenFunction::VarLoc::get(arg);
     SILDebugVariable DbgVar(VD->isLet(), ArgNo);
-    SGF.B.createDebugValueAddr(Loc, addr, DbgVar);
+    if (ty.isAddress()) {
+      SGF.B.createDebugValueAddr(Loc, arg, DbgVar);
+    } else {
+      SGF.B.createDebugValue(Loc, arg, DbgVar);
+    }
     break;
   }
   }