cranelift: New InstructionData::map_values helper#8231
Merged
jameysharp merged 1 commit intobytecodealliance:mainfrom Mar 25, 2024
Merged
cranelift: New InstructionData::map_values helper#8231jameysharp merged 1 commit intobytecodealliance:mainfrom
jameysharp merged 1 commit intobytecodealliance:mainfrom
Conversation
This is like the DataFlowGraph::map_inst_values method, but that method mutably borrows `self`, so it goes to a fair bit of trouble to drop its borrows around callbacks so the mutable borrow can be used in the callback too. This new helper only actually needs to borrow two public fields from the DFG: `value_lists` and `jump_tables`. Therefore it's possible to use other fields in the callback as long as the compiler can see all the fields being used in the same scope. That's good enough for everywhere we were using this pattern, so we can simplify this way. The case which motivated this change isn't shown here: It isn't possible to call `dfg.map_inst_values` on every instruction in `dfg.insts`, because the borrow on `dfg.insts` prevents taking a mutable borrow on `dfg`. But we can call this new helper in that case.
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
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 is like the DataFlowGraph::map_inst_values method, but that method mutably borrows
self, so it goes to a fair bit of trouble to drop its borrows around callbacks so the mutable borrow can be used in the callback too.This new helper only actually needs to borrow two public fields from the DFG:
value_listsandjump_tables. Therefore it's possible to use other fields in the callback as long as the compiler can see all the fields being used in the same scope. That's good enough for everywhere we were using this pattern, so we can simplify this way.The case which motivated this change isn't shown here: It isn't possible to call
dfg.map_inst_valueson every instruction indfg.insts, because the borrow ondfg.instsprevents taking a mutable borrow ondfg. But we can call this new helper in that case.