Fix nevermind bad-iszero patch for EvmWord rename#378
Merged
Conversation
Upstream Nethermind renamed the per-file `using Word = Vector256<byte>;` alias to a project-wide `<Using ... Alias="EvmWord" />` in `src/Nethermind/Directory.Build.props` (PR #11436), so all `Word` usages in `EvmInstructions.Math1Param.cs` are now `EvmWord`. The patch's context no longer matched, breaking the `master-bad-iszero` image build.
qu0b
approved these changes
May 12, 2026
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
2 participants
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.
Summary
nethermindeth/nethermind#master master-bad-iszeroimage build has been failing becausenevermind/bad-iszero.patchno longer applies cleanly to upstream master (failing run).481b6b17cc) replaced the per-fileusing Word = Vector256<byte>;aliases with a project-wide MSBuild<Using ... Alias=\"EvmWord\" />insrc/Nethermind/Directory.Build.props, renaming allWordsymbols toEvmWord. The underlying type (Vector256<byte>) is unchanged, sovalue.AsUInt64()keeps working.Word Operation(Word value)toEvmWord Operation(EvmWord value).Test plan
patch -p 1against current upstreamnethermindeth/nethermindmaster — applies cleanly.OpIsZero.Operationnow reads withEvmWordtypes and the bad-iszero hack body intact.master-bad-iszerobuild (linux-amd64 + linux-arm64) succeeds end-to-end.