Skip to content
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.

Sign up for GitHub

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

core-bpf: fix builtins list removal step #200

Merged
merged 1 commit into from
Jan 4, 2025
Merged

core-bpf: fix builtins list removal step #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions macro/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,6 @@ pub fn load_core_bpf_program(_: TokenStream) -> TokenStream {
.unwrap(),
),
);

// Remove the builtin ID from the `builtins` hash set.
builtins.remove(&target_program_id);
}
.into();
}
Expand Down
5 changes: 2 additions & 3 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,9 +559,8 @@ fn load_builtins(cache: &mut ProgramCacheForTxBatch, feature_set: &FeatureSet) {
}

// If the `CORE_BPF_PROGRAM_ID` and `CORE_BPF_TARGET` environment variables
// are set, this macro will do the following:
// * Replace the designated builtin program in the cache with a loaded ELF.
// * Remove that builtin's program ID from the `builtins` set above.
// are set, this macro will replace the designated builtin program in the
// cache with a loaded ELF.
load_core_bpf_program!();
}

Expand Down