SemanticARCOpts: remove the BorrowScope optimization because this is now covered by SimplifyBeginBorrow

eeckstein · eeckstein · commit 3038853fc1d9 · 2025-12-17T19:04:21.000+01:00
diff --git a/lib/SILOptimizer/SemanticARC/BorrowScopeOpts.cpp b/lib/SILOptimizer/SemanticARC/BorrowScopeOpts.cpp
diff --git a/lib/SILOptimizer/SemanticARC/CMakeLists.txt b/lib/SILOptimizer/SemanticARC/CMakeLists.txt
@@ -1,7 +1,6 @@
 target_sources(swiftSILOptimizer PRIVATE
   SemanticARCOpts.cpp
   OwnershipLiveRange.cpp
-  BorrowScopeOpts.cpp
   CopyValueOpts.cpp
   OwnedToGuaranteedPhiOpt.cpp
   Context.cpp
diff --git a/lib/SILOptimizer/SemanticARC/SemanticARCOptVisitor.h b/lib/SILOptimizer/SemanticARC/SemanticARCOptVisitor.h
@@ -142,7 +142,6 @@ struct LLVM_LIBRARY_VISIBILITY SemanticARCOptVisitor
   }
 
   bool visitCopyValueInst(CopyValueInst *cvi);
-  bool visitBeginBorrowInst(BeginBorrowInst *bbi);
   bool visitMoveValueInst(MoveValueInst *mvi);
   bool
   visitUncheckedOwnershipConversionInst(UncheckedOwnershipConversionInst *uoci);
diff --git a/lib/SILOptimizer/SemanticARC/SemanticARCOpts.cpp b/lib/SILOptimizer/SemanticARC/SemanticARCOpts.cpp
@@ -36,9 +36,6 @@ static llvm::cl::list<ARCTransformKind> TransformsToPerform(
         clEnumValN(ARCTransformKind::LoadCopyToLoadBorrowPeephole,
                    "sil-semantic-arc-peepholes-loadcopy-to-loadborrow",
                    "Perform the load [copy] to load_borrow peephole"),
-        clEnumValN(ARCTransformKind::RedundantBorrowScopeElimPeephole,
-                   "sil-semantic-arc-peepholes-redundant-borrowscope-elim",
-                   "Perform the redundant borrow scope elimination peephole"),
         clEnumValN(ARCTransformKind::RedundantCopyValueElimPeephole,
                    "sil-semantic-arc-peepholes-redundant-copyvalue-elim",
                    "Perform the redundant copy_value peephole"),
@@ -87,7 +84,6 @@ struct SemanticARCOpts : SILFunctionTransform {
       switch (transform) {
       case ARCTransformKind::LifetimeJoiningPeephole:
       case ARCTransformKind::RedundantCopyValueElimPeephole:
-      case ARCTransformKind::RedundantBorrowScopeElimPeephole:
       case ARCTransformKind::LoadCopyToLoadBorrowPeephole:
       case ARCTransformKind::AllPeepholes:
       case ARCTransformKind::OwnershipConversionElimPeephole:
diff --git a/lib/SILOptimizer/SemanticARC/SemanticARCOpts.h b/lib/SILOptimizer/SemanticARC/SemanticARCOpts.h
@@ -25,7 +25,6 @@ enum class ARCTransformKind : uint64_t {
   Invalid = 0,
   OwnedToGuaranteedPhi = 0x1,
   LoadCopyToLoadBorrowPeephole = 0x2,
-  RedundantBorrowScopeElimPeephole = 0x4,
   // TODO: Split RedundantCopyValueElimPeephole into more granular categories
   // such as dead live range, guaranteed copy_value opt, etc.
   RedundantCopyValueElimPeephole = 0x8,
@@ -34,7 +33,6 @@ enum class ARCTransformKind : uint64_t {
   RedundantMoveValueElim = 0x40,
 
   AllPeepholes = LoadCopyToLoadBorrowPeephole |
-                 RedundantBorrowScopeElimPeephole |
                  RedundantCopyValueElimPeephole | LifetimeJoiningPeephole |
                  OwnershipConversionElimPeephole,
   All = AllPeepholes | OwnedToGuaranteedPhi | RedundantMoveValueElim,
diff --git a/test/ClangImporter/serialization-sil.swift b/test/ClangImporter/serialization-sil.swift
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-swift-frontend -enable-copy-propagation=requested-passes-only -enable-lexical-lifetimes=false -Xllvm -sil-disable-pass=Simplification -emit-module-path %t/Test.swiftmodule -Xllvm -sil-print-types -emit-sil -o /dev/null -module-name Test %s -sdk "" -import-objc-header %S/Inputs/serialization-sil.h
+// RUN: %target-swift-frontend -enable-copy-propagation=requested-passes-only -enable-lexical-lifetimes=false -Xllvm -simplify-instruction=begin_borrow -emit-module-path %t/Test.swiftmodule -Xllvm -sil-print-types -emit-sil -o /dev/null -module-name Test %s -sdk "" -import-objc-header %S/Inputs/serialization-sil.h
 // RUN: %target-sil-func-extractor -sil-print-types %t/Test.swiftmodule -sil-print-debuginfo  -func='$s4Test16testPartialApplyyySoAA_pF' -o - | %FileCheck %s
 
 // REQUIRES: objc_interop
diff --git a/test/SILOptimizer/semantic-arc-opts-canonical.sil b/test/SILOptimizer/semantic-arc-opts-canonical.sil
@@ -1,4 +1,4 @@
-// RUN: %target-sil-opt -sil-print-types -module-name Swift -enable-sil-verify-all -semantic-arc-opts %s | %FileCheck %s
+// RUN: %target-sil-opt -sil-print-types -module-name Swift -enable-sil-verify-all -semantic-arc-opts -onone-simplification -simplify-instruction=begin_borrow %s | %FileCheck %s
 
 // REQUIRES: swift_in_compiler
 
diff --git a/test/SILOptimizer/semantic-arc-opts.sil b/test/SILOptimizer/semantic-arc-opts.sil
@@ -1,4 +1,4 @@
-// RUN: %target-sil-opt -sil-print-types -module-name Swift -enable-sil-verify-all -semantic-arc-opts %s | %FileCheck %s
+// RUN: %target-sil-opt -sil-print-types -module-name Swift -enable-sil-verify-all -semantic-arc-opts -onone-simplification -simplify-instruction=begin_borrow %s | %FileCheck %s
 
 sil_stage raw
 

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,6 @@ struct LLVM_LIBRARY_VISIBILITY SemanticARCOptVisitor`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`bool visitCopyValueInst(CopyValueInst *cvi);`
`145`		`- bool visitBeginBorrowInst(BeginBorrowInst *bbi);`
`146`	`145`	`bool visitMoveValueInst(MoveValueInst *mvi);`
`147`	`146`	`bool`
`148`	`147`	`visitUncheckedOwnershipConversionInst(UncheckedOwnershipConversionInst *uoci);`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-sil-opt -sil-print-types -module-name Swift -enable-sil-verify-all -semantic-arc-opts %s \| %FileCheck %s`
	`1`	`+// RUN: %target-sil-opt -sil-print-types -module-name Swift -enable-sil-verify-all -semantic-arc-opts -onone-simplification -simplify-instruction=begin_borrow %s \| %FileCheck %s`
`2`	`2`
`3`	`3`	`// REQUIRES: swift_in_compiler`
`4`	`4`