Merge pull request #69634 from eeckstein/fix-perf-diags

PerformanceDiagnostics: correctly handle functions with multiple throws

Author: swift-ci

lib/SILOptimizer/Mandatory/PerformanceDiagnostics.cpp

@@ -170,6 +170,12 @@ bool PerformanceDiagnostics::visitFunction(SILFunction *function,
     if (isa<ThrowInst>(block.getTerminator()))
       continue;
 
+    // If a function has multiple throws, all throw-path branch to the single throw-block.
+    if (SILBasicBlock *succ = block.getSingleSuccessorBlock()) {
+      if (isa<ThrowInst>(succ->getTerminator()))
+        continue;
+    }
+
     if (!neBlocks.isNonErrorHandling(&block))
       continue;
 

test/SILOptimizer/performance-annotations.swift

@@ -92,6 +92,7 @@ func testMemoryLayout() -> Int {
 }
 
 class MyError : Error {}
+class MyError2 : Error {}
 
 @_noLocks
 func errorExistential(_ b: Bool) throws -> Int {
@@ -101,6 +102,17 @@ func errorExistential(_ b: Bool) throws -> Int {
   throw MyError()
 }
 
+@_noLocks
+func multipleThrows(_ b1: Bool, _ b2: Bool) throws -> Int {
+  if b1 {
+    throw MyError()
+  }
+  if b2 {
+    throw MyError2()
+  }
+  return 28
+}
+
 @_noLocks
 func testCatch(_ b: Bool) throws -> Int? {
   do {