Fix globbed read/import bugs #449
Merged
Conversation
This file contains 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
translatenix
force-pushed
the
fix-glob
branch
2 times, most recently
from
ba883a4
to
f40ef4e
Compare
This was referenced May 4, 2024
bioball
requested changes
May 7, 2024
pkl-core/src/main/java/org/pkl/core/ast/expression/unary/ImportGlobNode.java
Outdated
Show resolved
Hide resolved
pkl-core/src/main/java/org/pkl/core/ast/expression/unary/ImportGlobNode.java
Outdated
Show resolved
Hide resolved
pkl-core/src/main/java/org/pkl/core/ast/expression/unary/ReadGlobElementNode.java
Outdated
Show resolved
Hide resolved
pkl-core/src/main/java/org/pkl/core/ast/expression/unary/ReadGlobElementNode.java
Outdated
Show resolved
Hide resolved
pkl-core/src/main/java/org/pkl/core/ast/expression/unary/ReadGlobElementNode.java
Outdated
Show resolved
Hide resolved
pkl-core/src/main/java/org/pkl/core/ast/expression/unary/ReadGlobNode.java
Outdated
Show resolved
Hide resolved
| VmUtils.createEmptyMaterializedFrame(), | ||
| BaseModule.getMappingClass().getPrototype(), | ||
| members); | ||
| return self.toMapping(); |
There was a problem hiding this comment.
Should change class toDynamic to also call out to self.toDynamic() yeah?
|
Hi @translatenix, are you still planning on working on this PR, and the other ones? If not, we'd be happy to take it past the finish line (and credit you, of course) |
SharedMemberNode enables generating non-constant object members at run time without generating an unbounded number of Truffle root nodes.
Introduce VmObjectBuilder, a uniform way to build `VmObject`s whose `ObjectMember`s are determined at run time. Replace some manual object building code with VmObjectBuilder. Add some assertions to fix IntelliJ warnings.
- Leverage SharedMemberNode to have a single Truffle root node per globbed read/import expression instead of one root node per resolved glob element. - Remove caching in ReadGlobNode because it only works correctly if glob pattern is a string *constant*. - Remove caching in StaticReadNode (now ReadGlobElementNode/ImportGlobElementNode) because it seems unnecessary and the implementation doesn't look quite right.
Problem: The result of a globbed read depends not only on the glob pattern but also on the current module URI. However, ResourceManager does not take this into account when caching globbed reads, causing wrong results. Changes: - Cache globbed reads per read expression. This is also how globbed imports are cached, except that import URIs are constant. - Make ReadGlobNode and ImportGlobNode code as similar as possible. - Reduce code duplication by inheriting from AbstractReadNode. - Add some tests.
* Defer initialization of shared member node, add @child annotations * Reduce footprint of truffle boundaries * Revert bugfix when reflecting upon modules with globbed imports
|
FYI @translatenix given the lack of activity here, I'll go ahead and update this PR with my comments, and do the same for #455, #378 and #197. Thanks again for your contributions! |
bioball
approved these changes
May 29, 2024
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.
This PR fixes several bugs related to globbed reads/imports and makes code improvements along the way.
Bug fixes:
ResolvedGlobElement.getPath()depend on the current module URIClassCastExceptionwhen reflecting on globbed importSee commit messages for further details.