core/vm: added JumpDests type to abstract jumpdest analysis caching
#32143
+80
−23
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
- renamed `bitvec` to `BitVec` - `BitVec` needs to be exported to support thirdparty `JumpDests` implementations
fjl
reviewed
Jul 17, 2025
core/vm/evm.go
Outdated
| @@ -138,7 +137,7 @@ func NewEVM(blockCtx BlockContext, statedb StateDB, chainConfig *params.ChainCon | |||
| Config: config, | |||
| chainConfig: chainConfig, | |||
| chainRules: chainConfig.Rules(blockCtx.BlockNumber, blockCtx.Random != nil, blockCtx.Time), | |||
| jumpDests: make(map[common.Hash]bitvec), | |||
| jumpDests: nil, | |||
There was a problem hiding this comment.
Please put this back, i.e. put make(mapJumpDests) here and remove the lazy init. Yes, there will be an extra allocation in case it's not used, but I feel it's preferable to having to init everywhere.
There was a problem hiding this comment.
Okay, updated the PR.
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.
resolves #32137
This PR replaces
jumpDests map[common.Hash]bitvecwithjumpDests JumpDestsin theEVM. TheJumpDestsallows custom jumpdest analysis caches.I did not update the signature of
vm.NewEVMto keep the diff smaller. Instead I addedEVM.SetJumpDestswhich can be used directly after construction to set a customJumpDestsimplementation. IfSetJumpDestsis not called amapJumpDestsis set lazily within theEVM.Additionally I exported
bitvec, nowBitVec. This is necessary to support third-partyJumpDestsimplementations.