bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #137164 - matthiaskrgr:rollup-dj5826k, r=matthiaskrgr

Browse source 
Rollup of 7 pull requests

Successful merges:

 - #137095 (Replace some u64 hashes with Hash64)
 - #137100 (HIR analysis: Remove unnecessary abstraction over list of clauses)
 - #137105 (Restrict DerefPure for Cow<T> impl to T = impl Clone, [impl Clone], str.)
 - #137120 (Enable `relative-path-include-bytes-132203` rustdoc-ui test on Windows)
 - #137125 (Re-add missing empty lines in the releases notes)
 - #137145 (use add-core-stubs / minicore for a few more tests)
 - #137149 (Remove SSE ABI from i586-pc-windows-msvc)

r? `@ghost`
`@rustbot` modify labels: rollup
This commit is contained in:
bors 2025-02-17 11:18:33 +00:00
commit 2162e9d4b1
85 changed files with 462 additions and 454 deletions
Download patch file Download diff file Expand all files Collapse all files

1
compiler/rustc_ty_utils/Cargo.toml
View file

@ -11,6 +11,7 @@ rustc_ast_ir = { path = "../rustc_ast_ir" }
rustc_data_structures = { path = "../rustc_data_structures" }
rustc_errors = { path = "../rustc_errors" }
rustc_fluent_macro = { path = "../rustc_fluent_macro" }
rustc_hashes = { path = "../rustc_hashes" }
rustc_hir = { path = "../rustc_hir" }
rustc_index = { path = "../rustc_index" }
rustc_infer = { path = "../rustc_infer" }

13
compiler/rustc_ty_utils/src/layout.rs
View file

@ -9,6 +9,7 @@ use rustc_abi::{
HasDataLayout, Layout, LayoutCalculatorError, LayoutData, Niche, ReprOptions, Scalar, Size,
StructKind, TagEncoding, VariantIdx, Variants, WrappingRange,
};
use rustc_hashes::Hash64;
use rustc_index::bit_set::DenseBitSet;
use rustc_index::{IndexSlice, IndexVec};
use rustc_middle::bug;
@ -380,7 +381,7 @@ fn layout_of_uncached<'tcx>(
size,
max_repr_align: None,
unadjusted_abi_align: element.align.abi,
randomization_seed: element.randomization_seed.wrapping_add(count),
randomization_seed: element.randomization_seed.wrapping_add(Hash64::new(count)),
})
}
ty::Slice(element) => {
@ -395,7 +396,9 @@ fn layout_of_uncached<'tcx>(
max_repr_align: None,
unadjusted_abi_align: element.align.abi,
// adding a randomly chosen value to distinguish slices
randomization_seed: element.randomization_seed.wrapping_add(0x2dcba99c39784102),
randomization_seed: element
.randomization_seed
.wrapping_add(Hash64::new(0x2dcba99c39784102)),
})
}
ty::Str => tcx.mk_layout(LayoutData {
@ -408,7 +411,7 @@ fn layout_of_uncached<'tcx>(
max_repr_align: None,
unadjusted_abi_align: dl.i8_align.abi,
// another random value
randomization_seed: 0xc1325f37d127be22,
randomization_seed: Hash64::new(0xc1325f37d127be22),
}),
// Odd unit types.
@ -585,7 +588,7 @@ fn layout_of_uncached<'tcx>(
align,
max_repr_align: None,
unadjusted_abi_align: align.abi,
randomization_seed: e_ly.randomization_seed.wrapping_add(e_len),
randomization_seed: e_ly.randomization_seed.wrapping_add(Hash64::new(e_len)),
})
}
@ -1051,7 +1054,7 @@ fn coroutine_layout<'tcx>(
};
// this is similar to how ReprOptions populates its field_shuffle_seed
let def_hash = tcx.def_path_hash(def_id).0.to_smaller_hash().as_u64();
let def_hash = tcx.def_path_hash(def_id).0.to_smaller_hash();
let layout = tcx.mk_layout(LayoutData {
variants: Variants::Multiple {