-
Notifications
You must be signed in to change notification settings - Fork 597
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.
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
Fix using Definitions as arguments to Definitions #3726
Merged
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
jackkoenig
force-pushed
the
jackkoenig/definition-dependency-injection
branch
from
January 12, 2024 00:03
a0aa409
to
a3c6238
Compare
jackkoenig
force-pushed
the
jackkoenig/definition-dependency-injection
branch
from
January 12, 2024 01:09
a3c6238
to
eaedc9f
Compare
azidar
approved these changes
Jan 12, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Awesome! Good catch
@tymcauley caught it, I just stared at the code until it fixed itself 🙂 |
mergify bot
pushed a commit
that referenced
this pull request
Jan 12, 2024
(cherry picked from commit a050b8c) # Conflicts: # core/src/main/scala/chisel3/Module.scala # core/src/main/scala/chisel3/experimental/hierarchy/Definition.scala # core/src/main/scala/chisel3/experimental/hierarchy/Instance.scala # core/src/main/scala/chisel3/internal/Builder.scala # src/main/scala/chisel3/aop/injecting/InjectingAspect.scala # src/main/scala/chisel3/stage/phases/Elaborate.scala
mergify bot
pushed a commit
that referenced
this pull request
Jan 12, 2024
(cherry picked from commit a050b8c) # Conflicts: # core/src/main/scala/chisel3/Module.scala # core/src/main/scala/chisel3/experimental/hierarchy/core/Definition.scala # core/src/main/scala/chisel3/experimental/hierarchy/core/Instance.scala # core/src/main/scala/chisel3/internal/Builder.scala # src/main/scala/chisel3/aop/injecting/InjectingAspect.scala # src/main/scala/chisel3/stage/phases/Elaborate.scala
14 tasks
mergify bot
pushed a commit
that referenced
this pull request
Jan 12, 2024
(cherry picked from commit a050b8c) # Conflicts: # core/src/main/scala/chisel3/Module.scala # core/src/main/scala/chisel3/experimental/hierarchy/core/Definition.scala # core/src/main/scala/chisel3/experimental/hierarchy/core/Instance.scala # core/src/main/scala/chisel3/internal/Builder.scala
14 tasks
Thanks so much for fixing this @jackkoenig! |
mergify bot
added a commit
that referenced
this pull request
Jan 13, 2024
…3731) * Fix using Definitions as arguments to Definitions (#3726) (cherry picked from commit a050b8c) # Conflicts: # core/src/main/scala/chisel3/Module.scala # core/src/main/scala/chisel3/experimental/hierarchy/core/Definition.scala # core/src/main/scala/chisel3/experimental/hierarchy/core/Instance.scala # core/src/main/scala/chisel3/internal/Builder.scala * Resolve backport conflicts --------- Co-authored-by: Jack Koenig <koenig@sifive.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
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.
Chisel creates new contexts whenever you're constructing a Definition. Previously, if you had a Definition in the parent context, the actual object would not be available in the child context (because it's a new context,
Builder.components
is cleared when you go to a new context). Now, we keep track of definitions explicitly including definitions from parent/outer scopes. This is implemented using a nestedList
for efficiency of constructing the datastructure while still allowing for efficient iteration.Contributor Checklist
docs/src
?Type of Improvement
Desired Merge Strategy
Release Notes
Fixes #3708
Reviewer Checklist (only modified by reviewer)
3.5.x
,3.6.x
, or5.x
depending on impact, API modification or big change:6.0
)?Enable auto-merge (squash)
, clean up the commit message, and label withPlease Merge
.Create a merge commit
.