Fix undefined symbol "custom panic" in BPF test programs (#13840)

* Implements missing "custom_panic" symbol
This commit is contained in:
Alexander Meißner
2020-12-01 16:52:20 +01:00
committed by GitHub
parent 83aaf18d6e
commit aebc3a17ce
11 changed files with 62 additions and 24 deletions

View File

@ -1,7 +1,7 @@
//! @brief Example Rust-based BPF program tests loop iteration
extern crate solana_program;
use solana_program::entrypoint::SUCCESS;
use solana_program::{custom_panic_default, entrypoint::SUCCESS};
#[no_mangle]
pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
@ -50,6 +50,8 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
SUCCESS
}
custom_panic_default!();
#[cfg(test)]
mod test {
use super::*;

View File

@ -2,7 +2,7 @@
#[macro_use]
extern crate alloc;
use solana_program::{entrypoint::SUCCESS, msg};
use solana_program::{custom_panic_default, entrypoint::SUCCESS, msg};
use std::{alloc::Layout, mem};
#[no_mangle]
@ -81,6 +81,8 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
SUCCESS
}
custom_panic_default!();
#[cfg(test)]
mod test {
use super::*;

View File

@ -1,6 +1,6 @@
//! @brief Example Rust-based BPF program that tests call depth and stack usage
use solana_program::{entrypoint::SUCCESS, msg};
use solana_program::{custom_panic_default, entrypoint::SUCCESS, msg};
#[inline(never)]
pub fn recurse(data: &mut [u8]) {
@ -25,3 +25,5 @@ pub unsafe extern "C" fn entrypoint(input: *mut u8) -> u64 {
recurse(&mut data);
SUCCESS
}
custom_panic_default!();

View File

@ -20,6 +20,12 @@ fn return_sstruct() -> SStruct {
SStruct { x: 1, y: 2, z: 3 }
}
#[no_mangle]
fn custom_panic(info: &core::panic::PanicInfo<'_>) {
// Full panic reporting
msg!(&format!("{}", info));
}
entrypoint_deprecated!(process_instruction);
fn process_instruction(
program_id: &Pubkey,

View File

@ -1,7 +1,7 @@
//! @brief Example Rust-based BPF program tests loop iteration
extern crate solana_program;
use solana_program::{entrypoint::SUCCESS, msg};
use solana_program::{custom_panic_default, entrypoint::SUCCESS, msg};
#[no_mangle]
pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
@ -18,6 +18,8 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
SUCCESS
}
custom_panic_default!();
#[cfg(test)]
mod test {
use super::*;

View File

@ -2,7 +2,7 @@
mod helper;
extern crate solana_program;
use solana_program::{entrypoint::SUCCESS, msg};
use solana_program::{custom_panic_default, entrypoint::SUCCESS, msg};
#[no_mangle]
pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
@ -26,6 +26,8 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
SUCCESS
}
custom_panic_default!();
#[cfg(test)]
mod test {
use super::*;

View File

@ -4,7 +4,7 @@
#![feature(compiler_builtins_lib)]
extern crate compiler_builtins;
use solana_program::entrypoint::SUCCESS;
use solana_program::{custom_panic_default, entrypoint::SUCCESS, info};
#[no_mangle]
pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
@ -183,3 +183,5 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
SUCCESS
}
custom_panic_default!();

View File

@ -2,7 +2,7 @@
extern crate solana_program;
use solana_bpf_rust_param_passing_dep::{Data, TestDep};
use solana_program::{entrypoint::SUCCESS, msg};
use solana_program::{custom_panic_default, entrypoint::SUCCESS, msg};
#[no_mangle]
pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
@ -23,6 +23,8 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
SUCCESS
}
custom_panic_default!();
#[cfg(test)]
mod test {
use super::*;

View File

@ -2,6 +2,7 @@
extern crate solana_program;
use solana_program::{
custom_panic_default,
hash::{hashv, Hasher},
msg,
};
@ -22,6 +23,8 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
0
}
custom_panic_default!();
#[cfg(test)]
mod test {
use super::*;

View File

@ -897,9 +897,9 @@ fn assert_instruction_count() {
{
programs.extend_from_slice(&[
("solana_bpf_rust_128bit", 572),
("solana_bpf_rust_alloc", 12777),
("solana_bpf_rust_alloc", 12919),
("solana_bpf_rust_dep_crate", 2),
("solana_bpf_rust_external_spend", 538),
("solana_bpf_rust_external_spend", 514),
("solana_bpf_rust_iter", 724),
("solana_bpf_rust_many_args", 237),
("solana_bpf_rust_noop", 488),