traxys/tree-sitter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reset result_symbol field of lexer in wasm memory in between invocations (#4218) (#4220)

Browse source 
(cherry picked from commit 2bd400dcee)

Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>
This commit is contained in:
tree-sitter-ci-bot[bot] 2025-02-17 18:52:32 -08:00 • committed by GitHub
parent 02625fc959
commit 1925a70f7e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lib/src/wasm_store.c
View file

@ -1613,13 +1613,22 @@ static void ts_wasm_store__call(
}
}
// The data fields of TSLexer, without the function pointers.
//
// This portion of the struct needs to be copied in and out
// of wasm memory before and after calling a scan function.
typedef struct {
int32_t lookahead;
TSSymbol result_symbol;
} TSLexerDataPrefix;
static bool ts_wasm_store__call_lex_function(TSWasmStore *self, unsigned function_index, TSStateId state) {
wasmtime_context_t *context = wasmtime_store_context(self->store);
uint8_t *memory_data = wasmtime_memory_data(context, &self->memory);
memcpy(
&memory_data[self->lexer_address],
&self->current_lexer->lookahead,
sizeof(self->current_lexer->lookahead)
self->current_lexer,
sizeof(TSLexerDataPrefix)
);
wasmtime_val_raw_t args[2] = {
@ -1631,9 +1640,9 @@ static bool ts_wasm_store__call_lex_function(TSWasmStore *self, unsigned functio
bool result = args[0].i32;
memcpy(
&self->current_lexer->lookahead,
self->current_lexer,
&memory_data[self->lexer_address],
sizeof(self->current_lexer->lookahead) + sizeof(self->current_lexer->result_symbol)
sizeof(TSLexerDataPrefix)
);
return result;
}
@ -1678,8 +1687,8 @@ bool ts_wasm_store_call_scanner_scan(
memcpy(
&memory_data[self->lexer_address],
&self->current_lexer->lookahead,
sizeof(self->current_lexer->lookahead)
self->current_lexer,
sizeof(TSLexerDataPrefix)
);
uint32_t valid_tokens_address =
@ -1694,9 +1703,9 @@ bool ts_wasm_store_call_scanner_scan(
if (self->has_error) return false;
memcpy(
&self->current_lexer->lookahead,
self->current_lexer,
&memory_data[self->lexer_address],
sizeof(self->current_lexer->lookahead) + sizeof(self->current_lexer->result_symbol)
sizeof(TSLexerDataPrefix)
);
return args[0].i32;
}