Ensure we emit strong_release only for scalar values inside emitDestroyOperation (#74965)

asl · web-flow · commit 080a82ba5f81 · 2024-07-04T20:52:10.000-07:00
diff --git a/lib/SILOptimizer/Utils/InstOptUtils.cpp b/lib/SILOptimizer/Utils/InstOptUtils.cpp
@@ -1008,7 +1008,7 @@ void swift::emitDestroyOperation(SILBuilder &builder, SILLocation loc,
     return;
   }
 
-  if (operand->getType().hasReferenceSemantics()) {
+  if (operand->getType().isReferenceCounted(builder.getModule())) {
     auto u = builder.emitStrongRelease(loc, operand);
     if (u.isNull())
       return;
diff --git a/test/AutoDiff/compiler_crashers_fixed/issue-62608-conflicting-debug-info.swift b/test/AutoDiff/compiler_crashers_fixed/issue-62608-conflicting-debug-info.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -emit-sil -O -g %s | %FileCheck %s
+// RUN: %target-swift-frontend -sil-verify-all -emit-sil -O -g %s | %FileCheck %s
 
 // REQUIRES: swift_in_compiler
 

Original file line number	Diff line number	Diff line change
`@@ -1008,7 +1008,7 @@ void swift::emitDestroyOperation(SILBuilder &builder, SILLocation loc,`
`1008`	`1008`	`return;`
`1009`	`1009`	`}`
`1010`	`1010`
`1011`		`- if (operand->getType().hasReferenceSemantics()) {`
	`1011`	`+ if (operand->getType().isReferenceCounted(builder.getModule())) {`
`1012`	`1012`	`auto u = builder.emitStrongRelease(loc, operand);`
`1013`	`1013`	`if (u.isNull())`
`1014`	`1014`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-swift-frontend -emit-sil -O -g %s \| %FileCheck %s`
	`1`	`+// RUN: %target-swift-frontend -sil-verify-all -emit-sil -O -g %s \| %FileCheck %s`
`2`	`2`
`3`	`3`	`// REQUIRES: swift_in_compiler`
`4`	`4`