Merge pull request #69654 from DougGregor/throw-addr-fixes

[Typed throws] Handle `throw_addr` in the same places as `throw`.

Author: DougGregor

include/swift/SIL/ApplySite.h

@@ -746,7 +746,7 @@ class FullApplySite : public ApplySite {
   bool isIndirectErrorResultOperand(const Operand &op) const {
     return isArgumentOperand(op)
       && (getCalleeArgIndex(op) >= getNumIndirectSILResults())
-      && (getCalleeArgIndex(op) < getNumIndirectSILErrorResults());
+      && (getCalleeArgIndex(op) < getNumIndirectSILResults() + getNumIndirectSILErrorResults());
   }
 
   static FullApplySite getFromOpaqueValue(void *p) { return FullApplySite(p); }

include/swift/SIL/SILFunction.h

@@ -1403,7 +1403,7 @@ class SILFunction
     return std::find_if(begin(), end(),
                         [](const SILBasicBlock &BB) -> bool {
                           const TermInst *TI = BB.getTerminator();
-                          return isa<ThrowInst>(TI);
+                          return isa<ThrowInst>(TI) || isa<ThrowAddrInst>(TI);
                         });
   }
 
@@ -1413,7 +1413,7 @@ class SILFunction
     return std::find_if(begin(), end(),
                         [](const SILBasicBlock &BB) -> bool {
                           const TermInst *TI = BB.getTerminator();
-                          return isa<ThrowInst>(TI);
+                          return isa<ThrowInst>(TI) || isa<ThrowAddrInst>(TI);
                         });
   }
 

include/swift/SILOptimizer/Analysis/EpilogueARCAnalysis.h

@@ -99,7 +99,8 @@ class EpilogueARCContext {
       return BB->getTerminator()->isFunctionExiting();
 
     return BB->getTerminator()->isFunctionExiting() &&
-           BB->getTerminator()->getTermKind() != TermKind::ThrowInst;
+           BB->getTerminator()->getTermKind() != TermKind::ThrowInst &&
+           BB->getTerminator()->getTermKind() != TermKind::ThrowAddrInst;
   }
 
   /// Return true if this is a function exit block.

include/swift/SILOptimizer/Utils/PerformanceInlinerUtils.h

@@ -456,7 +456,8 @@ class ShortestPathAnalysis {
 
       if (isa<ReturnInst>(BB.getTerminator()))
         BBInfo->getDistances(0).DistToExit = Length;
-      else if (isa<ThrowInst>(BB.getTerminator()))
+      else if (isa<ThrowInst>(BB.getTerminator()) ||
+               isa<ThrowAddrInst>(BB.getTerminator()))
         BBInfo->getDistances(0).DistToExit = Length + ColdBlockLength;
     }
     // Compute the distances for all loops in the function.

lib/SIL/IR/SILInstruction.cpp

@@ -1406,7 +1406,7 @@ bool SILInstruction::isTriviallyDuplicatable() const {
     if (MI->getMember().isForeign)
       return false;
   }
-  if (isa<ThrowInst>(this))
+  if (isa<ThrowInst>(this) || isa<ThrowAddrInst>(this))
     return false;
 
   // BeginAccess defines the access scope entry point. All associated EndAccess

lib/SIL/Verifier/SILVerifier.cpp

@@ -6265,7 +6265,8 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {
       return true;
     else if (isa<ReturnInst>(StartBlock->getTerminator()))
       return false;
-    else if (isa<ThrowInst>(StartBlock->getTerminator()))
+    else if (isa<ThrowInst>(StartBlock->getTerminator()) ||
+             isa<ThrowAddrInst>(StartBlock->getTerminator()))
       return false;
 
     // Recursively check all successors.

lib/SILOptimizer/Transforms/ARCCodeMotion.cpp

@@ -330,8 +330,8 @@ class RetainCodeMotionContext : public CodeMotionContext {
     // end, this function is called many times.
     //
     // These terminator instructions block.
-    if (isa<ReturnInst>(II) || isa<ThrowInst>(II) || isa<UnwindInst>(II) ||
-        isa<UnreachableInst>(II))
+    if (isa<ReturnInst>(II) || isa<ThrowInst>(II) || isa<ThrowAddrInst>(II) ||
+        isa<UnwindInst>(II) || isa<UnreachableInst>(II))
       return true;
     // Identical RC root blocks code motion, we will be able to move this retain
     // further once we move the blocking retain.

lib/SILOptimizer/Utils/LoopUtils.cpp

@@ -275,7 +275,7 @@ bool swift::canDuplicateLoopInstruction(SILLoop *L, SILInstruction *I) {
     return true;
   }
 
-  if (isa<ThrowInst>(I))
+  if (isa<ThrowInst>(I) || isa<ThrowAddrInst>(I))
     return false;
 
   // The entire access must be within the loop.