---

yaml
---
r: 318335
b: refs/heads/master-rebranch
c: eeefad1
h: refs/heads/master
i:
  318333: 2070708
  318331: ef53c5f
  318327: 075c698
  318319: bfd6595
  318303: 1ee4ee6
  318271: 8a0ff51
  318207: aaffd5a

Author: swift-ci

[refs]

@@ -1457,4 +1457,4 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
 refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
 refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
-refs/heads/master-rebranch: 99595a9c30c9b25d41f1888fc21bb918901b7ea1
+refs/heads/master-rebranch: eeefad16d4dc379ae15950e28cf91a3db270be87

branches/master-rebranch/lib/SILOptimizer/Transforms/PerformanceInliner.cpp

@@ -891,7 +891,16 @@ bool SILPerformanceInliner::inlineCallsIntoFunction(SILFunction *Caller) {
     if (!Callee->shouldOptimize()) {
       continue;
     }
-    
+
+    // If we have a callee that doesn't have ownership, but the caller does have
+    // ownership... do not inline. The two modes are incompatible. Today this
+    // should only happen with transparent functions.
+    if (!Callee->hasOwnership() && Caller->hasOwnership()) {
+      assert(Caller->isTransparent() &&
+             "Should only happen with transparent functions");
+      continue;
+    }
+
     SmallVector<SILValue, 8> Args;
     for (const auto &Arg : AI.getArguments())
       Args.push_back(Arg);

branches/master-rebranch/test/SILOptimizer/devirt_ctors_ownership.sil

@@ -13,8 +13,8 @@ class ABC {
 
 
 // This is our c'tor.
-sil @_TFC4main3ABCcfMS0_FT1ySi_S0_ : $@convention(method) (Int64, @owned ABC) -> @owned ABC {
-bb0(%0 : $Int64, %1 : $ABC):
+sil [ossa] @_TFC4main3ABCcfMS0_FT1ySi_S0_ : $@convention(method) (Int64, @owned ABC) -> @owned ABC {
+bb0(%0 : $Int64, %1 : @owned $ABC):
   return %1 : $ABC                                // id: %38
 }
 

branches/master-rebranch/test/SILOptimizer/performance_inliner_ownership.sil

@@ -0,0 +1,41 @@
+// RUN: %target-sil-opt -enable-sil-verify-all %s -inline | %FileCheck %s
+
+sil_stage canonical
+
+import Builtin
+import Swift
+
+// Make sure that we do not try to inline non-ossa functions into ossa
+// functions. This can only occur with transparent functions today.
+
+// We do not need a filecheck here since if we inline, the strong_release will
+// hit assertions since strong_release is a non-ossa instruction that can never
+// be in an ossa function.
+sil [transparent] [ossa] @ossa_transparent_caller : $@convention(thin) (@owned Builtin.NativeObject) -> () {
+bb0(%0 : @owned $Builtin.NativeObject):
+  %1 = function_ref @non_ossa_callee : $@convention(thin) (@owned Builtin.NativeObject) -> ()
+  apply %1(%0) : $@convention(thin) (@owned Builtin.NativeObject) -> ()
+  %9999 = tuple()
+  return %9999 : $()
+}
+
+// We put in this filecheck test to make sure that without the [ossa] bit, we
+// /would/ inline.
+//
+// CHECK-LABEL: sil [transparent]  @non_ossa_caller : $@convention(thin) (@owned Builtin.NativeObject) -> () {
+// CHECK: strong_release
+// CHECK: } // end sil function 'non_ossa_caller'
+sil [transparent] @non_ossa_caller : $@convention(thin) (@owned Builtin.NativeObject) -> () {
+bb0(%0 : $Builtin.NativeObject):
+  %1 = function_ref @non_ossa_callee : $@convention(thin) (@owned Builtin.NativeObject) -> ()
+  apply %1(%0) : $@convention(thin) (@owned Builtin.NativeObject) -> ()
+  %9999 = tuple()
+  return %9999 : $()
+}
+
+sil @non_ossa_callee : $@convention(thin) (@owned Builtin.NativeObject) -> () {
+bb0(%0 : $Builtin.NativeObject):
+  strong_release %0 : $Builtin.NativeObject
+  %9999 = tuple()
+  return %9999 : $()
+}