Fix nested generic typerefs applying generic params at the wrong level #59262
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
|
@swift-ci smoke test |
augusto2112
commented
Jun 3, 2022
| if (auto parentDescriptor = readParentContextDescriptor(descriptor)) | ||
| if (parentDescriptor->isResolved()) | ||
| if (auto resolvedParent = parentDescriptor->getResolved()) | ||
| parent = readNominalTypeFromDescriptor(metadata, resolvedParent); |
There was a problem hiding this comment.
Not sure if this is ok, I'm passing the metadata of the current descriptor, not the parent.
augusto2112
force-pushed
the
nested-generic-typeref
branch
from
e95c3b3 to
868feb7
Compare
|
@swift-ci smoke test |
augusto2112
force-pushed
the
nested-generic-typeref
branch
from
868feb7 to
50a9f04
Compare
|
@swift-ci smoke test |
mikeash
approved these changes
Jun 6, 2022
include/swift/Reflection/TypeRef.h
Outdated
| if (Parent) | ||
| GenericParams.erase(GenericParams.begin(), | ||
| GenericParams.begin() + | ||
| GetNumberOfGenericParametersInHierarchy(Parent)); |
There was a problem hiding this comment.
Can you add a bounds check here to fail gracefully if GetNumberOfGenericParametersInHierarchy(Parent) > GenericParams.size()? We sometimes get weird values due to corrupt or misidentified data in the target process.
include/swift/Reflection/TypeRef.h
Outdated
| @@ -283,6 +283,24 @@ class NominalTypeRef final : public TypeRef, public NominalTypeTrait { | |||
| class BoundGenericTypeRef final : public TypeRef, public NominalTypeTrait { | |||
| std::vector<const TypeRef *> GenericParams; | |||
|
|
|||
| static uint64_t | |||
There was a problem hiding this comment.
(What's not obvious from the name is that this counts the generic parameters in the parent only.)
augusto2112
force-pushed
the
nested-generic-typeref
branch
from
50a9f04 to
acae3d2
Compare
|
@swift-ci smoke test |
jckarter
reviewed
Jun 8, 2022
| /// single flat array. | ||
| template <typename T = BuilderType, | ||
| std::enable_if_t<std::is_same<T, reflection::TypeRefBuilder>::value, | ||
| bool> = true> |
There was a problem hiding this comment.
Instead of hardcoding TypeRefBuilder here, it might be cleaner to look for a new trait on BuilderType, so we can do enable_if_t<BuilderType::needsToPrecomputeParentGenericContextShapes> or something like that.
augusto2112
force-pushed
the
nested-generic-typeref
branch
2 times, most recently
from
1bbc169 to
07eaa56
Compare
|
@swift-ci test |
|
@jckarter updated |
|
@swift-ci smoke test |
adrian-prantl
approved these changes
Jun 17, 2022
| @@ -64,6 +64,8 @@ class ASTBuilder { | |||
| using BuiltRequirement = swift::Requirement; | |||
| using BuiltSubstitutionMap = swift::SubstitutionMap; | |||
|
|
|||
| static constexpr bool needsToPrecomputeParentGenericContextShapes = false; | |||
There was a problem hiding this comment.
Should we Doxygen-document what this parameter means?
| auto node = buildContextMangling(descriptor, dem); | ||
| if (!node || node->getKind() != Node::Kind::Type) | ||
| return BuiltTypeDecl(); | ||
| std::vector<size_t> paramsPerLevel; |
There was a problem hiding this comment.
llvm::SmallVector<size_t, 4> ?
| return BuiltTypeDecl(); | ||
| std::vector<size_t> paramsPerLevel; | ||
| size_t runningCount = 0; | ||
| std::function<void(ContextDescriptorRef current, size_t &)> countLevels = |
There was a problem hiding this comment.
Comment what the lambda does?
|
@swift-ci smoke test |
Generic params of typerefs are supposed to be "attached" on the level they belong, not as a flat list, unlike other parts of the system. Fix the application of bound generic params by checking how many were already applied in the hierarchy and ignoring those already attached.
augusto2112
force-pushed
the
nested-generic-typeref
branch
from
07eaa56 to
6a82edd
Compare
|
@swift-ci smoke test |
|
Seems like this is failing for some other reason: |
|
@swift-ci smoke test |
This was referenced Jul 5, 2022
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.
Generic params of typerefs are supposed to be "attached" on the level
they belong, not as a flat list, unlike other parts of the system. Fix
the application of bound generic params by checking how many were
already applied in the hierarchy and ignoring those already attached.