Rollup of 16 pull requests - #160308
Closed
jhpratt wants to merge 41 commits into
Closed
Conversation
Constructing an Rc<[T]> or Arc<[T]> whose header + payload layout exceeds isize::MAX unwrapped a LayoutError, panicking with the opaque "called `Result::unwrap()` on an `Err` value: LayoutError". Match Vec and Box by reporting "capacity overflow" instead, and add regression tests.
This FIXME was added in [1], at which point there were 8 arguments. Now there are only 5, which is much more reasonable. This commit was brought to you by https://oli-obk.github.io/fixmeh/. [1]: rust-lang#78923
Forbid super/crate/self/Self to be used in register_tool. Also, add test for raw identifier and unicode identifiers.
This adds back the previously existing duplicate tool error, but as a suppressable lint.
This is already *supposed* to be impossible in layout, but this emphasizes that better. Ironically I was inspired to do this as part of looking at making `Simd<T, 0>` *work*, but importantly if that's going to happen I think it should be `BackendRepr::Memory` like other ZSTs, *not* a `BackendRepr::ScalarVector` that would need to carry around a useless LLVM value in `OperandValue::Immediate` (where it's not even clear what the LLVM type of that value would be).
* docs: document the non_exhaustive attribute * Add newline at end of attribute_docs.rs * Update library/core/src/attribute_docs.rs * Update library/core/src/attribute_docs.rs Co-authored-by: Guillaume Gomez <contact@guillaume-gomez.fr> Co-authored-by: Krisitan Erik Olsen <kristian.erik@outlook.com>
* fundamental only on first arg * woo this made error messages nicer * oh the test was misnamed lol * special case only box * rename tests Co-authored-by: Nia Deckers <nia-e@haecceity.cc>
Instead of displaying all kind of tuples that implement a given trait, which might flood the user, it displays a concise message only when all the involved types are tuples.
test case due to @maxdexh
…aethlin Drop elaboration: Only create a reset block if there are flags to reset. Follow-up to rust-lang#157491 I'm not totally convinced this is worth the effort. The generated pattern is trivially cleaned-up by SimplifyCfg, so we should not need to bother. r? @saethlin since you reviewed the earlier PR
…-5, r=saethlin Emit retags in codegen to support BorrowSanitizer (part 5) Tracking issue: rust-lang#154760 [Zulip Thread](https://rust-lang.zulipchat.com/#narrow/channel/131828-t-compiler/topic/Staging.20for.20emitting.20retags.20in.20codegen/with/592364811) This is one of several PRs that add experimental support for emitting retags as function calls in codegen. This PR adds support for emitting global arrays that specify the ranges of interior mutable and pinned data. For example, ```rust fn cell(x: &(i32, Cell<i32>)) { ... } ``` This program will have IR similar to the following: ```llvm @anon.0 = unnamed_addr constant [16 x i8] c"\04...\04..." define void @cell(ptr %0) { start: %x = call ptr @__rust_retag_reg(ptr %0, i64 8, i8 1, ptr @anon.0, ptr null) ... } ``` The last four bytes at offset four are interior mutable. Users can disable this behavior by passing `no-precise-im` or `no-precise-pin` as options to `-Zcodegen-emit-retag`. In that case, the last two parameters to the retag intrinsic will always be null pointers. BorrowSanitizer will be able to switch to using nightly once this is merged. Thank you @saethlin for reviewing these PRs! Note: we still do not support retagging SIMD types, since cg-ssa does not support `insertelement`. Related: rust-lang#158100 Cc: @RalfJung r? @saethlin
…overflow, r=JohnTitor Report "capacity overflow" for oversized Rc<[T]>/Arc<[T]> Fixes rust-lang#136797. Building an Rc<[T]>/Arc<[T]> whose header + payload layout exceeds isize::MAX unwrapped a LayoutError and panicked with "called Result::unwrap() on an Err value: LayoutError". Vec and Box report "capacity overflow" here; this makes Rc/Arc do the same. Used an inline panic!("capacity overflow") rather than raw_vec's capacity_overflow(), since that helper is cfg'd out under no_global_oom_handling while these two layout fns still compile there.
miri: ensure validity of references and pointers we dereference and cast
Conceptually, when we evaluate the place expression `*place`, there are two steps that happen:
- perform a (typed) load from `place`, which yields a value of pointer/ref type
- construct a new place from that value
Since this is a typed load, we have to ensure that the value satisfies the validity invariant. We forgot to do that, which led to Miri missing a bunch of UB. This PR fixes that by adding the missing checks.
Triggering this UB is a bit non-trivial: you cannot just store an invalid value into `place` using regular assignment (that would already be caught as part of the assignment). However, you can take a raw pointer to `place` and then use that to mutate the contents of `place` in a way that its validity invariant no longer holds. For example:
```rust
fn main() {
let mut x = &();
// Overwrite `x` with null.
unsafe { (&raw mut x).cast::<usize>().write(0) };
let _val = *x; //~ERROR: null reference
}
```
This program clearly (IMO) should have UB, and has UB in MiniRust, but Miri accepted that program before this PR. The same applies to references that are invalid because they are unaligned (even if we end up only accessing a 1-aligned field, i.e. the rest of the place expression evaluates just fine), and to references that are invalid because they are not dereferenceable (even if we end up projecting to a zero-sized field, i.e., the rest of the place expression evaluates just fine).
Even raw pointers have this problem: a raw pointer can be invalid if its vtable pointer is wrong, and we did not check that.
And finally, this also affects `Box`, and this is where things get tricky. `Box` derefs are not even present any more in the MIR Miri sees; they have been replaced by derefs of the underlying raw pointer. But that means we have no way to know that we should check all those things. So to fix that I adjusted the ElaborateBoxDerefs to emit a new special kind of cast that's almost a transmute but also checks `Box` validity.
Fixes rust-lang/miri#5226
Fixes rust-lang/unsafe-code-guidelines#617
Cc @rust-lang/opsem
make atomic operations const In a similar vein to rust-lang#159094, it makes sense to make these `const fn` so that code can be shared between compile-time and run-time even if the runtime version has to deal with concurrency. This constifies the following: ```rust // core::sync::atomic impl AtomicBool { pub const fn get_mut(&mut self) -> &mut bool; pub const fn from_mut(v: &mut bool) -> &mut Self; pub const fn get_mut_slice(this: &mut [Self]) -> &mut [bool]; pub const fn from_mut_slice(v: &mut [bool]) -> &mut [Self]; pub const fn load(&self, order: Ordering) -> bool; pub const fn store(&self, val: bool, order: Ordering); pub const fn swap(&self, val: bool, order: Ordering) -> bool; pub const fn compare_and_swap(&self, current: bool, new: bool, order: Ordering) -> bool; pub const fn compare_exchange( &self, current: bool, new: bool, success: Ordering, failure: Ordering, ) -> Result<bool, bool>; pub const fn compare_exchange_weak( &self, current: bool, new: bool, success: Ordering, failure: Ordering, ) -> Result<bool, bool>; pub const fn fetch_and(&self, val: bool, order: Ordering) -> bool; pub const fn fetch_nand(&self, val: bool, order: Ordering) -> bool; pub const fn fetch_or(&self, val: bool, order: Ordering) -> bool; pub const fn fetch_xor(&self, val: bool, order: Ordering) -> bool; pub const fn fetch_not(&self, order: Ordering) -> bool; } impl AtomicPtr<T> { pub const fn get_mut(&mut self) -> &mut *mut T; pub const fn from_mut(v: &mut *mut T) -> &mut Self; pub const fn get_mut_slice(this: &mut [Self]) -> &mut [*mut T]; pub const fn from_mut_slice(v: &mut [*mut T]) -> &mut [Self]; pub const fn load(&self, order: Ordering) -> *mut T; pub const fn store(&self, ptr: *mut T, order: Ordering); pub const fn swap(&self, ptr: *mut T, order: Ordering) -> *mut T; } impl Atomic$Int { pub const fn get_mut(&mut self) -> &mut $int_type; pub const fn from_mut(v: &mut $int_type) -> &mut Self; pub const fn get_mut_slice(this: &mut [Self]) -> &mut [$int_type]; pub const fn from_mut_slice(v: &mut [$int_type]) -> &mut [Self]; pub const fn load(&self, order: Ordering) -> $int_type; pub const fn store(&self, val: $int_type, order: Ordering); pub const fn swap(&self, val: $int_type, order: Ordering) -> $int_type; pub const fn compare_and_swap(&self, current: $int_type, new: $int_type, order: Ordering) -> $int_type; pub const fn compare_exchange(&self, current: $int_type, new: $int_type, success: Ordering, failure: Ordering) -> Result<$int_type, $int_type>; pub const fn compare_exchange_weak(&self, current: $int_type, new: $int_type, success: Ordering, failure: Ordering) -> Result<$int_type, $int_type>; pub const fn fetch_add(&self, val: $int_type, order: Ordering) -> $int_type; pub const fn fetch_sub(&self, val: $int_type, order: Ordering) -> $int_type; pub const fn fetch_and(&self, val: $int_type, order: Ordering) -> $int_type; pub const fn fetch_nand(&self, val: $int_type, order: Ordering) -> $int_type; pub const fn fetch_or(&self, val: $int_type, order: Ordering) -> $int_type; pub const fn fetch_xor(&self, val: $int_type, order: Ordering) -> $int_type; pub const fn fetch_max(&self, val: $int_type, order: Ordering) -> $int_type; pub const fn fetch_min(&self, val: $int_type, order: Ordering) -> $int_type; } pub const fn fence(order: Ordering); pub const fn compiler_fence(order: Ordering); ``` However, this excludes the `fetch_*` and `compare_*` operations on `AtomicPtr`, as that kind of pointer arithmetic is not possible at compile time. Tracking issue: rust-lang#160078 Cc @rust-lang/wg-const-eval @rust-lang/opsem
…ttribute, r=GuillaumeGomez Add documentation for the `non_exhaustive` attribute Document the built-in `non_exhaustive` attribute using the `#[doc(attribute = "…")]` mechanism. Part of rust-lang#157604 Tested with `./x test library/std --doc --test-args attribute_docs`. r? @GuillaumeGomez
Fix `hidden_glob_reexports` in `rustc_ast` See rust-lang#159901 for why the downstream changes are necessary
Align expect messages with guidance Issue: rust-lang#159751 - Changed 3 `expect` messages and some relevant comments in `library/core/src/result.rs` and `library/core/src/primitive_docs.rs` - I intentionally left the below snippet unchanged in `library/core/src/result.rs`. The example is quite minimal and focuses on showing the panic output format, so I thought it was better to keep the message short and simple. ``` /// # Panics /// /// Panics if the value is an [`Err`], with a panic message including the /// passed message, and the content of the [`Err`]. /// /// /// # Examples /// /// ```should_panic /// let x: Result<u32, &str> = Err("emergency failure"); /// x.expect("Testing expect"); // panics with `Testing expect: emergency failure` /// ``` ``` r? @fee1-dead
Expand checks for register_tool Follow up to rust-lang#158038 (review) and rust-lang#158038 (comment) * Add tool-attribute test to ensure tools are not preserved across crate * Reject invalid identifiers (super/self/Self/crate) in register_tool * Add lint for duplicate tools r? @mejrs
…GuillaumeGomez Update `minifier` version to `0.4.0` Contains security fix added by @Eh2406 done in GuillaumeGomez/minifier-rs#130. r? ghost
Member
Author
Contributor
This comment has been minimized.
This comment has been minimized.
rust-bors Bot
pushed a commit
that referenced
this pull request
Aug 1, 2026
Rollup of 16 pull requests try-job: dist-various-1 try-job: test-various try-job: x86_64-gnu-aux try-job: x86_64-gnu-llvm-21-3 try-job: x86_64-msvc-1 try-job: aarch64-apple try-job: x86_64-mingw-1 try-job: i686-msvc-*
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
Contributor
|
PR #160012, which is a member of this rollup, was unapproved. This rollup was thus unapproved. |
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
Contributor
|
💔 Test for aa67491 failed: CI. Failed jobs:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Successful merges:
BackendRepr::SimdVectors #160124 (Structurally prevent zero-countBackendRepr::SimdVectors)#[fundamental]only apply to the first argument ofBox#160162 (Make#[fundamental]only apply to the first argument ofBox)non_exhaustiveattribute #159861 (Add documentation for thenon_exhaustiveattribute)hidden_glob_reexportsinrustc_ast#159907 (Fixhidden_glob_reexportsinrustc_ast)minifierversion to0.4.0#160307 (Updateminifierversion to0.4.0)r? @ghost
Create a similar rollup