gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use real panic that reports file/line (#4758)

Browse Source
This commit is contained in:
Jack May
2019-06-20 19:10:03 -07:00
committed by GitHub
parent 425ac8d520
commit 4177c56c51
4 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sdk/bpf/c/inc/solana_sdk.h
View File

@ -175,19 +175,15 @@ SOL_FN_PREFIX size_t sol_strlen(const char *s) {
* Prints the line number where the panic occurred and then causes
* the BPF VM to immediately halt execution. No accounts' userdata are updated
*/
#define sol_panic() _sol_panic(__LINE__)
SOL_FN_PREFIX void _sol_panic(uint64_t line) {
sol_log_64(0xFF, 0xFF, 0xFF, 0xFF, line);
uint8_t *pv = (uint8_t *)1;
*pv = 1;
}
void sol_panic_(const char *, uint64_t, uint64_t);
#define sol_panic() sol_panic_(__FILE__, __LINE__, 0)
/**
* Asserts
*/
#define sol_assert(expr) \
if (!(expr)) { \
_sol_panic(__LINE__); \
sol_panic(); \
}
/**

2
sdk/bpf/rust/rust-utils/src/panic.rs
View File

@ -28,5 +28,5 @@ fn panic(info: &PanicInfo) -> ! {
}
}
extern "C" {
pub fn sol_panic_(message: *const u8, line: u64, column: u64) -> !;
pub fn sol_panic_(file: *const u8, line: u64, column: u64) -> !;
}