Merge pull request #74802 from meg-gupta/temprvalueedgecase

Allow TempRValueOpt of lexical alloc_stacks when base of copy source is @in_guaranteed

Author: meg-gupta

lib/SILOptimizer/Transforms/TempRValueElimination.cpp

@@ -528,7 +528,7 @@ void TempRValueOptPass::tryOptimizeCopyIntoTemp(CopyAddrInst *copyInst) {
     if (!storage.base)
       return;
     if (auto *arg = dyn_cast<SILFunctionArgument>(storage.base))
-      if (arg->getOwnershipKind() != OwnershipKind::Guaranteed)
+      if (!arg->getArgumentConvention().isGuaranteedConventionInCallee())
         return;
   }
 

test/SILOptimizer/assemblyvision_remark/cast_remarks_objc.swift

@@ -21,15 +21,13 @@ public func forcedCast2<NS, T>(_ ns: NS) -> T {
   let x = ns
   return x as! T  // expected-remark @:12 {{unconditional runtime cast of value with type 'NS' to 'T'}}
                   // expected-note @-4:34 {{of 'ns'}}
-                  // expected-note @-3:7 {{of 'x'}}
 }
 
 public func forcedCast3<NS, T>(_ ns: NS) -> T {
   // Make sure the colon info is right so that the arrow is under the a.
   var x = ns // expected-warning {{variable 'x' was never mutated}}
   return x as! T  // expected-remark @:12 {{unconditional runtime cast of value with type 'NS' to 'T'}}
                   // expected-note @-4:34 {{of 'ns'}}
-                  // expected-note @-3:7 {{of 'x'}}
 }
 
 public func forcedCast4<NS, T>(_ ns: NS, _ ns2: NS) -> T {
@@ -52,15 +50,13 @@ public func condCast2<NS, T>(_ ns: NS) -> T? {
   let x = ns
   return x as? T  // expected-remark @:12 {{conditional runtime cast of value with type 'NS' to 'T'}}
                   // expected-note @-4:32 {{of 'ns'}}
-                  // expected-note @-3:7 {{of 'x'}}
 }
 
 public func condCast3<NS, T>(_ ns: NS) -> T? {
   // Make sure the colon info is right so that the arrow is under the a.
   var x = ns // expected-warning {{variable 'x' was never mutated}}
   return x as? T  // expected-remark @:12 {{conditional runtime cast of value with type 'NS' to 'T'}}
                   // expected-note @-4:32 {{of 'ns'}}
-                  // expected-note @-3:7 {{of 'x'}}
 }
 
 public func condCast4<NS, T>(_ ns: NS, _ ns2: NS) -> T? {

test/SILOptimizer/temp_rvalue_opt_ossa.sil

@@ -1804,6 +1804,19 @@ entry(%instance : @guaranteed $OtherClass):
   return %retval : $()
 }
 
+// CHECK-LABEL: sil [ossa] @copy_addr__lexical_alloc_stack_temporary_in_guaranteed_function_arg : {{.*}} {
+// CHECK-NOT:     alloc_stack
+// CHECK-LABEL: } // end sil function 'copy_addr__lexical_alloc_stack_temporary_in_guaranteed_function_arg'
+sil [ossa] @copy_addr__lexical_alloc_stack_temporary_in_guaranteed_function_arg : $@convention(thin) (@in_guaranteed Klass) -> () {
+entry(%instance : $*Klass):
+  %addr = alloc_stack [lexical] $Klass
+  copy_addr %instance to [init] %addr : $*Klass
+  destroy_addr %addr : $*Klass
+  dealloc_stack %addr : $*Klass
+  %retval = tuple ()
+  return %retval : $()
+}
+
 // Lexical alloc_stacks can't be eliminated even if their source is a function
 // argument if that function argument is inout.
 // CHECK-LABEL: sil [ossa] @copy_addr__lexical_alloc_stack_temporary__inout_function_arg : {{.*}} {