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

fix: Correctly load field data from wasm languages

Browse source 
Previously, if the last production id in a language did not have
a unique set of fields, the field maps weren't loaded correctly
from wasm.

Co-authored-by: Marshall <marshall@zed.dev>
This commit is contained in:
Max Brunsfeld 2024-04-24 16:29:44 -07:00
parent 90e0e28b95
commit d7a23cf017
1 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/src/wasm_store.c
View file

@ -1276,10 +1276,21 @@ const TSLanguage *ts_wasm_store_load_language(
&memory[wasm_language.field_map_slices],
wasm_language.production_id_count * sizeof(TSFieldMapSlice)
);
const TSFieldMapSlice last_field_map_slice = language->field_map_slices[language->production_id_count - 1];
// Determine the number of field map entries by finding the greatest index
// in any of the slices.
uint32_t field_map_entry_count = 0;
for (uint32_t i = 0; i < wasm_language.production_id_count; i++) {
TSFieldMapSlice slice = language->field_map_slices[i];
uint32_t slice_end = slice.index + slice.length;
if (slice_end > field_map_entry_count) {
field_map_entry_count = slice_end;
}
}
language->field_map_entries = copy(
&memory[wasm_language.field_map_entries],
(last_field_map_slice.index + last_field_map_slice.length) * sizeof(TSFieldMapEntry)
field_map_entry_count * sizeof(TSFieldMapEntry)
);
language->field_names = copy_strings(
memory,