diff options
| author | bors <bors@rust-lang.org> | 2023-08-25 07:02:01 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-08-25 07:02:01 +0000 |
| commit | 4535d33e337104e7961ca7f2086627cbb07919dd (patch) | |
| tree | 9f14e509b5c90ab2617c11b372d7014f73c9a07d /compiler/rustc_span/src | |
| parent | c9228aeaba61f57d425593f4cbbc26e4a6750a9d (diff) | |
| parent | 021e882c34e29a977e079f6be918fdc8d4e6f61f (diff) | |
| download | rust-4535d33e337104e7961ca7f2086627cbb07919dd.tar.gz rust-4535d33e337104e7961ca7f2086627cbb07919dd.zip | |
Auto merge of #115204 - matthiaskrgr:rollup-avsp3t3, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #114754 (Name what ln_gamma does) - #115081 (Allow overwriting ExpnId for concurrent decoding) - #115151 (Fix CFI: f32 and f64 are encoded incorrectly for cross-language CFI) - #115169 (remove some unnecessary ignore-debug clauses) - #115190 (Add comment to the push_trailing function) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_span/src')
| -rw-r--r-- | compiler/rustc_span/src/hygiene.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_span/src/hygiene.rs b/compiler/rustc_span/src/hygiene.rs index ab57d5c6803..88081700c3b 100644 --- a/compiler/rustc_span/src/hygiene.rs +++ b/compiler/rustc_span/src/hygiene.rs @@ -1291,11 +1291,11 @@ pub fn register_expn_id( let expn_id = ExpnId { krate, local_id }; HygieneData::with(|hygiene_data| { let _old_data = hygiene_data.foreign_expn_data.insert(expn_id, data); - debug_assert!(_old_data.is_none()); + debug_assert!(_old_data.is_none() || cfg!(parallel_compiler)); let _old_hash = hygiene_data.foreign_expn_hashes.insert(expn_id, hash); - debug_assert!(_old_hash.is_none()); + debug_assert!(_old_hash.is_none() || _old_hash == Some(hash)); let _old_id = hygiene_data.expn_hash_to_expn_id.insert(hash, expn_id); - debug_assert!(_old_id.is_none()); + debug_assert!(_old_id.is_none() || _old_id == Some(expn_id)); }); expn_id } |