Revert "Optimizer: make salvageDebugInfo optional when deleting instructions"

This reverts commit 85a49dc.

Author: hamishknight

SwiftCompilerSources/Sources/Optimizer/PassManager/Context.swift

@@ -140,10 +140,7 @@ extension MutatingContext {
     return _bridged.createBlockAfter(block.bridged).block
   }
 
-  /// Removes and deletes `instruction`.
-  /// If `salvageDebugInfo` is true, compensating `debug_value` instructions are inserted for certain
-  /// kind of instructions.
-  func erase(instruction: Instruction, salvageDebugInfo: Bool = true) {
+  func erase(instruction: Instruction) {
     if !instruction.isInStaticInitializer {
       verifyIsTransforming(function: instruction.parentFunction)
     }
@@ -155,7 +152,7 @@ extension MutatingContext {
     }
     notifyInstructionsChanged()
 
-    _bridged.eraseInstruction(instruction.bridged, salvageDebugInfo)
+    _bridged.eraseInstruction(instruction.bridged)
   }
 
   func erase(instructionIncludingAllUsers inst: Instruction) {
@@ -167,9 +164,7 @@ extension MutatingContext {
         erase(instructionIncludingAllUsers: use.instruction)
       }
     }
-    // We rely that after deleting the instruction its operands have no users.
-    // Therefore `salvageDebugInfo` must be turned off because we cannot insert debug_value instructions.
-    erase(instruction: inst, salvageDebugInfo: false)
+    erase(instruction: inst)
   }
 
   func erase<S: Sequence>(instructions: S) where S.Element: Instruction {

include/swift/SIL/SILInstructionWorklist.h

@@ -302,12 +302,9 @@ class SILInstructionWorklist : SILInstructionWorklistBase {
   // method to delete the given instruction.
   void eraseInstFromFunction(SILInstruction &instruction,
                              SILBasicBlock::iterator &iterator,
-                             bool addOperandsToWorklist = true,
-                             bool salvageDebugInfo = true) {
-    if (salvageDebugInfo) {
-      // Try to salvage debug info first.
-      swift::salvageDebugInfo(&instruction);
-    }
+                             bool addOperandsToWorklist = true) {
+    // Try to salvage debug info first.
+    swift::salvageDebugInfo(&instruction);
     // Then delete old debug users.
     for (auto result : instruction.getResults()) {
       while (!result->use_empty()) {
@@ -326,11 +323,9 @@ class SILInstructionWorklist : SILInstructionWorklistBase {
   }
 
   void eraseInstFromFunction(SILInstruction &instruction,
-                             bool addOperandsToWorklist = true,
-                             bool salvageDebugInfo = true) {
+                             bool addOperandsToWorklist = true) {
     SILBasicBlock::iterator nullIter;
-    return eraseInstFromFunction(instruction, nullIter, addOperandsToWorklist,
-                                 salvageDebugInfo);
+    return eraseInstFromFunction(instruction, nullIter, addOperandsToWorklist);
   }
 
   void eraseSingleInstFromFunction(SILInstruction &instruction,

include/swift/SILOptimizer/OptimizerBridging.h

@@ -234,7 +234,7 @@ struct BridgedPassContext {
   SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedBasicBlock splitBlockAfter(BridgedInstruction bridgedInst) const;
   SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedBasicBlock createBlockAfter(BridgedBasicBlock bridgedBlock) const;
   SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedBasicBlock appendBlock(BridgedFunction bridgedFunction) const;
-  BRIDGED_INLINE void eraseInstruction(BridgedInstruction inst, bool salvageDebugInfo) const;
+  BRIDGED_INLINE void eraseInstruction(BridgedInstruction inst) const;
   BRIDGED_INLINE void eraseBlock(BridgedBasicBlock block) const;
   static BRIDGED_INLINE void moveInstructionBefore(BridgedInstruction inst, BridgedInstruction beforeInst);
   bool tryOptimizeApplyOfPartialApply(BridgedInstruction closure) const;

include/swift/SILOptimizer/OptimizerBridgingImpl.h

@@ -27,7 +27,6 @@
 #include "swift/SILOptimizer/OptimizerBridging.h"
 #include "swift/SILOptimizer/PassManager/PassManager.h"
 #include "swift/SILOptimizer/Utils/InstOptUtils.h"
-#include "swift/SILOptimizer/Utils/DebugOptUtils.h"
 
 SWIFT_BEGIN_NULLABILITY_ANNOTATIONS
 
@@ -254,8 +253,8 @@ BridgedBasicBlock BridgedPassContext::appendBlock(BridgedFunction bridgedFunctio
   return {bridgedFunction.getFunction()->createBasicBlock()};
 }
 
-void BridgedPassContext::eraseInstruction(BridgedInstruction inst, bool salvageDebugInfo) const {
-  invocation->eraseInstruction(inst.unbridged(), salvageDebugInfo);
+void BridgedPassContext::eraseInstruction(BridgedInstruction inst) const {
+  invocation->eraseInstruction(inst.unbridged());
 }
 
 void BridgedPassContext::eraseBlock(BridgedBasicBlock block) const {

include/swift/SILOptimizer/PassManager/PassManager.h

@@ -138,7 +138,7 @@ class SwiftPassInvocation {
   void freeOperandSet(OperandSet *set);
 
   /// The top-level API to erase an instruction, called from the Swift pass.
-  void eraseInstruction(SILInstruction *inst, bool salvageDebugInfo);
+  void eraseInstruction(SILInstruction *inst);
 
   /// Called by the pass when changes are made to the SIL.
   void notifyChanges(SILAnalysis::InvalidationKind invalidationKind);

lib/SILOptimizer/SILCombiner/SILCombine.cpp

@@ -694,13 +694,11 @@ SILTransform *swift::createSILCombine() {
 //                          SwiftFunctionPassContext
 //===----------------------------------------------------------------------===//
 
-void SwiftPassInvocation::eraseInstruction(SILInstruction *inst, bool salvageDebugInfo) {
+void SwiftPassInvocation::eraseInstruction(SILInstruction *inst) {
   if (silCombiner) {
-    silCombiner->eraseInstFromFunction(*inst, /*addOperandsToWorklist=*/ true, salvageDebugInfo);
+    silCombiner->eraseInstFromFunction(*inst);
   } else {
-    if (salvageDebugInfo) {
-      swift::salvageDebugInfo(inst);
-    }
+    swift::salvageDebugInfo(inst);
     if (inst->isStaticInitializerInst()) {
       inst->getParent()->erase(inst, *getPassManager()->getModule());
     } else {

lib/SILOptimizer/SILCombiner/SILCombiner.h

@@ -220,10 +220,8 @@ class SILCombiner :
   // by this method.
   SILInstruction *eraseInstFromFunction(SILInstruction &I,
                                         SILBasicBlock::iterator &InstIter,
-                                        bool AddOperandsToWorklist = true,
-                                        bool salvageDebugInfo = true) {
-    Worklist.eraseInstFromFunction(I, InstIter, AddOperandsToWorklist,
-                                   salvageDebugInfo);
+                                        bool AddOperandsToWorklist = true) {
+    Worklist.eraseInstFromFunction(I, InstIter, AddOperandsToWorklist);
     MadeChange = true;
     // Dummy return, so the caller doesn't need to explicitly return nullptr.
     return nullptr;
@@ -234,10 +232,9 @@ class SILCombiner :
   void eraseInstIncludingUsers(SILInstruction *inst);
 
   SILInstruction *eraseInstFromFunction(SILInstruction &I,
-                                        bool AddOperandsToWorklist = true,
-                                        bool salvageDebugInfo = true) {
+                                        bool AddOperandsToWorklist = true) {
     SILBasicBlock::iterator nullIter;
-    return eraseInstFromFunction(I, nullIter, AddOperandsToWorklist, salvageDebugInfo);
+    return eraseInstFromFunction(I, nullIter, AddOperandsToWorklist);
   }
 
   void addInitialGroup(ArrayRef<SILInstruction *> List) {