Skip to content

Commit 6cbde81

Browse files
committed
Added 'Plugin Crash' to the plugin fail message for v8
Signed-off-by: Rachel Green <[email protected]>
1 parent a374efd commit 6cbde81

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

src/v8/v8.cc

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ class V8 : public WasmVm {
106106
private:
107107
wasm::own<wasm::Trap> trap(std::string message);
108108

109-
std::string getFailMessage(std::string_view function_name, wasm::own<wasm::Trap> trap);
109+
std::string getPluginFailMessage(std::string_view function_name, wasm::own<wasm::Trap> trap);
110110

111111
template <typename... Args>
112112
void registerHostFunctionImpl(std::string_view module_name, std::string_view function_name,
@@ -638,7 +638,8 @@ void V8::getModuleFunctionImpl(std::string_view function_name,
638638
}
639639

640640
if (trap) {
641-
fail(FailState::RuntimeError, getFailMessage(std::string(function_name), std::move(trap)));
641+
fail(FailState::RuntimeError,
642+
getPluginFailMessage(std::string(function_name), std::move(trap)));
642643
return;
643644
}
644645
if (log) {
@@ -690,7 +691,8 @@ void V8::getModuleFunctionImpl(std::string_view function_name,
690691
}
691692

692693
if (trap) {
693-
fail(FailState::RuntimeError, getFailMessage(std::string(function_name), std::move(trap)));
694+
fail(FailState::RuntimeError,
695+
getPluginFailMessage(std::string(function_name), std::move(trap)));
694696
return R{};
695697
}
696698
R rvalue = results[0].get<typename ConvertWordTypeToUint32<R>::type>();
@@ -708,8 +710,8 @@ void V8::terminate() {
708710
isolate->TerminateExecution();
709711
}
710712

711-
std::string V8::getFailMessage(std::string_view function_name, wasm::own<wasm::Trap> trap) {
712-
auto message = "Function: " + std::string(function_name) + " failed: ";
713+
std::string V8::getPluginFailMessage(std::string_view function_name, wasm::own<wasm::Trap> trap) {
714+
auto message = "Plugin Crash: Function: " + std::string(function_name) + " failed: ";
713715
message += std::string(trap->message().get(), trap->message().size());
714716

715717
if (function_names_index_.empty()) {

0 commit comments

Comments
 (0)