Merge remote-tracking branch 'origin/main' into rebranch

swift-ci · swift-ci · commit 7e6b441c5099 · 2025-08-08T01:55:02.000-07:00
diff --git a/lib/Sema/TypeOfReference.cpp b/lib/Sema/TypeOfReference.cpp
@@ -989,7 +989,8 @@ static Type replaceParamErrorTypeByPlaceholder(Type type, ValueDecl *value, bool
     }
   }
   assert(newParams.size() == declParams.size());
-  return FunctionType::get(newParams, funcType->getResult());
+  return FunctionType::get(newParams, funcType->getResult(),
+                           funcType->getExtInfo());
 }
 
 DeclReferenceType
diff --git a/validation-test/IDE/crashers_fixed/23da5344b07b939.swift b/validation-test/IDE/crashers_fixed/23da5344b07b939.swift
@@ -1,3 +1,3 @@
 // {"kind":"complete","signature":"swift::AnyFunctionType::getExtInfo() const","signatureAssert":"Assertion failed: (hasExtInfo()), function getExtInfo"}
-// RUN: not --crash %target-swift-ide-test -code-completion -batch-code-completion -skip-filecheck -code-completion-diagnostics -source-filename %s
+// RUN: %target-swift-ide-test -code-completion -batch-code-completion -skip-filecheck -code-completion-diagnostics -source-filename %s
 func a(b) a#^COMPLETE^#

Original file line number	Diff line number	Diff line change
`@@ -989,7 +989,8 @@ static Type replaceParamErrorTypeByPlaceholder(Type type, ValueDecl *value, bool`
`989`	`989`	`}`
`990`	`990`	`}`
`991`	`991`	`assert(newParams.size() == declParams.size());`
`992`		`- return FunctionType::get(newParams, funcType->getResult());`
	`992`	`+ return FunctionType::get(newParams, funcType->getResult(),`
	`993`	`+ funcType->getExtInfo());`
`993`	`994`	`}`
`994`	`995`
`995`	`996`	`DeclReferenceType`