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.

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
Changes from all commits
Commits
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
core-bpf: fix builtins list removal step
buffalojoec committed Jan 3, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit d56206687aaf64aaea17f96c59bff99699fadd4d
3 changes: 0 additions & 3 deletions macro/src/lib.rs
Original file line number Diff line number Diff line change
@@ -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();
}
5 changes: 2 additions & 3 deletions src/lib.rs
Original file line number Diff line number Diff line change
@@ -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!();
}