averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #70667 from slavapestov/assorted-small-cleanups

Browse Source 
Assorted small cleanups
This commit is contained in:
Slava Pestov
2024-01-02 19:00:59 -05:00
committed by GitHub
parent 672386c39f 47ca44c4a8
commit 8e2aa52f7a
14 changed files with 83 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Sema/ConstraintSystem.cpp
View File

@@ -1823,8 +1823,7 @@ ConstraintSystem::getTypeOfReference(ValueDecl *value,
if (Context.LangOpts.hasFeature(Feature::InferSendableFromCaptures)) {
// All global functions should be @Sendable
if (!funcDecl->getDeclContext()->isTypeContext() &&
!funcDecl->getDeclContext()->isLocalContext()) {
if (funcDecl->getDeclContext()->isModuleScopeContext()) {
funcType =
funcType->withExtInfo(funcType->getExtInfo().withConcurrent());
}
@@ -1849,7 +1848,8 @@ ConstraintSystem::getTypeOfReference(ValueDecl *value,
if (isForCodeCompletion() && openedType->hasError()) {
// In code completion, replace error types by placeholder types so we can
// match the types we know instead of bailing out completely.
openedType = replaceParamErrorTypeByPlaceholder(openedType, value, /*hasAppliedSelf=*/true);
openedType = replaceParamErrorTypeByPlaceholder(
openedType, value, /*hasAppliedSelf=*/true);
}
// If we opened up any type variables, record the replacements.