[Sema] Allow PlaceholderType Originator to be TypeRepr not just PlaceholderTypeRepr #75463
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gregomni
requested review from
hborla,
xedin,
slavapestov and
tshortli
as code owners
|
@swift-ci Please smoke test. |
xedin
approved these changes
Jul 25, 2024
| @@ -1071,12 +1071,12 @@ Type ConstraintSystem::replaceInferableTypesWithTypeVars( | |||
| return openUnboundGenericType(unbound->getDecl(), unbound->getParent(), | |||
| locator, /*isTypeResolution=*/false); | |||
| } else if (auto *placeholderTy = type->getAs<PlaceholderType>()) { | |||
| if (auto *placeholderRepr = placeholderTy->getOriginator() | |||
| .dyn_cast<PlaceholderTypeRepr *>()) { | |||
There was a problem hiding this comment.
This change needs an additional check for PlaceholderTypeRepr as is we only want to open _ type reprs and not the invalid reprs.
| @@ -1172,7 +1172,7 @@ void TypeChecker::notePlaceholderReplacementTypes(Type writtenType, | |||
| } | |||
|
|
|||
| if (auto *origRepr = | |||
| placeholder->getOriginator().dyn_cast<PlaceholderTypeRepr *>()) { | |||
| placeholder->getOriginator().dyn_cast<TypeRepr *>()) { | |||
There was a problem hiding this comment.
We should add an assert here that that makes sure that origRepr was PlaceholderTypeRepr.
|
Let's hold off on this for a bit because original change is getting reverted due to source compatibility impact. |
|
Fixed feedback, but won't merge here until/unless the previous stuff works out. |
|
Re-applied in #75526 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No functional change. In addition to the Originator change, I realized I failed to move the
resolveType()inConcreteTypeSpecializationback to where it should be in the previous PR so that is included as well.This is a follow-on to PR #74909.