fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-06-12 00:21:20 +00:00
Code Issues Projects Releases Wiki Activity

Add support for panicking/returning err back to llvm

Browse Source
This commit is contained in:
Lachlan Sneff
2019-04-10 14:17:10 -07:00
parent 6848e81a77
commit 1cb3fbea0a
3 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/llvm-backend/cpp/object_loader.hh
View File

@ -61,15 +61,15 @@ struct UncatchableException : WasmException
struct UserException : UncatchableException
{
public:
UserException(std::string msg) : msg(msg) {}
UserException(size_t data, size_t vtable) : data(data), vtable(vtable) {}
virtual std::string description() const noexcept override
{
return std::string("user exception: ") + msg;
return "user exception";
}
private:
std::string msg;
// The parts of a `Box<dyn Any>`.
size_t data, vtable;
};
struct WasmTrap : UncatchableException
@ -176,6 +176,12 @@ extern "C"
delete module;
}
// Throw a fat pointer that's assumed to be `*mut dyn Any` on the rust
// side.
[[noreturn]] void throw_any(size_t data, size_t vtable) {
throw UserException(data, vtable);
}
bool invoke_trampoline(
trampoline_t trampoline,
void *ctx,

10
lib/llvm-backend/src/backend.rs
View File

@ -75,7 +75,11 @@ extern "C" {
fn module_delete(module: *mut LLVMModule);
fn get_func_symbol(module: *mut LLVMModule, name: *const c_char) -> *const vm::Func;
fn throw_trap(ty: i32);
fn throw_trap(ty: i32) -> !;
/// This should be the same as spliting up the fat pointer into two arguments,
/// but this is cleaner, I think?
fn throw_any(data: *mut dyn Any) -> !;
#[allow(improper_ctypes)]
fn invoke_trampoline(
@ -433,8 +437,8 @@ impl ProtectedCaller for LLVMProtectedCaller {
}
impl UserTrapper for Placeholder {
unsafe fn do_early_trap(&self, _data: Box<dyn Any>) -> ! {
unimplemented!("do early trap")
unsafe fn do_early_trap(&self, data: Box<dyn Any>) -> ! {
throw_any(Box::leak(data))
}
}