Skip to content

Commit 9caa535

Browse files
borsbors
committed
Auto merge of #122031 - matthiaskrgr:rollup-mp1ii7n, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - #121280 (Implement MaybeUninit::fill{,_with,_from}) - #121438 (std support for wasm32 panic=unwind) - #121658 (Hint user to update nightly on ICEs produced from outdated nightly) - #121959 (Removing absolute path in proc-macro) - #121961 (add test for #78894 #71450) - #121975 (hir_analysis: enums return `None` in `find_field`) - #121978 (Fix duplicated path in the "not found dylib" error) - #121991 (Merge impl_trait_in_assoc_types_defined_by query back into `opaque_types_defined_by`) - #122016 (will_wake tests fail on Miri and that is expected) - #122018 (only set noalias on Box with the global allocator) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 96561a8 + 8834019 commit 9caa535

File tree

52 files changed

+841
-133
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+841
-133
lines changed

‎compiler/rustc_abi/src/lib.rs

+5-2
Original file line numberDiff line numberDiff line change
@@ -1612,8 +1612,9 @@ pub enum PointerKind {
16121612
SharedRef { frozen: bool },
16131613
/// Mutable reference. `unpin` indicates the absence of any pinned data.
16141614
MutableRef { unpin: bool },
1615-
/// Box. `unpin` indicates the absence of any pinned data.
1616-
Box { unpin: bool },
1615+
/// Box. `unpin` indicates the absence of any pinned data. `global` indicates whether this box
1616+
/// uses the global allocator or a custom one.
1617+
Box { unpin: bool, global: bool },
16171618
}
16181619

16191620
/// Note that this information is advisory only, and backends are free to ignore it.
@@ -1622,6 +1623,8 @@ pub enum PointerKind {
16221623
pub struct PointeeInfo {
16231624
pub size: Size,
16241625
pub align: Align,
1626+
/// If this is `None`, then this is a raw pointer, so size and alignment are not guaranteed to
1627+
/// be reliable.
16251628
pub safe: Option<PointerKind>,
16261629
}
16271630

‎compiler/rustc_codegen_cranelift/example/mini_core.rs

+5-2
Original file line numberDiff line numberDiff line change
@@ -525,8 +525,11 @@ pub struct Unique<T: ?Sized> {
525525
impl<T: ?Sized, U: ?Sized> CoerceUnsized<Unique<U>> for Unique<T> where T: Unsize<U> {}
526526
impl<T: ?Sized, U: ?Sized> DispatchFromDyn<Unique<U>> for Unique<T> where T: Unsize<U> {}
527527

528+
#[lang = "global_alloc_ty"]
529+
pub struct Global;
530+
528531
#[lang = "owned_box"]
529-
pub struct Box<T: ?Sized, A = ()>(Unique<T>, A);
532+
pub struct Box<T: ?Sized, A = Global>(Unique<T>, A);
530533

531534
impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<Box<U>> for Box<T> {}
532535

@@ -536,7 +539,7 @@ impl<T> Box<T> {
536539
let size = intrinsics::size_of::<T>();
537540
let ptr = libc::malloc(size);
538541
intrinsics::copy(&val as *const T as *const u8, ptr, size);
539-
Box(Unique { pointer: NonNull(ptr as *const T), _marker: PhantomData }, ())
542+
Box(Unique { pointer: NonNull(ptr as *const T), _marker: PhantomData }, Global)
540543
}
541544
}
542545
}

‎compiler/rustc_codegen_cranelift/src/unsize.rs

-4
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,6 @@ fn unsize_ptr<'tcx>(
7474
| (&ty::RawPtr(ty::TypeAndMut { ty: a, .. }), &ty::RawPtr(ty::TypeAndMut { ty: b, .. })) => {
7575
(src, unsized_info(fx, *a, *b, old_info))
7676
}
77-
(&ty::Adt(def_a, _), &ty::Adt(def_b, _)) if def_a.is_box() && def_b.is_box() => {
78-
let (a, b) = (src_layout.ty.boxed_ty(), dst_layout.ty.boxed_ty());
79-
(src, unsized_info(fx, a, b, old_info))
80-
}
8177
(&ty::Adt(def_a, _), &ty::Adt(def_b, _)) => {
8278
assert_eq!(def_a, def_b);
8379

‎compiler/rustc_codegen_gcc/example/mini_core.rs

+1
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,7 @@ pub trait Allocator {
472472

473473
impl Allocator for () {}
474474

475+
#[lang = "global_alloc_ty"]
475476
pub struct Global;
476477

477478
impl Allocator for Global {}

‎compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -454,9 +454,13 @@ pub fn type_di_node<'ll, 'tcx>(cx: &CodegenCx<'ll, 'tcx>, t: Ty<'tcx>) -> &'ll D
454454
ty::RawPtr(ty::TypeAndMut { ty: pointee_type, .. }) | ty::Ref(_, pointee_type, _) => {
455455
build_pointer_or_reference_di_node(cx, t, pointee_type, unique_type_id)
456456
}
457-
// Box<T, A> may have a non-1-ZST allocator A. In that case, we
458-
// cannot treat Box<T, A> as just an owned alias of `*mut T`.
459-
ty::Adt(def, args) if def.is_box() && cx.layout_of(args.type_at(1)).is_1zst() => {
457+
// Some `Box` are newtyped pointers, make debuginfo aware of that.
458+
// Only works if the allocator argument is a 1-ZST and hence irrelevant for layout
459+
// (or if there is no allocator argument).
460+
ty::Adt(def, args)
461+
if def.is_box()
462+
&& args.get(1).map_or(true, |arg| cx.layout_of(arg.expect_ty()).is_1zst()) =>
463+
{
460464
build_pointer_or_reference_di_node(cx, t, t.boxed_ty(), unique_type_id)
461465
}
462466
ty::FnDef(..) | ty::FnPtr(_) => build_subroutine_type_di_node(cx, unique_type_id),

‎compiler/rustc_codegen_llvm/src/llvm_util.rs

+9
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ use crate::errors::{
55
};
66
use crate::llvm;
77
use libc::c_int;
8+
use rustc_codegen_ssa::base::wants_wasm_eh;
89
use rustc_codegen_ssa::traits::PrintBackendInfo;
910
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
1011
use rustc_data_structures::small_c_str::SmallCStr;
@@ -98,6 +99,10 @@ unsafe fn configure_llvm(sess: &Session) {
9899
}
99100
}
100101

102+
if wants_wasm_eh(sess) {
103+
add("-wasm-enable-eh", false);
104+
}
105+
101106
if sess.target.os == "emscripten" && sess.panic_strategy() == PanicStrategy::Unwind {
102107
add("-enable-emscripten-cxx-exceptions", false);
103108
}
@@ -517,6 +522,10 @@ pub(crate) fn global_llvm_features(sess: &Session, diagnostics: bool) -> Vec<Str
517522
.map(String::from),
518523
);
519524

525+
if wants_wasm_eh(sess) && sess.panic_strategy() == PanicStrategy::Unwind {
526+
features.push("+exception-handling".into());
527+
}
528+
520529
// -Ctarget-features
521530
let supported_features = sess.target.supported_target_features();
522531
let mut featsmap = FxHashMap::default();

‎compiler/rustc_codegen_ssa/src/mir/block.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1571,7 +1571,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
15711571
let funclet;
15721572
let llbb;
15731573
let mut bx;
1574-
if base::wants_msvc_seh(self.cx.sess()) {
1574+
if base::wants_new_eh_instructions(self.cx.sess()) {
15751575
// This is a basic block that we're aborting the program for,
15761576
// notably in an `extern` function. These basic blocks are inserted
15771577
// so that we assert that `extern` functions do indeed not panic,

‎compiler/rustc_codegen_ssa/src/mir/operand.rs

+1
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ impl<'a, 'tcx, V: CodegenObject> OperandRef<'tcx, V> {
204204

205205
pub fn deref<Cx: LayoutTypeMethods<'tcx>>(self, cx: &Cx) -> PlaceRef<'tcx, V> {
206206
if self.layout.ty.is_box() {
207+
// Derefer should have removed all Box derefs
207208
bug!("dereferencing {:?} in codegen", self.layout.ty);
208209
}
209210

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

+1
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,7 @@ where
437437
trace!("deref to {} on {:?}", val.layout.ty, *val);
438438

439439
if val.layout.ty.is_box() {
440+
// Derefer should have removed all Box derefs
440441
bug!("dereferencing {}", val.layout.ty);
441442
}
442443

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

+2-8
Original file line numberDiff line numberDiff line change
@@ -359,14 +359,8 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
359359
Ok(Some(match ty.kind() {
360360
ty::Ref(_, ty, _) => *ty,
361361
ty::RawPtr(mt) => mt.ty,
362-
// We should only accept `Box` with the default allocator.
363-
// It's hard to test for that though so we accept every 1-ZST allocator.
364-
ty::Adt(def, args)
365-
if def.is_box()
366-
&& self.layout_of(args[1].expect_ty()).is_ok_and(|l| l.is_1zst()) =>
367-
{
368-
args[0].expect_ty()
369-
}
362+
// We only accept `Box` with the default allocator.
363+
_ if ty.is_box_global(*self.tcx) => ty.boxed_ty(),
370364
_ => return Ok(None),
371365
}))
372366
};

‎compiler/rustc_driver_impl/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ rustc_trait_selection = { path = "../rustc_trait_selection" }
5050
rustc_ty_utils = { path = "../rustc_ty_utils" }
5151
serde_json = "1.0.59"
5252
shlex = "1.0"
53-
time = { version = "0.3", default-features = false, features = ["alloc", "formatting"] }
53+
time = { version = "0.3", default-features = false, features = ["alloc", "formatting", "parsing", "macros"] }
5454
tracing = { version = "0.1.35" }
5555
# tidy-alphabetical-end
5656

‎compiler/rustc_driver_impl/messages.ftl

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
driver_impl_ice = the compiler unexpectedly panicked. this is a bug.
22
driver_impl_ice_bug_report = we would appreciate a bug report: {$bug_report_url}
33
driver_impl_ice_bug_report_internal_feature = using internal features is not supported and expected to cause internal compiler errors when used incorrectly
4+
driver_impl_ice_bug_report_outdated =
5+
it seems that this compiler `{$version}` is outdated, a newer nightly should have been released in the mean time
6+
.update = please consider running `rustup update nightly` to update the nightly channel and check if this problem still persists
7+
.url = if the problem still persists, we would appreciate a bug report: {$bug_report_url}
48
driver_impl_ice_exclude_cargo_defaults = some of the compiler flags provided by cargo are hidden
59
610
driver_impl_ice_flags = compiler flags: {$flags}

‎compiler/rustc_driver_impl/src/lib.rs

+31-4
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ use std::str;
5858
use std::sync::atomic::{AtomicBool, Ordering};
5959
use std::sync::{Arc, OnceLock};
6060
use std::time::{Instant, SystemTime};
61-
use time::OffsetDateTime;
61+
use time::{Date, OffsetDateTime, Time};
6262

6363
#[allow(unused_macros)]
6464
macro do_not_use_print($($t:tt)*) {
@@ -1369,6 +1369,9 @@ pub fn install_ice_hook(
13691369
using_internal_features
13701370
}
13711371

1372+
const DATE_FORMAT: &[time::format_description::FormatItem<'static>] =
1373+
&time::macros::format_description!("[year]-[month]-[day]");
1374+
13721375
/// Prints the ICE message, including query stack, but without backtrace.
13731376
///
13741377
/// The message will point the user at `bug_report_url` to report the ICE.
@@ -1397,10 +1400,34 @@ fn report_ice(
13971400
dcx.emit_err(session_diagnostics::Ice);
13981401
}
13991402

1400-
if using_internal_features.load(std::sync::atomic::Ordering::Relaxed) {
1401-
dcx.emit_note(session_diagnostics::IceBugReportInternalFeature);
1403+
use time::ext::NumericalDuration;
1404+
1405+
// Try to hint user to update nightly if applicable when reporting an ICE.
1406+
// Attempt to calculate when current version was released, and add 12 hours
1407+
// as buffer. If the current version's release timestamp is older than
1408+
// the system's current time + 24 hours + 12 hours buffer if we're on
1409+
// nightly.
1410+
if let Some("nightly") = option_env!("CFG_RELEASE_CHANNEL")
1411+
&& let Some(version) = option_env!("CFG_VERSION")
1412+
&& let Some(ver_date_str) = option_env!("CFG_VER_DATE")
1413+
&& let Ok(ver_date) = Date::parse(&ver_date_str, DATE_FORMAT)
1414+
&& let ver_datetime = OffsetDateTime::new_utc(ver_date, Time::MIDNIGHT)
1415+
&& let system_datetime = OffsetDateTime::from(SystemTime::now())
1416+
&& system_datetime.checked_sub(36.hours()).is_some_and(|d| d > ver_datetime)
1417+
&& !using_internal_features.load(std::sync::atomic::Ordering::Relaxed)
1418+
{
1419+
dcx.emit_note(session_diagnostics::IceBugReportOutdated {
1420+
version,
1421+
bug_report_url,
1422+
note_update: (),
1423+
note_url: (),
1424+
});
14021425
} else {
1403-
dcx.emit_note(session_diagnostics::IceBugReport { bug_report_url });
1426+
if using_internal_features.load(std::sync::atomic::Ordering::Relaxed) {
1427+
dcx.emit_note(session_diagnostics::IceBugReportInternalFeature);
1428+
} else {
1429+
dcx.emit_note(session_diagnostics::IceBugReport { bug_report_url });
1430+
}
14041431
}
14051432

14061433
let version = util::version_str!().unwrap_or("unknown_version");

‎compiler/rustc_driver_impl/src/session_diagnostics.rs

+11
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,17 @@ pub(crate) struct IceBugReport<'a> {
4646
#[diag(driver_impl_ice_bug_report_internal_feature)]
4747
pub(crate) struct IceBugReportInternalFeature;
4848

49+
#[derive(Diagnostic)]
50+
#[diag(driver_impl_ice_bug_report_outdated)]
51+
pub(crate) struct IceBugReportOutdated<'a> {
52+
pub version: &'a str,
53+
pub bug_report_url: &'a str,
54+
#[note(driver_impl_update)]
55+
pub note_update: (),
56+
#[note(driver_impl_url)]
57+
pub note_url: (),
58+
}
59+
4960
#[derive(Diagnostic)]
5061
#[diag(driver_impl_ice_version)]
5162
pub(crate) struct IceVersion<'a> {

‎compiler/rustc_hir/src/lang_items.rs

+2
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,8 @@ language_item_table! {
267267
EhCatchTypeinfo, sym::eh_catch_typeinfo, eh_catch_typeinfo, Target::Static, GenericRequirement::None;
268268

269269
OwnedBox, sym::owned_box, owned_box, Target::Struct, GenericRequirement::Minimum(1);
270+
GlobalAlloc, sym::global_alloc_ty, global_alloc_ty, Target::Struct, GenericRequirement::None;
271+
270272
// Experimental language item for Miri
271273
PtrUnique, sym::ptr_unique, ptr_unique, Target::Struct, GenericRequirement::Exact(1);
272274

‎compiler/rustc_hir_analysis/src/collect.rs

+6-1
Original file line numberDiff line numberDiff line change
@@ -791,7 +791,12 @@ fn convert_enum_variant_types(tcx: TyCtxt<'_>, def_id: DefId) {
791791
}
792792

793793
fn find_field(tcx: TyCtxt<'_>, (def_id, ident): (DefId, Ident)) -> Option<FieldIdx> {
794-
tcx.adt_def(def_id).non_enum_variant().fields.iter_enumerated().find_map(|(idx, field)| {
794+
let adt = tcx.adt_def(def_id);
795+
if adt.is_enum() {
796+
return None;
797+
}
798+
799+
adt.non_enum_variant().fields.iter_enumerated().find_map(|(idx, field)| {
795800
if field.is_unnamed() {
796801
let field_ty = tcx.type_of(field.did).instantiate_identity();
797802
let adt_def = field_ty.ty_adt_def().expect("expect Adt for unnamed field");

‎compiler/rustc_hir_analysis/src/collect/type_of/opaque.rs

+8-20
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@ pub(super) fn find_opaque_ty_constraints_for_impl_trait_in_assoc_type(
4646
for &assoc_id in tcx.associated_item_def_ids(impl_def_id) {
4747
let assoc = tcx.associated_item(assoc_id);
4848
match assoc.kind {
49-
ty::AssocKind::Const | ty::AssocKind::Fn => {
50-
locator.check(assoc_id.expect_local(), ImplTraitSource::AssocTy)
51-
}
49+
ty::AssocKind::Const | ty::AssocKind::Fn => locator.check(assoc_id.expect_local()),
5250
// Associated types don't have bodies, so they can't constrain hidden types
5351
ty::AssocKind::Type => {}
5452
}
@@ -182,15 +180,9 @@ struct TaitConstraintLocator<'tcx> {
182180
typeck_types: Vec<ty::OpaqueHiddenType<'tcx>>,
183181
}
184182

185-
#[derive(Debug)]
186-
enum ImplTraitSource {
187-
AssocTy,
188-
TyAlias,
189-
}
190-
191183
impl TaitConstraintLocator<'_> {
192184
#[instrument(skip(self), level = "debug")]
193-
fn check(&mut self, item_def_id: LocalDefId, source: ImplTraitSource) {
185+
fn check(&mut self, item_def_id: LocalDefId) {
194186
// Don't try to check items that cannot possibly constrain the type.
195187
if !self.tcx.has_typeck_results(item_def_id) {
196188
debug!("no constraint: no typeck results");
@@ -242,12 +234,8 @@ impl TaitConstraintLocator<'_> {
242234
continue;
243235
}
244236
constrained = true;
245-
let opaque_types_defined_by = match source {
246-
ImplTraitSource::AssocTy => {
247-
self.tcx.impl_trait_in_assoc_types_defined_by(item_def_id)
248-
}
249-
ImplTraitSource::TyAlias => self.tcx.opaque_types_defined_by(item_def_id),
250-
};
237+
let opaque_types_defined_by = self.tcx.opaque_types_defined_by(item_def_id);
238+
251239
if !opaque_types_defined_by.contains(&self.def_id) {
252240
self.tcx.dcx().emit_err(TaitForwardCompat {
253241
span: hidden_type.span,
@@ -308,29 +296,29 @@ impl<'tcx> intravisit::Visitor<'tcx> for TaitConstraintLocator<'tcx> {
308296
}
309297
fn visit_expr(&mut self, ex: &'tcx Expr<'tcx>) {
310298
if let hir::ExprKind::Closure(closure) = ex.kind {
311-
self.check(closure.def_id, ImplTraitSource::TyAlias);
299+
self.check(closure.def_id);
312300
}
313301
intravisit::walk_expr(self, ex);
314302
}
315303
fn visit_item(&mut self, it: &'tcx Item<'tcx>) {
316304
trace!(?it.owner_id);
317305
// The opaque type itself or its children are not within its reveal scope.
318306
if it.owner_id.def_id != self.def_id {
319-
self.check(it.owner_id.def_id, ImplTraitSource::TyAlias);
307+
self.check(it.owner_id.def_id);
320308
intravisit::walk_item(self, it);
321309
}
322310
}
323311
fn visit_impl_item(&mut self, it: &'tcx ImplItem<'tcx>) {
324312
trace!(?it.owner_id);
325313
// The opaque type itself or its children are not within its reveal scope.
326314
if it.owner_id.def_id != self.def_id {
327-
self.check(it.owner_id.def_id, ImplTraitSource::TyAlias);
315+
self.check(it.owner_id.def_id);
328316
intravisit::walk_impl_item(self, it);
329317
}
330318
}
331319
fn visit_trait_item(&mut self, it: &'tcx TraitItem<'tcx>) {
332320
trace!(?it.owner_id);
333-
self.check(it.owner_id.def_id, ImplTraitSource::TyAlias);
321+
self.check(it.owner_id.def_id);
334322
intravisit::walk_trait_item(self, it);
335323
}
336324
fn visit_foreign_item(&mut self, it: &'tcx hir::ForeignItem<'tcx>) {

‎compiler/rustc_metadata/src/creader.rs

+7-1
Original file line numberDiff line numberDiff line change
@@ -1132,7 +1132,13 @@ fn load_dylib(path: &Path, max_attempts: usize) -> Result<libloading::Library, S
11321132
Err(err) => {
11331133
// Only try to recover from this specific error.
11341134
if !matches!(err, libloading::Error::LoadLibraryExW { .. }) {
1135-
return Err(err.to_string());
1135+
let err = format_dlopen_err(&err);
1136+
// We include the path of the dylib in the error ourselves, so
1137+
// if it's in the error, we strip it.
1138+
if let Some(err) = err.strip_prefix(&format!(": {}", path.display())) {
1139+
return Err(err.to_string());
1140+
}
1141+
return Err(err);
11361142
}
11371143

11381144
last_error = Some(err);

‎compiler/rustc_middle/src/query/mod.rs

-9
Original file line numberDiff line numberDiff line change
@@ -344,15 +344,6 @@ rustc_queries! {
344344
}
345345
}
346346

347-
query impl_trait_in_assoc_types_defined_by(
348-
key: LocalDefId
349-
) -> &'tcx ty::List<LocalDefId> {
350-
desc {
351-
|tcx| "computing the opaque types defined by `{}`",
352-
tcx.def_path_str(key.to_def_id())
353-
}
354-
}
355-
356347
/// Returns the list of bounds that can be used for
357348
/// `SelectionCandidate::ProjectionCandidate(_)` and
358349
/// `ProjectionTyCandidate::TraitDef`.

0 commit comments

Comments
 (0)