language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 12:29:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix out-of-bounds panic in some macros due to unhandled self_ref

Browse source
This commit is contained in:
HoLLy 2023-12-31 12:51:43 +01:00
parent e872f5085c
commit c13330971d
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/hir-expand/src/hygiene.rs
View file

@ -153,7 +153,7 @@ fn apply_mark_internal(
let mut opaque_and_semitransparent = syntax_context_data.opaque_and_semitransparent; let mut opaque_and_semitransparent = syntax_context_data.opaque_and_semitransparent;
if transparency >= Transparency::Opaque { if transparency >= Transparency::Opaque {
let parent = opaque; let parent = handle_self_ref(ctxt, opaque);
let new_opaque = SyntaxContextId::SELF_REF; let new_opaque = SyntaxContextId::SELF_REF;
// But we can't just grab the to be allocated ID either as that would not deduplicate // But we can't just grab the to be allocated ID either as that would not deduplicate
// things! // things!
@ -168,7 +168,7 @@ fn apply_mark_internal(
} }
if transparency >= Transparency::SemiTransparent { if transparency >= Transparency::SemiTransparent {
let parent = opaque_and_semitransparent; let parent = handle_self_ref(ctxt, opaque_and_semitransparent);
let new_opaque_and_semitransparent = SyntaxContextId::SELF_REF; let new_opaque_and_semitransparent = SyntaxContextId::SELF_REF;
opaque_and_semitransparent = db.intern_syntax_context(SyntaxContextData { opaque_and_semitransparent = db.intern_syntax_context(SyntaxContextData {
outer_expn: call_id, outer_expn: call_id,