---

yaml
---
r: 349344
b: refs/heads/master-next
c: 528a07a
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
-refs/heads/master-next: 010a765a49b9c611dc141909d3df2b86da47f992
+refs/heads/master-next: 528a07a261aef622f61ee434abc9df99115b4d17
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/lib/SILOptimizer/Mandatory/GuaranteedARCOpts.cpp

@@ -143,9 +143,9 @@ bool GuaranteedARCOptsVisitor::visitStrongReleaseInst(StrongReleaseInst *SRI) {
     auto *Inst = &*II;
     ++II;
 
-    if (auto *SRA = dyn_cast<StrongRetainInst>(Inst)) {
-      if (SRA->getOperand() == Operand) {
-        SRA->eraseFromParent();
+    if (isa<StrongRetainInst>(Inst) || isa<RetainValueInst>(Inst)) {
+      if (Inst->getOperand(0) == Operand) {
+        Inst->eraseFromParent();
         SRI->eraseFromParent();
         NumInstsEliminated += 2;
         return true;
@@ -198,9 +198,9 @@ bool GuaranteedARCOptsVisitor::visitReleaseValueInst(ReleaseValueInst *RVI) {
     auto *Inst = &*II;
     ++II;
 
-    if (auto *SRA = dyn_cast<RetainValueInst>(Inst)) {
-      if (SRA->getOperand() == Operand) {
-        SRA->eraseFromParent();
+    if (isa<RetainValueInst>(Inst) || isa<StrongRetainInst>(Inst)) {
+      if (Inst->getOperand(0) == Operand) {
+        Inst->eraseFromParent();
         RVI->eraseFromParent();
         NumInstsEliminated += 2;
         return true;

branches/master-next/test/SILOptimizer/guaranteed_arc_opts_qualified.sil

@@ -158,3 +158,27 @@ bb0(%0 : $C, %1 : $Builtin.Int32):
   %9999 = tuple()
   return %9999 : $()
 }
+
+// CHECK-LABEL: sil @mixed_test_1 : $@convention(thin) (Builtin.NativeObject, Builtin.NativeObject) -> () {
+// CHECK-NOT: retain
+// CHECK-NOT: release
+// CHECK: } // end sil function 'mixed_test_1'
+sil @mixed_test_1 : $@convention(thin) (Builtin.NativeObject, Builtin.NativeObject) -> () {
+bb0(%0 : $Builtin.NativeObject, %1 : $Builtin.NativeObject):
+  strong_retain %0 : $Builtin.NativeObject
+  release_value %0 : $Builtin.NativeObject
+  %9999 = tuple()
+  return %9999 : $()
+}
+
+// CHECK-LABEL: sil @mixed_test_2 : $@convention(thin) (Builtin.NativeObject, Builtin.NativeObject) -> () {
+// CHECK-NOT: retain
+// CHECK-NOT: release
+// CHECK: } // end sil function 'mixed_test_2'
+sil @mixed_test_2 : $@convention(thin) (Builtin.NativeObject, Builtin.NativeObject) -> () {
+bb0(%0 : $Builtin.NativeObject, %1 : $Builtin.NativeObject):
+  retain_value %0 : $Builtin.NativeObject
+  strong_release %0 : $Builtin.NativeObject
+  %9999 = tuple()
+  return %9999 : $()
+}