diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-02-13 11:34:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-13 11:34:58 +0100 |
| commit | 3e5c11b855ad4be7e47e83a2432a6778638df0b6 (patch) | |
| tree | 0f749ed83485e300f16b947b2a8eab70daaf0007 /compiler/rustc_span/src | |
| parent | 8674adc25ce84312a13262af80a2914dfca7c3d7 (diff) | |
| parent | 84bb373b2a6a33ea136ba7c09642c2e321f24c62 (diff) | |
| download | rust-3e5c11b855ad4be7e47e83a2432a6778638df0b6.tar.gz rust-3e5c11b855ad4be7e47e83a2432a6778638df0b6.zip | |
Rollup merge of #107931 - cjgillot:issue-107353, r=WaffleLapkin
Intern span when length is MAX_LEN with parent. Fixes https://github.com/rust-lang/rust/issues/107353
Diffstat (limited to 'compiler/rustc_span/src')
| -rw-r--r-- | compiler/rustc_span/src/span_encoding.rs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/compiler/rustc_span/src/span_encoding.rs b/compiler/rustc_span/src/span_encoding.rs index d48c4f7e5a8..c600298c51a 100644 --- a/compiler/rustc_span/src/span_encoding.rs +++ b/compiler/rustc_span/src/span_encoding.rs @@ -110,11 +110,16 @@ impl Span { // Inline format with parent. let len_or_tag = len_or_tag | PARENT_MASK; let parent2 = parent.local_def_index.as_u32(); - if ctxt2 == SyntaxContext::root().as_u32() && parent2 <= MAX_CTXT { + if ctxt2 == SyntaxContext::root().as_u32() + && parent2 <= MAX_CTXT + && len_or_tag < LEN_TAG + { + debug_assert_ne!(len_or_tag, LEN_TAG); return Span { base_or_index: base, len_or_tag, ctxt_or_tag: parent2 as u16 }; } } else { // Inline format with ctxt. + debug_assert_ne!(len_or_tag, LEN_TAG); return Span { base_or_index: base, len_or_tag: len as u16, |