mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #16221 - holly-hacker:fix-16200, r=lnicola

Browse Source 
fix: Fix out-of-bounds panic in some macros due to unhandled self_ref

Fixes #16200

I don't fully understand these changes, I just applied and tested the changes suggested in #16200 and they seem to fix the issue on both the repro and my original project.
This commit is contained in:
bors 2023-12-31 14:50:02 +00:00
commit cf52c4b2b3
1 changed files with 2 additions and 2 deletions
Show Stats 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;
if transparency >= Transparency::Opaque {
let parent = opaque;
let parent = handle_self_ref(ctxt, opaque);
let new_opaque = SyntaxContextId::SELF_REF;
// But we can't just grab the to be allocated ID either as that would not deduplicate
// things!
@ -168,7 +168,7 @@ fn apply_mark_internal(
}
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;
opaque_and_semitransparent = db.intern_syntax_context(SyntaxContextData {
outer_expn: call_id,