fix(wasm): load supertype tables for ABI 15 grammars#5605
Merged
Conversation
The wasm store gated supertype_symbols / supertype_map_slices / supertype_map_entries copies on abi_version > LANGUAGE_VERSION_WITH_RESERVED_WORDS, but every other consumer (language.c, query.c) treats those tables as present when abi_version >= LANGUAGE_VERSION_WITH_RESERVED_WORDS. A Wasm grammar built at ABI exactly 15 with supertype_count > 0 ends up with supertype_count copied into the native TSLanguage but supertype_map_slices left NULL. ts_query__analyze_patterns then calls ts_language_subtypes, which dereferences self->supertype_map_slices[supertype] and crashes.
amaanq
approved these changes
May 18, 2026
|
Successfully created backport PR for |
maxbrunsfeld
added a commit
that referenced
this pull request
May 18, 2026
The wasm store gated supertype_symbols / supertype_map_slices / supertype_map_entries copies on abi_version > LANGUAGE_VERSION_WITH_RESERVED_WORDS, but every other consumer (language.c, query.c) treats those tables as present when abi_version >= LANGUAGE_VERSION_WITH_RESERVED_WORDS. A Wasm grammar built at ABI exactly 15 with supertype_count > 0 ends up with supertype_count copied into the native TSLanguage but supertype_map_slices left NULL. ts_query__analyze_patterns then calls ts_language_subtypes, which dereferences self->supertype_map_slices[supertype] and crashes. (cherry picked from commit a53c3b0) Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>
Contributor
Author
|
@amaanq @WillLillis @clason Are you guys ok with doing a 0.26 patch release just for this? |
Member
|
We've been conscientious in backporting other fixes, so there's more than this in the pipeline. Let me check if there are recently merged PRs missing a (merged) backport, then I can trigger the release if @WillLillis agrees. |
Member
|
The NO_COLOR fix that was bundled in with #5594 could be done separately on the release branch (without the painting changes) but isn't super important. #5569 might be nice to have but that's completely up to you, I'm not sure how that would impact Zed. Beyond those two I think our release branch is in solid shape, I don't see any issue with another patch release 🙂 |
Contributor
Author
|
Yes, #5569 Seems like it'd be good to get in too. |
Member
|
Luckily it backported cleanly, so I'll merge it once the CI is green, re-trigger the release checks, and publish once they pass, too. |
Member
|
While we wait, you could take a look at @WillLillis' last comment on the CSR PR ;) |
pull Bot
pushed a commit
to Jaleel-zhu/zed
that referenced
this pull request
May 20, 2026
This PR upgrades `tree-sitter` to v0.26.9. We're interested in tree-sitter/tree-sitter#5605, which should fix a panic when loading certain grammars. Closes FR-1. Release Notes: - Fixed a panic when loading certain Tree-sitter grammars containing supertypes.
TomPlanche
pushed a commit
to TomPlanche/zed
that referenced
this pull request
May 20, 2026
This PR upgrades `tree-sitter` to v0.26.9. We're interested in tree-sitter/tree-sitter#5605, which should fix a panic when loading certain grammars. Closes FR-1. Release Notes: - Fixed a panic when loading certain Tree-sitter grammars containing supertypes.
jasonsmithio
pushed a commit
to paddleboarddev/paddleboard
that referenced
this pull request
May 31, 2026
This PR upgrades `tree-sitter` to v0.26.9. We're interested in tree-sitter/tree-sitter#5605, which should fix a panic when loading certain grammars. Closes FR-1. Release Notes: - Fixed a panic when loading certain Tree-sitter grammars containing supertypes.
TomPlanche
pushed a commit
to TomPlanche/zed
that referenced
this pull request
Jun 2, 2026
This PR upgrades `tree-sitter` to v0.26.9. We're interested in tree-sitter/tree-sitter#5605, which should fix a panic when loading certain grammars. Closes FR-1. Release Notes: - Fixed a panic when loading certain Tree-sitter grammars containing supertypes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Problem
Query construction can crash when grammars that use supertypes, are compiled with ABI version 15, and are loaded via Wasm.
Background
Supertypes were introduced in ABI version 15, the same ABI version that introduced reserved words. Methods that access a language's supertypes check that the grammar's ABI version is greater than or equal to 15.
But when loading a language via Wasm, we were neglecting to load supertype data unless the language's abi version was strictly greater than 15.
Switching the check to
>=matches the convention used everywhere else forLANGUAGE_VERSION_WITH_RESERVED_WORDSand fixes the crash.This was observed as a SIGSEGV in
ts_language_subtypesreaching users via Zed loading tree-sitter grammars compiled to Wasm.AI Use
I found this bug by showing Claude Opus 4.7 the crash backtrace and directing it to inspect
ts_wasm_store_load_language, since that Wasm loading logic has been problematic in the past.