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

Custom heap is BPF only #13537

Merged
merged 1 commit into from
Nov 12, 2020
Merged

Conversation

jackcmay
Copy link
Contributor

Problem

Custom heaps only apply to BPF programs but its inclusion in entrypoint! means it also shows up when using program-test so programs must feature guard the use of entrypoint! from the outside

Summary of Changes

Add feature guard to the entrypoint! macro to avoid the conflict or doing this:
https://github.com/solana-labs/solana-program-library/blob/487ad2d2d7cb0b8a58f02a156a659e6c8a74f354/examples/rust/logging/src/entrypoint.rs#L3

Mentioned: solana-labs/solana-program-library#829

Fixes #

@codecov
Copy link

codecov bot commented Nov 12, 2020

Codecov Report

Merging #13537 (a5ca268) into v1.4 (2cb9ca5) will decrease coverage by 0.0%.
The diff coverage is n/a.

@@           Coverage Diff            @@
##            v1.4   #13537     +/-   ##
========================================
- Coverage   82.2%    82.2%   -0.1%     
========================================
  Files        378      378             
  Lines      90197    90197             
========================================
- Hits       74152    74149      -3     
- Misses     16045    16048      +3     

@jackcmay jackcmay merged commit 2374664 into solana-labs:v1.4 Nov 12, 2020
@jackcmay jackcmay deleted the guard-custom-heap branch November 12, 2020 00:37
@joncinque
Copy link
Contributor

This is an even better solution, thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants