Skip to content

Commit 3d1dba8

Browse files
borsbors
committed
Auto merge of #132722 - joboet:rollup-0q67jyo, r=joboet
Rollup of 6 pull requests Successful merges: - #132057 (miri: update ABI compat checks to accept Option-like types) - #132665 (Implement `div_ceil` for `NonZero<unsigned>`) - #132694 (fix(x): fix a regex used to find python executable) - #132707 (Add --diagnostic-width to some tests failing after 1a0c502) - #132715 (fix `LazyLock::get` and `LazyLock::get_mut` document) - #132716 (chore(issue-template): fix branch name) r? `@ghost` `@rustbot` modify labels: rollup
2 parents fe43131 + 194ce89 commit 3d1dba8

File tree

15 files changed

+150
-76
lines changed

15 files changed

+150
-76
lines changed

‎.github/ISSUE_TEMPLATE/tracking_issue.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ for larger features an implementation could be broken up into multiple PRs.
4646

4747
[stabilization-guide]: https://rustc-dev-guide.rust-lang.org/stabilization_guide.html#stabilization-pr
4848
[doc-guide]: https://rustc-dev-guide.rust-lang.org/stabilization_guide.html#documentation-prs
49-
[nightly-style-procedure]: https://github.com/rust-lang/style-team/blob/master/nightly-style-procedure.md
49+
[nightly-style-procedure]: https://github.com/rust-lang/style-team/blob/main/nightly-style-procedure.md
5050
[Style Guide]: https://github.com/rust-lang/rust/tree/master/src/doc/style-guide
5151

5252
### Unresolved Questions

‎compiler/rustc_const_eval/src/interpret/call.rs

+35-18
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ use std::assert_matches::assert_matches;
44
use std::borrow::Cow;
55

66
use either::{Left, Right};
7-
use rustc_abi::{self as abi, ExternAbi, FieldIdx, Integer};
7+
use rustc_abi::{self as abi, ExternAbi, FieldIdx, Integer, VariantIdx};
88
use rustc_middle::ty::layout::{FnAbiOf, IntegerExt, LayoutOf, TyAndLayout};
9-
use rustc_middle::ty::{self, AdtDef, Instance, Ty};
9+
use rustc_middle::ty::{self, AdtDef, Instance, Ty, VariantDef};
1010
use rustc_middle::{bug, mir, span_bug};
1111
use rustc_span::sym;
1212
use rustc_target::callconv::{ArgAbi, FnAbi, PassMode};
@@ -92,29 +92,46 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
9292

9393
/// Unwrap types that are guaranteed a null-pointer-optimization
9494
fn unfold_npo(&self, layout: TyAndLayout<'tcx>) -> InterpResult<'tcx, TyAndLayout<'tcx>> {
95-
// Check if this is `Option` wrapping some type or if this is `Result` wrapping a 1-ZST and
96-
// another type.
95+
// Check if this is an option-like type wrapping some type.
9796
let ty::Adt(def, args) = layout.ty.kind() else {
9897
// Not an ADT, so definitely no NPO.
9998
return interp_ok(layout);
10099
};
101-
let inner = if self.tcx.is_diagnostic_item(sym::Option, def.did()) {
102-
// The wrapped type is the only arg.
103-
self.layout_of(args[0].as_type().unwrap())?
104-
} else if self.tcx.is_diagnostic_item(sym::Result, def.did()) {
105-
// We want to extract which (if any) of the args is not a 1-ZST.
106-
let lhs = self.layout_of(args[0].as_type().unwrap())?;
107-
let rhs = self.layout_of(args[1].as_type().unwrap())?;
108-
if lhs.is_1zst() {
109-
rhs
110-
} else if rhs.is_1zst() {
111-
lhs
112-
} else {
113-
return interp_ok(layout); // no NPO
100+
if def.variants().len() != 2 {
101+
// Not a 2-variant enum, so no NPO.
102+
return interp_ok(layout);
103+
}
104+
assert!(def.is_enum());
105+
106+
let all_fields_1zst = |variant: &VariantDef| -> InterpResult<'tcx, _> {
107+
for field in &variant.fields {
108+
let ty = field.ty(*self.tcx, args);
109+
let layout = self.layout_of(ty)?;
110+
if !layout.is_1zst() {
111+
return interp_ok(false);
112+
}
114113
}
114+
interp_ok(true)
115+
};
116+
117+
// If one variant consists entirely of 1-ZST, then the other variant
118+
// is the only "relevant" one for this check.
119+
let var0 = VariantIdx::from_u32(0);
120+
let var1 = VariantIdx::from_u32(1);
121+
let relevant_variant = if all_fields_1zst(def.variant(var0))? {
122+
def.variant(var1)
123+
} else if all_fields_1zst(def.variant(var1))? {
124+
def.variant(var0)
115125
} else {
116-
return interp_ok(layout); // no NPO
126+
// No varant is all-1-ZST, so no NPO.
127+
return interp_ok(layout);
117128
};
129+
// The "relevant" variant must have exactly one field, and its type is the "inner" type.
130+
if relevant_variant.fields.len() != 1 {
131+
return interp_ok(layout);
132+
}
133+
let inner = relevant_variant.fields[FieldIdx::from_u32(0)].ty(*self.tcx, args);
134+
let inner = self.layout_of(inner)?;
118135

119136
// Check if the inner type is one of the NPO-guaranteed ones.
120137
// For that we first unpeel transparent *structs* (but not unions).

‎library/core/src/num/nonzero.rs

+29
Original file line numberDiff line numberDiff line change
@@ -1214,6 +1214,35 @@ macro_rules! nonzero_integer_signedness_dependent_impls {
12141214
*self = *self % other;
12151215
}
12161216
}
1217+
1218+
impl NonZero<$Int> {
1219+
/// Calculates the quotient of `self` and `rhs`, rounding the result towards positive infinity.
1220+
///
1221+
/// The result is guaranteed to be non-zero.
1222+
///
1223+
/// # Examples
1224+
///
1225+
/// ```
1226+
/// # #![feature(unsigned_nonzero_div_ceil)]
1227+
/// # use std::num::NonZero;
1228+
#[doc = concat!("let one = NonZero::new(1", stringify!($Int), ").unwrap();")]
1229+
#[doc = concat!("let max = NonZero::new(", stringify!($Int), "::MAX).unwrap();")]
1230+
/// assert_eq!(one.div_ceil(max), one);
1231+
///
1232+
#[doc = concat!("let two = NonZero::new(2", stringify!($Int), ").unwrap();")]
1233+
#[doc = concat!("let three = NonZero::new(3", stringify!($Int), ").unwrap();")]
1234+
/// assert_eq!(three.div_ceil(two), two);
1235+
/// ```
1236+
#[unstable(feature = "unsigned_nonzero_div_ceil", issue = "none")]
1237+
#[must_use = "this returns the result of the operation, \
1238+
without modifying the original"]
1239+
#[inline]
1240+
pub const fn div_ceil(self, rhs: Self) -> Self {
1241+
let v = self.get().div_ceil(rhs.get());
1242+
// SAFETY: ceiled division of two positive integers can never be zero.
1243+
unsafe { Self::new_unchecked(v) }
1244+
}
1245+
}
12171246
};
12181247
// Impls for signed nonzero types only.
12191248
(signed $Int:ty) => {

‎library/std/src/sync/lazy_lock.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ impl<T, F: FnOnce() -> T> LazyLock<T, F> {
226226
}
227227

228228
impl<T, F> LazyLock<T, F> {
229-
/// Returns a reference to the value if initialized, or `None` if not.
229+
/// Returns a mutable reference to the value if initialized, or `None` if not.
230230
///
231231
/// # Examples
232232
///
@@ -255,7 +255,7 @@ impl<T, F> LazyLock<T, F> {
255255
}
256256
}
257257

258-
/// Returns a mutable reference to the value if initialized, or `None` if not.
258+
/// Returns a reference to the value if initialized, or `None` if not.
259259
///
260260
/// # Examples
261261
///

‎src/tools/miri/tests/pass/function_calls/abi_compat.rs

+24
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#![feature(never_type)]
2+
13
use std::rc::Rc;
24
use std::{mem, num, ptr};
35

@@ -12,6 +14,18 @@ fn id<T>(x: T) -> T {
1214
x
1315
}
1416

17+
#[derive(Copy, Clone)]
18+
enum Either<T, U> {
19+
Left(T),
20+
Right(U),
21+
}
22+
#[derive(Copy, Clone)]
23+
enum Either2<T, U> {
24+
Left(T),
25+
#[allow(unused)]
26+
Right(U, ()),
27+
}
28+
1529
fn test_abi_compat<T: Clone, U: Clone>(t: T, u: U) {
1630
fn id<T>(x: T) -> T {
1731
x
@@ -81,6 +95,8 @@ fn main() {
8195
test_abi_compat(main as fn(), id::<i32> as fn(i32) -> i32);
8296
// - 1-ZST
8397
test_abi_compat((), [0u8; 0]);
98+
99+
// Guaranteed null-pointer-layout optimizations:
84100
// - Guaranteed Option<X> null-pointer-optimizations (RFC 3391).
85101
test_abi_compat(&0u32 as *const u32, Some(&0u32));
86102
test_abi_compat(main as fn(), Some(main as fn()));
@@ -89,6 +105,7 @@ fn main() {
89105
test_abi_compat(0u32, Some(Wrapper(num::NonZeroU32::new(1u32).unwrap())));
90106
// - Guaranteed Result<X, ZST1> does the same as Option<X> (RFC 3391)
91107
test_abi_compat(&0u32 as *const u32, Result::<_, ()>::Ok(&0u32));
108+
test_abi_compat(&0u32 as *const u32, Result::<_, !>::Ok(&0u32));
92109
test_abi_compat(main as fn(), Result::<_, ()>::Ok(main as fn()));
93110
test_abi_compat(0u32, Result::<_, ()>::Ok(num::NonZeroU32::new(1).unwrap()));
94111
test_abi_compat(&0u32 as *const u32, Result::<_, ()>::Ok(Wrapper(&0u32)));
@@ -99,6 +116,13 @@ fn main() {
99116
test_abi_compat(0u32, Result::<(), _>::Err(num::NonZeroU32::new(1).unwrap()));
100117
test_abi_compat(&0u32 as *const u32, Result::<(), _>::Err(Wrapper(&0u32)));
101118
test_abi_compat(0u32, Result::<(), _>::Err(Wrapper(num::NonZeroU32::new(1).unwrap())));
119+
// - Guaranteed null-pointer-optimizations for custom option-like types
120+
test_abi_compat(&0u32 as *const u32, Either::<_, ()>::Left(&0u32));
121+
test_abi_compat(&0u32 as *const u32, Either::<_, !>::Left(&0u32));
122+
test_abi_compat(&0u32 as *const u32, Either::<(), _>::Right(&0u32));
123+
test_abi_compat(&0u32 as *const u32, Either::<!, _>::Right(&0u32));
124+
test_abi_compat(&0u32 as *const u32, Either2::<_, ()>::Left(&0u32));
125+
test_abi_compat(&0u32 as *const u32, Either2::<_, [u8; 0]>::Left(&0u32));
102126

103127
// These must work for *any* type, since we guarantee that `repr(transparent)` is ABI-compatible
104128
// with the wrapped field.

‎tests/ui/coroutine/clone-impl-async.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
//@ edition:2021
2+
//@compile-flags: --diagnostic-width=300
23
// gate-test-coroutine_clone
34
// Verifies that feature(coroutine_clone) doesn't allow async blocks to be cloned/copied.
45

0 commit comments

Comments
 (0)