Merge pull request #35609 from meg-gupta/ossabugs3

Minor bug fixes in SILCombine, Canonicalization and LoadBorrowImmutabilityChecker

Author: meg-gupta

lib/SIL/Verifier/LoadBorrowImmutabilityChecker.cpp

@@ -97,6 +97,7 @@ bool GatherWritesVisitor::visitUse(Operand *op, AccessUseType useTy) {
   case SILInstructionKind::DeallocBoxInst:
   case SILInstructionKind::WitnessMethodInst:
   case SILInstructionKind::ExistentialMetatypeInst:
+  case SILInstructionKind::IsUniqueInst:
     return true;
 
   // Known writes...

lib/SILOptimizer/SILCombiner/SILCombinerCastVisitors.cpp

@@ -141,7 +141,7 @@ class SingleBlockOwnedForwardingInstFolder {
     if (!hasOneNonDebugUse(next))
       return false;
 
-    assert(getSingleNonDebugUser(rest.back()) == next);
+    assert(rest.empty() || getSingleNonDebugUser(rest.back()) == next);
     rest.push_back(next);
     return true;
   }

lib/SILOptimizer/Utils/CanonicalizeInstruction.cpp

@@ -26,6 +26,7 @@
 #include "swift/SIL/SILFunction.h"
 #include "swift/SIL/SILInstruction.h"
 #include "swift/SILOptimizer/Analysis/SimplifyInstruction.h"
+#include "swift/SILOptimizer/Utils/DebugOptUtils.h"
 #include "llvm/ADT/Statistic.h"
 #include "llvm/Support/Debug.h"
 
@@ -521,7 +522,7 @@ eliminateUnneededForwardingUnarySingleValueInst(SingleValueInstruction *inst,
   for (auto *use : getNonDebugUses(inst))
     if (!isa<DestroyValueInst>(use->getUser()))
       return next;
-  deleteAllDebugUses(inst);
+  deleteAllDebugUses(inst, pass.callbacks);
   SILValue op = inst->getOperand(0);
   inst->replaceAllUsesWith(op);
   pass.notifyHasNewUsers(op);

test/SIL/ownership-verifier/load_borrow_invalidation_test.sil

@@ -395,3 +395,17 @@ bb0(%0 : @owned $Builtin.NativeObject):
   %9999 = tuple()
   return %9999 : $()
 }
+
+struct Bool {
+  var _value: Builtin.Int1
+}
+
+sil [ossa] @test_withisunique : $@convention(method) <Element> (@inout Builtin.NativeObject) -> Bool {
+bb0(%0 : $*Builtin.NativeObject):
+  %1 = is_unique %0 : $*Builtin.NativeObject    
+  %2 = struct $Bool (%1 : $Builtin.Int1)        
+  %3 = load_borrow %0 : $*Builtin.NativeObject 
+  end_borrow %3 : $Builtin.NativeObject
+  return %2 : $Bool
+}
+ 

test/SILOptimizer/sil_combine_ossa.sil

@@ -48,6 +48,10 @@ struct MyInt {
   var value: Builtin.Int32
 }
 
+struct NativeObjectStruct {
+  var ele : Builtin.NativeObject
+}
+
 sil [global_init] @global_init_fun : $@convention(thin) () -> Builtin.RawPointer
 
 sil [ossa] @user : $@convention(thin) (@owned Builtin.NativeObject) -> ()
@@ -1373,18 +1377,33 @@ bb0(%0 : @owned $B):
 }
 
 // (upcast X2->X (ref-to-object-pointer-inst (object-pointer-to-ref-inst x) typeof(x))) -> x
-// CHECK-LABEL: sil [ossa] @upcast_unchecked_ref_cast_round_trip : $@convention(thin) (@owned E) -> @owned E {
+// CHECK-LABEL: sil [ossa] @upcast_unchecked_ref_cast_round_trip1 : $@convention(thin) (@owned E) -> @owned E {
 // CHECK-NOT: upcast
 // CHECK-NOT: unchecked_ref_cast
-// CHECK: } // end sil function 'upcast_unchecked_ref_cast_round_trip'
-sil [ossa] @upcast_unchecked_ref_cast_round_trip : $@convention(thin) (@owned E) -> @owned E {
+// CHECK: } // end sil function 'upcast_unchecked_ref_cast_round_trip1'
+sil [ossa] @upcast_unchecked_ref_cast_round_trip1 : $@convention(thin) (@owned E) -> @owned E {
 bb0(%0 : @owned $E):
   %1 = upcast %0 : $E to $B
   %2 = unchecked_ref_cast %1 : $B to $Builtin.NativeObject
   %3 = unchecked_ref_cast %2 : $Builtin.NativeObject to $E
   return %3 : $E
 }
 
+// CHECK-LABEL: sil [ossa] @upcast_unchecked_ref_cast_round_trip2 :
+// CHECK-NOT: upcast
+// CHECK-NOT: unchecked_ref_cast
+// CHECK-LABEL: } // end sil function 'upcast_unchecked_ref_cast_round_trip2'
+sil [ossa] @upcast_unchecked_ref_cast_round_trip2 : $@convention(method) (@owned E) -> () {
+bb0(%0 : @owned $E):
+  %1 = upcast %0 : $E to $B
+  debug_value %1 : $B
+  %2 = unchecked_ref_cast %1 : $B to $Builtin.NativeObject
+  %3 = struct $NativeObjectStruct (%2 : $Builtin.NativeObject)
+  destroy_value %3 : $NativeObjectStruct
+  %res = tuple ()
+  return %res : $()
+}
+
 // (load (upcast-addr %x)) -> (upcast-ref (load %x))
 //
 // CHECK-LABEL: sil [ossa] @load_upcast_addr_to_upcast_ref_load_canonicalization : $@convention(thin) (@inout E) -> @owned B {
@@ -4561,3 +4580,19 @@ bb1(%2 : @owned $FakeOptional<Builtin.NativeObject>):
   %9999 = tuple()
   return %9999 : $()
 }
+
+// CHECK-LABEL: sil [ossa] @test_useafterfree_debuginstdelete :
+// CHECK-NOT: upcast
+// CHECK-NOT: unchecked_ref_cast
+// CHECK-LABEL: } // end sil function 'test_useafterfree_debuginstdelete'
+sil [ossa] @test_useafterfree_debuginstdelete : $@convention(method) (@owned E) -> () {
+bb0(%0 : @owned $E):
+  %1 = upcast %0 : $E to $B
+  debug_value %1 : $B
+  %2 = unchecked_ref_cast %1 : $B to $Builtin.NativeObject
+  debug_value %2 : $Builtin.NativeObject
+  destroy_value %2 : $Builtin.NativeObject
+  %res = tuple ()
+  return %res : $()
+}
+