bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

use old ctx if has same expand environment during decode span

Browse source
This commit is contained in:
bohan 2024-07-05 00:59:58 +08:00
parent 9f877c9cd2
commit 07481b9e90
2 changed files with 42 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_span/src/hygiene.rs
View file

@ -1413,6 +1413,14 @@ pub fn decode_syntax_context<D: Decoder, F: FnOnce(&mut D, u32) -> SyntaxContext
// Overwrite the dummy data with our decoded SyntaxContextData
HygieneData::with(|hygiene_data| {
if let Some(old) = hygiene_data.syntax_context_data.get(raw_id as usize)
&& old.outer_expn == ctxt_data.outer_expn
&& old.outer_transparency == ctxt_data.outer_transparency
&& old.parent == ctxt_data.parent
{
ctxt_data = old.clone();
}
let dummy = std::mem::replace(
&mut hygiene_data.syntax_context_data[ctxt.as_u32() as usize],
ctxt_data,