Skip to content

Remove TypeBase::replaceCovariantResultType() #84115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slavapestov merged 6 commits into from
Sep 5, 2025
Merged

Remove TypeBase::replaceCovariantResultType() #84115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
853f50c
Sema: Remove usage of replaceCovariantResultType()
slavapestov Sep 4, 2025
cb2c0b1
AST: Remove TypeBase::replaceCovariantResultType()
slavapestov Sep 4, 2025
d81fbd6
Sema: Split off buildDynamicMemberRef() from buildMemberRef()
slavapestov Sep 4, 2025
250e3fd
Sema: Split off buildStaticCurryThunk() from buildMemberRef()
slavapestov Sep 4, 2025
1ddcdc7
Sema: Convert conditional into an assert
slavapestov Sep 4, 2025
55082c4
Sema: Split off buildVarMemberRef() from buildMemberRef()
slavapestov Sep 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions include/swift/AST/Types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1350,10 +1350,6 @@ class alignas(1 << TypeAlignInBits) TypeBase
/// Hack to deal with ConstructorDecl interface types.
Type withCovariantResultType();

/// Deprecated in favor of the above.
Type replaceCovariantResultType(Type newResultType,
unsigned uncurryLevel);

/// Returns a new function type exactly like this one but with the self
/// parameter replaced. Only makes sense for function members of types.
Type replaceSelfParameterType(Type newSelf);
Expand Down
31 changes: 0 additions & 31 deletions lib/AST/Type.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1393,37 +1393,6 @@ Type TypeBase::withCovariantResultType() {
fnType->getExtInfo());
}

Type TypeBase::replaceCovariantResultType(Type newResultType,
unsigned uncurryLevel) {
if (uncurryLevel == 0) {
bool isLValue = is<LValueType>();

auto loadedTy = getWithoutSpecifierType();
if (auto objectType = loadedTy->getOptionalObjectType()) {
newResultType = OptionalType::get(
objectType->replaceCovariantResultType(newResultType, uncurryLevel));
}

return isLValue ? LValueType::get(newResultType) : newResultType;
}

// Determine the input and result types of this function.
auto fnType = this->castTo<AnyFunctionType>();
auto inputType = fnType->getParams();
Type resultType =
fnType->getResult()->replaceCovariantResultType(newResultType,
uncurryLevel - 1);

// Produce the resulting function type.
if (auto genericFn = dyn_cast<GenericFunctionType>(fnType)) {
return GenericFunctionType::get(genericFn->getGenericSignature(),
inputType, resultType,
fnType->getExtInfo());
}

return FunctionType::get(inputType, resultType, fnType->getExtInfo());
}

/// Whether this parameter accepts an unlabeled trailing closure argument
/// using the more-restrictive forward-scan rule.
static bool allowsUnlabeledTrailingClosureParameter(const ParamDecl *param) {
Expand Down
Loading