Merge pull request #11012 from atrick/silval-silgen

swift-ci · web-flow · commit 809045fd0ac3 · 2017-07-17T22:42:49.000-07:00
diff --git a/lib/SILGen/SILGenBridging.cpp b/lib/SILGen/SILGenBridging.cpp
@@ -675,7 +675,11 @@ static ManagedValue emitNativeToCBridgedNonoptionalValue(SILGenFunction &SGF,
 
     // Put the value into memory if necessary.
     assert(v.getType().isTrivial(SGF.SGM.M) || v.hasCleanup());
-    if (v.getType().isObject()) {
+    SILModuleConventions silConv(SGF.SGM.M);
+    // bridgeAnything always takes an indirect argument as @in.
+    // Since we don't have the SIL type here, check the current SIL stage/mode
+    // to determine the convention.
+    if (v.getType().isObject() && silConv.useLoweredAddresses()) {
       auto tmp = SGF.emitTemporaryAllocation(loc, v.getType());
       v.forwardInto(SGF, loc, tmp);
       v = SGF.emitManagedBufferWithCleanup(tmp);
diff --git a/lib/SILGen/SILGenBuilder.cpp b/lib/SILGen/SILGenBuilder.cpp
@@ -494,7 +494,9 @@ ManagedValue SILGenBuilder::createLoadCopy(SILLocation loc, ManagedValue v,
       lowering.emitLoadOfCopy(*this, loc, v.getValue(), IsNotTake);
   if (lowering.isTrivial())
     return ManagedValue::forUnmanaged(result);
-  assert(!lowering.isAddressOnly() && "cannot retain an unloadable type");
+  assert((!lowering.isAddressOnly()
+          || !SGF.silConv.useLoweredAddresses()) &&
+         "cannot retain an unloadable type");
   return SGF.emitManagedRValueWithCleanup(result, lowering);
 }
 
diff --git a/lib/SILGen/SILGenBuiltin.cpp b/lib/SILGen/SILGenBuiltin.cpp
@@ -572,7 +572,7 @@ emitBuiltinCastReference(SILGenFunction &gen,
   auto &toTL = gen.getTypeLowering(toTy);
   assert(!fromTL.isTrivial() && !toTL.isTrivial() && "expected ref type");
 
-  if (fromTL.isLoadable() || toTL.isLoadable()) { 
+  if (!fromTL.isAddress() || !toTL.isAddress()) { 
     if (auto refCast = gen.B.tryCreateUncheckedRefCast(loc, args[0].getValue(),
                                                        toTL.getLoweredType())) {
       // Create a reference cast, forwarding the cleanup.
@@ -593,7 +593,7 @@ emitBuiltinCastReference(SILGenFunction &gen,
   // more information to the optimizer.
   SILValue srcVal = args[0].forward(gen);
   SILValue fromAddr;
-  if (fromTL.isLoadable()) {
+  if (!fromTL.isAddress()) {
     // Move the loadable value into a "source temp".  Since the source and
     // dest are RC identical, store the reference into the source temp without
     // a retain. The cast will load the reference from the source temp and
@@ -610,7 +610,7 @@ emitBuiltinCastReference(SILGenFunction &gen,
   gen.B.createUncheckedRefCastAddr(loc, fromAddr, fromTy->getCanonicalType(),
                                    toAddr, toTy->getCanonicalType());
   // Forward it along and register a cleanup.
-  if (toTL.isAddressOnly())
+  if (toTL.isAddress())
     return gen.emitManagedBufferWithCleanup(toAddr);
 
   // Load the destination value.
@@ -630,12 +630,12 @@ static ManagedValue emitBuiltinReinterpretCast(SILGenFunction &gen,
   auto &fromTL = gen.getTypeLowering(substitutions[0].getReplacement());
   auto &toTL = gen.getTypeLowering(substitutions[1].getReplacement());
   
-  // If casting between address-only types, cast the address.
-  if (!fromTL.isLoadable() || !toTL.isLoadable()) {
+  // If casting between address types, cast the address.
+  if (fromTL.isAddress() || toTL.isAddress()) {
     SILValue fromAddr;
 
-    // If the from value is loadable, move it to a buffer.
-    if (fromTL.isLoadable()) {
+    // If the from value is not an address, move it to a buffer.
+    if (!fromTL.isAddress()) {
       fromAddr = gen.emitTemporaryAllocation(loc, args[0].getValue()->getType());
       fromTL.emitStore(gen.B, loc, args[0].getValue(), fromAddr,
                        StoreOwnershipQualifier::Init);
@@ -647,7 +647,7 @@ static ManagedValue emitBuiltinReinterpretCast(SILGenFunction &gen,
     
     // Load and retain the destination value if it's loadable. Leave the cleanup
     // on the original value since we don't know anything about it's type.
-    if (toTL.isLoadable()) {
+    if (!toTL.isAddress()) {
       return gen.emitManagedLoadCopy(loc, toAddr, toTL);
     }
     // Leave the cleanup on the original value.
diff --git a/lib/SILGen/SILGenConvert.cpp b/lib/SILGen/SILGenConvert.cpp
@@ -462,13 +462,15 @@ SILGenFunction::emitPointerToPointer(SILLocation loc,
                                      SGFContext C) {
   auto converter = getASTContext().getConvertPointerToPointerArgument(nullptr);
 
-  // The generic function currently always requires indirection, but pointers
-  // are always loadable.
-  auto origBuf = emitTemporaryAllocation(loc, input.getType());
-  B.emitStoreValueOperation(loc, input.forward(*this), origBuf,
-                            StoreOwnershipQualifier::Init);
-  auto origValue = emitManagedBufferWithCleanup(origBuf);
-  
+  auto origValue = input;
+  if (silConv.useLoweredAddresses()) {
+    // The generic function currently always requires indirection, but pointers
+    // are always loadable.
+    auto origBuf = emitTemporaryAllocation(loc, input.getType());
+    B.emitStoreValueOperation(loc, input.forward(*this), origBuf,
+                              StoreOwnershipQualifier::Init);
+    origValue = emitManagedBufferWithCleanup(origBuf);
+  }
   // Invoke the conversion intrinsic to convert to the destination type.
   auto *M = SGM.M.getSwiftModule();
   auto *proto = getPointerProtocol();
diff --git a/lib/SILGen/SILGenExpr.cpp b/lib/SILGen/SILGenExpr.cpp
@@ -66,7 +66,8 @@ ManagedValue SILGenFunction::emitManagedRetain(SILLocation loc,
   if (v->getType().isObject() &&
       v.getOwnershipKind() == ValueOwnershipKind::Trivial)
     return ManagedValue::forUnmanaged(v);
-  assert(!lowering.isAddressOnly() && "cannot retain an unloadable type");
+  assert((!lowering.isAddressOnly() || !silConv.useLoweredAddresses()) &&
+         "cannot retain an unloadable type");
 
   v = lowering.emitCopyValue(B, loc, v);
   return emitManagedRValueWithCleanup(v, lowering);
diff --git a/test/SILGen/opaque_values_silgen.swift b/test/SILGen/opaque_values_silgen.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -enable-sil-opaque-values -emit-sorted-sil -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s
+// RUN: %target-swift-frontend -enable-sil-opaque-values -emit-sorted-sil -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-runtime
 
 // UNSUPPORTED: resilient_stdlib
 
@@ -721,7 +721,7 @@ func s340_______captureBox() {
   var mutableAddressOnly: EmptyP = AddressOnlyStruct()
 
   func captureEverything() {
-    s100_________identity((mutableAddressOnly))
+    _ = s100_________identity((mutableAddressOnly))
   }
 
   captureEverything()
@@ -790,6 +790,7 @@ func s350_______addrOnlyIf(x: Bool) -> EmptyP {
 func s360________guardEnum<T>(_ e: IndirectEnum<T>) {
   do {
     guard case .Node(let x) = e else { return }
+    _ = x
   }
 }
 
@@ -819,6 +820,7 @@ func s370_____optToOptCast<T>(_ x : T!) -> T? {
 // CHECK-LABEL: } // end sil function '_T020opaque_values_silgen21s380___contextualInitySiSgF'
 func s380___contextualInit(_ a : Int?) {
   var x: Int! = a
+  _ = x
 }
 
 // Tests opaque call result types
@@ -842,6 +844,7 @@ func s380___contextualInit(_ a : Int?) {
 // CHECK-LABEL: } // end sil function '_T020opaque_values_silgen21s390___addrCallResultyxycSglF'
 func s390___addrCallResult<T>(_ f: (() -> T)?) {
   var x = f?()
+  _ = x
 }
 
 // Tests reabstraction / partial apply of protocols under opaque value mode
@@ -956,6 +959,50 @@ func s440__cleanupEmission<T>(_ x: T) {
   _ = x2
 }
 
+// Test SILGenBuilder.loadCopy().
+// ---
+// CHECK-LABEL: sil hidden @_T020opaque_values_silgen21s450__________lastValxSayxGd_tlF : $@convention(thin) <T> (@owned Array<T>) -> @out T
+// CHECK: [[LOAD:%.*]] = load [copy] %34 : $*T
+// CHECK: return [[LOAD]] : $T
+// CHECK-LABEL: } // end sil function '_T020opaque_values_silgen21s450__________lastValxSayxGd_tlF'
+func s450__________lastVal<T>(_ rest: T...) -> T {
+  var minValue: T
+  for value in rest {
+    minValue = value
+  }
+  return minValue
+}
+
+// Test SILGenFunction::emitPointerToPointer.
+// ---
+// CHECK-LABEL: sil hidden @_T020opaque_values_silgen21s460______________fooSRyxGSPyxG1p_tlF : $@convention(thin) <Element> (UnsafePointer<Element>) -> UnsafeBufferPointer<Element> {
+// CHECK: [[F:%.*]] = function_ref @_T0s017_convertPointerToB8Argumentq_xs01_B0RzsABR_r0_lF : $@convention(thin) <τ_0_0, τ_0_1 where τ_0_0 : _Pointer, τ_0_1 : _Pointer> (@in τ_0_0) -> @out τ_0_1
+// CHECK: apply [[F]]<UnsafePointer<Element>, UnsafePointer<Element>>(%0) : $@convention(thin) <τ_0_0, τ_0_1 where τ_0_0 : _Pointer, τ_0_1 : _Pointer> (@in τ_0_0) -> @out τ_0_1
+// CHECK-LABEL: } // end sil function '_T020opaque_values_silgen21s460______________fooSRyxGSPyxG1p_tlF'
+func s460______________foo<Element>(p: UnsafePointer<Element>) -> UnsafeBufferPointer<Element> {
+  return UnsafeBufferPointer(start: p, count: 1)
+}
+
+// Test emitNativeToCBridgedNonoptionalValue
+// ---
+// CHECK-objc-LABEL: sil hidden @_T020opaque_values_silgen21s470________nativeToCyXlyp7fromAny_tF : $@convention(thin) (@in Any) -> @owned AnyObject {
+// CHECK-objc bb0(%0 : $Any):
+// CHECK-objc [[BORROW:%.*]] = begin_borrow %0 : $Any
+// CHECK-objc [[SRC:%.*]] = copy_value [[BORROW]] : $Any
+// CHECK-objc [[OPEN:%.*]] = open_existential_opaque [[SRC]] : $Any to $@opened
+// CHECK-objc [[COPY:%.*]] = copy_value [[OPEN]] : $@opened
+// CHECK-objc [[F:%.*]] = function_ref @_T0s27_bridgeAnythingToObjectiveCyXlxlF : $@convention(thin) <τ_0_0> (@in τ_0_0) -> @owned AnyObject
+// CHECK-objc [[RET:%.*]] = apply [[F]]<@opened("{{.*}}") Any>([[COPY]]) : $@convention(thin) <τ_0_0> (@in τ_0_0) -> @owned AnyObject
+// CHECK-objc destroy_value [[SRC]] : $Any
+// CHECK-objc destroy_value %0 : $Any
+// CHECK-objc return [[RET]] : $AnyObject
+// CHECK-objc-LABEL: } // end sil function '_T020opaque_values_silgen21s470________nativeToCyXlyp7fromAny_tF'
+#if _runtime(_ObjC)
+func s470________nativeToC(fromAny any: Any) -> AnyObject {
+  return any as AnyObject
+}
+#endif
+
 // Tests conditional value casts and correspondingly generated reabstraction thunk, with <T> types
 // ---
 // CHECK-LABEL: sil hidden @_T020opaque_values_silgen21s999_____condTFromAnyyyp_xtlF : $@convention(thin) <T> (@in Any, @in T) -> () {
@@ -971,7 +1018,7 @@ func s440__cleanupEmission<T>(_ x: T) {
 // CHECK-LABEL: } // end sil function '_T020opaque_values_silgen21s999_____condTFromAnyyyp_xtlF'
 func s999_____condTFromAny<T>(_ x: Any, _ y: T) {
   if let f = x as? (Int, T) -> (Int, T) {
-    f(42, y)
+    _ = f(42, y)
   }
 }
 
diff --git a/test/SILGen/opaque_values_silgen_lib.swift b/test/SILGen/opaque_values_silgen_lib.swift
@@ -25,6 +25,40 @@ func s010______PAndS_cases() {
   _ = PAndSEnum.A
 }
 
+// Test emitBuiltinReinterpretCast.
+// ---
+// CHECK-LABEL: sil hidden @_T0s21s020__________bitCastq_x_q_m2totr0_lF : $@convention(thin) <T, U> (@in T, @thick U.Type) -> @out U {
+// CHECK: [[BORROW:%.*]] = begin_borrow %0 : $T
+// CHECK: [[COPY:%.*]] = copy_value [[BORROW]] : $T
+// CHECK: [[CAST:%.*]] = unchecked_bitwise_cast [[COPY]] : $T to $U
+// CHECK: [[RET:%.*]] = copy_value [[CAST]] : $U
+// CHECK: destroy_value [[COPY]] : $T
+// CHECK: return [[RET]] : $U
+// CHECK-LABEL: } // end sil function '_T0s21s020__________bitCastq_x_q_m2totr0_lF'
+func s020__________bitCast<T, U>(_ x: T, to type: U.Type) -> U {
+  return Builtin.reinterpretCast(x)
+}
+
+// Test emitBuiltinCastReference
+// ---
+// CHECK-LABEL: sil hidden @_T0s21s030__________refCastq_x_q_m2totr0_lF : $@convention(thin) <T, U> (@in T, @thick U.Type) -> @out U {
+// CHECK: bb0(%0 : $T, %1 : $@thick U.Type):
+// CHECK: [[BORROW:%.*]] = begin_borrow %0 : $T
+// CHECK: [[COPY:%.*]] = copy_value [[BORROW]] : $T
+// CHECK: [[SRC:%.*]] = alloc_stack $T
+// CHECK: store [[COPY]] to [init] [[SRC]] : $*T
+// CHECK: [[DEST:%.*]] = alloc_stack $U
+// CHECK: unchecked_ref_cast_addr  T in [[SRC]] : $*T to U in [[DEST]] : $*U
+// CHECK: [[LOAD:%.*]] = load [take] [[DEST]] : $*U
+// CHECK: dealloc_stack [[DEST]] : $*U
+// CHECK: dealloc_stack [[SRC]] : $*T
+// CHECK: destroy_value %0 : $T
+// CHECK: return [[LOAD]] : $U
+// CHECK-LABEL: } // end sil function '_T0s21s030__________refCastq_x_q_m2totr0_lF'
+func s030__________refCast<T, U>(_ x: T, to: U.Type) -> U {
+  return Builtin.castReference(x)
+}
+
 // Init of Empty protocol + Builtin.NativeObject enum (including opaque tuples as a return value)
 // ---
 // CHECK-LABEL: sil shared [transparent] @_T0s9PAndSEnumO1AABs6EmptyP_p_SStcABmF : $@convention(method) (@in EmptyP, @owned String, @thin PAndSEnum.Type) -> @out PAndSEnum {
