Merge pull request #34131 from MaxDesiatov/maxd/fix-SR-12994

AST: Fix assertions crash with try expressions (main branch cherry-pick)
apple · Oct 1, 2020 · 5f803ee · 5f803ee
2 parents 9348907 + fd4b01f
commit 5f803ee
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/lib/AST/Expr.cpp b/lib/AST/Expr.cpp
@@ -1943,7 +1943,7 @@ Expr *AutoClosureExpr::getUnwrappedCurryThunkExpr() const {
     body = body->getSemanticsProvidingExpr();
 
     if (auto *openExistential = dyn_cast<OpenExistentialExpr>(body)) {
-      body = openExistential->getSubExpr();
+      body = openExistential->getSubExpr()->getSemanticsProvidingExpr();
     }
 
     if (auto *outerCall = dyn_cast<ApplyExpr>(body)) {
@@ -1963,7 +1963,7 @@ Expr *AutoClosureExpr::getUnwrappedCurryThunkExpr() const {
       innerBody = innerBody->getSemanticsProvidingExpr();
 
       if (auto *openExistential = dyn_cast<OpenExistentialExpr>(innerBody)) {
-        innerBody = openExistential->getSubExpr();
+        innerBody = openExistential->getSubExpr()->getSemanticsProvidingExpr();
         if (auto *ICE = dyn_cast<ImplicitConversionExpr>(innerBody))
           innerBody = ICE->getSyntacticSubExpr();
       }

diff --git a/validation-test/compiler_crashers_2_fixed/sr12994.swift b/validation-test/compiler_crashers_2_fixed/sr12994.swift
@@ -0,0 +1,12 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -index-store-path %t/idx -o %t/file.o -typecheck -primary-file %s -verify
+
+protocol MyProto {
+  func compile() throws
+}
+
+func compile(x: MyProto) throws {
+  try x.compile 
+  // expected-error@-1 {{expression resolves to an unused function}}
+  // expected-warning@-2 {{no calls to throwing functions occur within 'try' expression}}
+}