Merge pull request swiftlang#84217 from hamishknight/fix-crash

hamishknight · web-flow · commit be895576001d · 2025-09-11T16:27:14.000+01:00
[Completion] Simplify opened function type in `tryResolveDoubleAppliedFunction`
diff --git a/lib/IDE/ArgumentCompletion.cpp b/lib/IDE/ArgumentCompletion.cpp
@@ -133,10 +133,12 @@ tryResolveDoubleAppliedFunction(CallExpr *OuterCall, const Solution &S) {
   if (!FuncRefInfo.isDoubleApply())
     return std::nullopt;
 
-  auto CalleeTy = Overload->adjustedOpenedType->getAs<AnyFunctionType>();
-  auto ResultTy = S.simplifyTypeForCodeCompletion(CalleeTy->getResult());
+  auto CalleeTy = S.simplifyTypeForCodeCompletion(Overload->adjustedOpenedType)
+                      ->getAs<AnyFunctionType>();
+  if (!CalleeTy)
+    return std::nullopt;
 
-  auto *FuncTy = ResultTy->getAs<AnyFunctionType>();
+  auto *FuncTy = CalleeTy->getResult()->getAs<AnyFunctionType>();
   if (!FuncTy)
     return std::nullopt;
 
diff --git a/validation-test/IDE/crashers_fixed/934bb97a5cbe0b8.swift b/validation-test/IDE/crashers_fixed/934bb97a5cbe0b8.swift
@@ -0,0 +1,7 @@
+// {"kind":"complete","original":"a705fa0d","signature":"swift::constraints::Solution::simplifyType(swift::Type, bool) const","signatureAssert":"Assertion failed: (!resolvedType->getRecursiveProperties().isSolverAllocated()), function simplifyType"}
+// RUN: %target-swift-ide-test -code-completion -batch-code-completion -skip-filecheck -code-completion-diagnostics -source-filename %s
+{
+  $1 {
+  }(
+    #^^#)
+}

-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +// {"kind":"complete","original":"a705fa0d","signature":"swift::constraints::Solution::simplifyType(swift::Type, bool) const","signatureAssert":"Assertion failed: (!resolvedType->getRecursiveProperties().isSolverAllocated()), function simplifyType"}
 +// RUN: %target-swift-ide-test -code-completion -batch-code-completion -skip-filecheck -code-completion-diagnostics -source-filename %s
 +{
 +  $1 {
 +  }(
 +    #^^#)
 +}