wasmtime: Remove GET_WASM_TRAP indirection #8949
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In the past, the wasmtime-runtime crate couldn't directly call
get_wasm_trap
because the registry of loaded modules was in the wasmtime crate, so it called through a global function pointer registered withinit_traps
instead.Since the two crates were merged in #8501, we no longer need this indirection.
While I'm here, I've also split the former
get_wasm_trap
function into two parts:lookup_code
finds a loaded module that had been previously registered withregister_code
, and thelookup_trap_code
step is now done by a helper onCodeMemory
. This makes the module registry more broadly useful.I also simplified the code lookup step in two ways:
BTreeMap::range
will only return entries whereend >= pc
, so theend < pc
condition is always false.