Remove potential for duplicate diagnosis on rethrows

Author: phausler

lib/Sema/TypeCheckEffects.cpp

@@ -528,6 +528,13 @@ class ApplyClassifier {
       }
 
       if (classifiedAsThrows) {
+        // multiple passes can occur, so ensure that any sub-expressions of this
+        // call are marked as throws to mimic the closure variant.
+        if (auto subExpr = dyn_cast<ApplyExpr>(E->getFn())) {
+          if (!subExpr->isThrowsSet()) {
+            subExpr->setThrows(true);
+          }
+        }
         return Classification::forRethrowingOnly(
           PotentialThrowReason::forRethrowsConformance(E), isAsync);
       }

test/Concurrency/async_sequence_syntax.swift

@@ -31,4 +31,27 @@ func missingAsyncInBlock<T : AsyncSequence>(_ seq: T) {
       for try await _ in seq { }
     } catch { }
   }
+}
+
+func doubleDiagCheckGeneric<T : AsyncSequence>(_ seq: T) async {
+  var it = seq.makeAsyncIterator()
+  // expected-note@+2{{call is to 'rethrows' function, but a conformance has a throwing witness}}
+  // expected-error@+1{{call can throw, but it is not marked with 'try' and the error is not handled}}
+  let _ = await it.next()
+}
+
+struct ThrowingAsyncSequence: AsyncSequence, AsyncIteratorProtocol {
+  typealias Element = Int
+  typealias AsyncIterator = Self
+  mutating func next() async throws -> Int? {
+    return nil
+  }
+
+  func makeAsyncIterator() -> Self { return self }
+}
+
+func doubleDiagCheckConcrete(_ seq: ThrowingAsyncSequence) async {
+  var it = seq.makeAsyncIterator()
+  // expected-error@+1{{call can throw, but it is not marked with 'try' and the error is not handled}}
+  let _ = await it.next()
 }