Skip to content

Commit 7e3ba5b

Browse files
borsbors
committed
Auto merge of #124040 - GuillaumeGomez:rollup-hrrvsgh, r=GuillaumeGomez
Rollup of 7 pull requests Successful merges: - #123673 (Don't ICE for kind mismatches during error rendering) - #123675 (Taint const qualifs if a static is referenced that didn't pass wfcheck) - #123975 (Port the 2 `rust-lld` run-make tests to `rmake`) - #124000 (Use `/* value */` as a placeholder) - #124013 (Box::into_raw: make Miri understand that this is a box-to-raw cast) - #124027 (Prefer identity equality over equating types during coercion.) - #124036 (Remove `default_hidden_visibility: false` from wasm targets) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 3fba278 + a0ca118 commit 7e3ba5b

36 files changed

+363
-106
lines changed

‎Cargo.lock

+1
Original file line numberDiff line numberDiff line change
@@ -3342,6 +3342,7 @@ name = "run_make_support"
33423342
version = "0.0.0"
33433343
dependencies = [
33443344
"object 0.34.0",
3345+
"regex",
33453346
"wasmparser",
33463347
]
33473348

‎compiler/rustc_const_eval/src/transform/check_consts/check.rs

+5
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,11 @@ impl<'mir, 'tcx> Checker<'mir, 'tcx> {
331331
if self.tcx.is_thread_local_static(def_id) {
332332
self.tcx.dcx().span_bug(span, "tls access is checked in `Rvalue::ThreadLocalRef`");
333333
}
334+
if let Some(def_id) = def_id.as_local()
335+
&& let Err(guar) = self.tcx.at(span).check_well_formed(hir::OwnerId { def_id })
336+
{
337+
self.error_emitted = Some(guar);
338+
}
334339
self.check_op_spanned(ops::StaticAccess, span)
335340
}
336341

‎compiler/rustc_hir_analysis/src/coherence/builtin.rs

+13-22
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ use rustc_hir::def_id::{DefId, LocalDefId};
1010
use rustc_hir::lang_items::LangItem;
1111
use rustc_hir::ItemKind;
1212
use rustc_infer::infer::outlives::env::OutlivesEnvironment;
13+
use rustc_infer::infer::TyCtxtInferExt;
1314
use rustc_infer::infer::{self, RegionResolutionError};
14-
use rustc_infer::infer::{DefineOpaqueTypes, TyCtxtInferExt};
1515
use rustc_infer::traits::Obligation;
1616
use rustc_middle::ty::adjustment::CoerceUnsizedInfo;
1717
use rustc_middle::ty::{self, suggest_constraining_type_params, Ty, TyCtxt, TypeVisitableExt};
@@ -189,10 +189,7 @@ fn visit_implementation_of_dispatch_from_dyn(checker: &Checker<'_>) -> Result<()
189189
// even if they do not carry that attribute.
190190
use rustc_type_ir::TyKind::*;
191191
match (source.kind(), target.kind()) {
192-
(&Ref(r_a, _, mutbl_a), Ref(r_b, _, mutbl_b))
193-
if infcx.at(&cause, param_env).eq(DefineOpaqueTypes::No, r_a, *r_b).is_ok()
194-
&& mutbl_a == *mutbl_b =>
195-
{
192+
(&Ref(r_a, _, mutbl_a), Ref(r_b, _, mutbl_b)) if r_a == *r_b && mutbl_a == *mutbl_b => {
196193
Ok(())
197194
}
198195
(&RawPtr(_, a_mutbl), &RawPtr(_, b_mutbl)) if a_mutbl == b_mutbl => Ok(()),
@@ -230,18 +227,14 @@ fn visit_implementation_of_dispatch_from_dyn(checker: &Checker<'_>) -> Result<()
230227
}
231228
}
232229

233-
if let Ok(ok) =
234-
infcx.at(&cause, param_env).eq(DefineOpaqueTypes::No, ty_a, ty_b)
235-
{
236-
if ok.obligations.is_empty() {
237-
res = Err(tcx.dcx().emit_err(errors::DispatchFromDynZST {
238-
span,
239-
name: field.name,
240-
ty: ty_a,
241-
}));
230+
if ty_a == ty_b {
231+
res = Err(tcx.dcx().emit_err(errors::DispatchFromDynZST {
232+
span,
233+
name: field.name,
234+
ty: ty_a,
235+
}));
242236

243-
return false;
244-
}
237+
return false;
245238
}
246239

247240
return true;
@@ -433,14 +426,12 @@ pub fn coerce_unsized_info<'tcx>(
433426
// something more accepting, but we use
434427
// equality because we want to be able to
435428
// perform this check without computing
436-
// variance where possible. (This is because
437-
// we may have to evaluate constraint
429+
// variance or constraining opaque types' hidden types.
430+
// (This is because we may have to evaluate constraint
438431
// expressions in the course of execution.)
439432
// See e.g., #41936.
440-
if let Ok(ok) = infcx.at(&cause, param_env).eq(DefineOpaqueTypes::No, a, b) {
441-
if ok.obligations.is_empty() {
442-
return None;
443-
}
433+
if a == b {
434+
return None;
444435
}
445436

446437
// Collect up all fields that were significantly changed

‎compiler/rustc_target/src/spec/base/wasm.rs

-3
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,6 @@ pub fn options() -> TargetOptions {
8080
// threaded model which will legalize atomics to normal operations.
8181
singlethread: true,
8282

83-
// no dynamic linking, no need for default visibility!
84-
default_hidden_visibility: true,
85-
8683
// Symbol visibility takes care of this for the WebAssembly.
8784
// Additionally the only known linker, LLD, doesn't support the script
8885
// arguments just yet

‎compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs

+11-4
Original file line numberDiff line numberDiff line change
@@ -4545,7 +4545,7 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
45454545
self.type_implements_trait(default_trait, [ty], param_env).must_apply_modulo_regions()
45464546
};
45474547

4548-
Some(match ty.kind() {
4548+
Some(match *ty.kind() {
45494549
ty::Never | ty::Error(_) => return None,
45504550
ty::Bool => "false".to_string(),
45514551
ty::Char => "\'x\'".to_string(),
@@ -4572,12 +4572,19 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
45724572
if let (ty::Str, hir::Mutability::Not) = (ty.kind(), mutability) {
45734573
"\"\"".to_string()
45744574
} else {
4575-
let ty = self.ty_kind_suggestion(param_env, *ty)?;
4575+
let ty = self.ty_kind_suggestion(param_env, ty)?;
45764576
format!("&{}{ty}", mutability.prefix_str())
45774577
}
45784578
}
45794579
ty::Array(ty, len) if let Some(len) = len.try_eval_target_usize(tcx, param_env) => {
4580-
format!("[{}; {}]", self.ty_kind_suggestion(param_env, *ty)?, len)
4580+
if len == 0 {
4581+
"[]".to_string()
4582+
} else if self.type_is_copy_modulo_regions(param_env, ty) || len == 1 {
4583+
// Can only suggest `[ty; 0]` if sz == 1 or copy
4584+
format!("[{}; {}]", self.ty_kind_suggestion(param_env, ty)?, len)
4585+
} else {
4586+
"/* value */".to_string()
4587+
}
45814588
}
45824589
ty::Tuple(tys) => format!(
45834590
"({}{})",
@@ -4587,7 +4594,7 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
45874594
.join(", "),
45884595
if tys.len() == 1 { "," } else { "" }
45894596
),
4590-
_ => "value".to_string(),
4597+
_ => "/* value */".to_string(),
45914598
})
45924599
}
45934600
}

‎compiler/rustc_trait_selection/src/traits/error_reporting/type_err_ctxt_ext.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1977,6 +1977,9 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
19771977
for (obligation_arg, impl_arg) in
19781978
std::iter::zip(obligation_trait_ref.args, impl_trait_ref.args)
19791979
{
1980+
if (obligation_arg, impl_arg).references_error() {
1981+
return false;
1982+
}
19801983
if let Err(terr) =
19811984
ocx.eq(&ObligationCause::dummy(), param_env, impl_arg, obligation_arg)
19821985
{

‎library/alloc/src/boxed.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -1058,7 +1058,8 @@ impl<T: ?Sized, A: Allocator> Box<T, A> {
10581058
#[stable(feature = "box_raw", since = "1.4.0")]
10591059
#[inline]
10601060
pub fn into_raw(b: Self) -> *mut T {
1061-
Self::into_raw_with_allocator(b).0
1061+
// Make sure Miri realizes that we transition from a noalias pointer to a raw pointer here.
1062+
unsafe { addr_of_mut!(*&mut *Self::into_raw_with_allocator(b).0) }
10621063
}
10631064

10641065
/// Consumes the `Box`, returning a wrapped raw pointer and the allocator.
@@ -1112,7 +1113,10 @@ impl<T: ?Sized, A: Allocator> Box<T, A> {
11121113
pub fn into_raw_with_allocator(b: Self) -> (*mut T, A) {
11131114
let mut b = mem::ManuallyDrop::new(b);
11141115
// We carefully get the raw pointer out in a way that Miri's aliasing model understands what
1115-
// is happening: using the primitive "deref" of `Box`.
1116+
// is happening: using the primitive "deref" of `Box`. In case `A` is *not* `Global`, we
1117+
// want *no* aliasing requirements here!
1118+
// In case `A` *is* `Global`, this does not quite have the right behavior; `into_raw`
1119+
// works around that.
11161120
let ptr = addr_of_mut!(**b);
11171121
let alloc = unsafe { ptr::read(&b.1) };
11181122
(ptr, alloc)

‎src/tools/compiletest/src/header.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,10 @@ impl TestProps {
265265
aux_bins: vec![],
266266
aux_crates: vec![],
267267
revisions: vec![],
268-
rustc_env: vec![("RUSTC_ICE".to_string(), "0".to_string())],
268+
rustc_env: vec![
269+
("RUSTC_ICE".to_string(), "0".to_string()),
270+
("RUST_BACKTRACE".to_string(), "short".to_string()),
271+
],
269272
unset_rustc_env: vec![("RUSTC_LOG_COLOR".to_string())],
270273
exec_env: vec![],
271274
unset_exec_env: vec![],
@@ -839,6 +842,7 @@ const KNOWN_DIRECTIVE_NAMES: &[&str] = &[
839842
"needs-profiler-support",
840843
"needs-relocation-model-pic",
841844
"needs-run-enabled",
845+
"needs-rust-lld",
842846
"needs-rust-lldb",
843847
"needs-sanitizer-address",
844848
"needs-sanitizer-cfi",

‎src/tools/compiletest/src/runtest.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2173,8 +2173,8 @@ impl<'test> TestCx<'test> {
21732173
let aux_dir = self.aux_output_dir();
21742174
self.build_all_auxiliary(&self.testpaths, &aux_dir, &mut rustc);
21752175

2176-
self.props.unset_rustc_env.iter().fold(&mut rustc, Command::env_remove);
21772176
rustc.envs(self.props.rustc_env.clone());
2177+
self.props.unset_rustc_env.iter().fold(&mut rustc, Command::env_remove);
21782178
self.compose_and_run(
21792179
rustc,
21802180
self.config.compile_lib_path.to_str().unwrap(),
@@ -2220,10 +2220,10 @@ impl<'test> TestCx<'test> {
22202220
);
22212221
aux_cx.build_all_auxiliary(of, &aux_dir, &mut aux_rustc);
22222222

2223+
aux_rustc.envs(aux_props.rustc_env.clone());
22232224
for key in &aux_props.unset_rustc_env {
22242225
aux_rustc.env_remove(key);
22252226
}
2226-
aux_rustc.envs(aux_props.rustc_env.clone());
22272227

22282228
let (aux_type, crate_type) = if is_bin {
22292229
(AuxType::Bin, Some("bin"))

‎src/tools/miri/tests/fail/both_borrows/newtype_pair_retagging.stack.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LL | Box(unsafe { Unique::new_unchecked(raw) }, alloc)
66
|
77
= help: this indicates a potential bug in the program: it performed an invalid operation, but the Stacked Borrows rules it violated are still experimental
88
= help: see https://github.com/rust-lang/unsafe-code-guidelines/blob/master/wip/stacked-borrows.md for further information
9-
help: <TAG> was created by a Unique retag at offsets [0x0..0x4]
9+
help: <TAG> was created by a SharedReadWrite retag at offsets [0x0..0x4]
1010
--> $DIR/newtype_pair_retagging.rs:LL:CC
1111
|
1212
LL | let ptr = Box::into_raw(Box::new(0i32));

‎src/tools/miri/tests/fail/both_borrows/newtype_retagging.stack.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LL | Box(unsafe { Unique::new_unchecked(raw) }, alloc)
66
|
77
= help: this indicates a potential bug in the program: it performed an invalid operation, but the Stacked Borrows rules it violated are still experimental
88
= help: see https://github.com/rust-lang/unsafe-code-guidelines/blob/master/wip/stacked-borrows.md for further information
9-
help: <TAG> was created by a Unique retag at offsets [0x0..0x4]
9+
help: <TAG> was created by a SharedReadWrite retag at offsets [0x0..0x4]
1010
--> $DIR/newtype_retagging.rs:LL:CC
1111
|
1212
LL | let ptr = Box::into_raw(Box::new(0i32));

‎src/tools/miri/tests/pass/issues/issue-miri-3473.rs

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
//@revisions: stack tree
2+
//@[tree]compile-flags: -Zmiri-tree-borrows
3+
use std::cell::UnsafeCell;
4+
5+
#[repr(C)]
6+
#[derive(Default)]
7+
struct Node {
8+
_meta: UnsafeCell<usize>,
9+
value: usize,
10+
}
11+
12+
impl Node {
13+
fn value(&self) -> &usize {
14+
&self.value
15+
}
16+
}
17+
18+
/// This used to cause Stacked Borrows errors because of trouble around conversion
19+
/// from Box to raw pointer.
20+
fn main() {
21+
unsafe {
22+
let a = Box::into_raw(Box::new(Node::default()));
23+
let ptr = &*a;
24+
*UnsafeCell::raw_get(a.cast::<UnsafeCell<usize>>()) = 2;
25+
assert_eq!(*ptr.value(), 0);
26+
drop(Box::from_raw(a));
27+
}
28+
}

‎src/tools/miri/tests/pass/stacked-borrows/stacked-borrows.rs

+12
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ fn main() {
2020
wide_raw_ptr_in_tuple();
2121
not_unpin_not_protected();
2222
write_does_not_invalidate_all_aliases();
23+
box_into_raw_allows_interior_mutable_alias();
2324
}
2425

2526
// Make sure that reading from an `&mut` does, like reborrowing to `&`,
@@ -263,3 +264,14 @@ fn write_does_not_invalidate_all_aliases() {
263264
other::lib2();
264265
assert_eq!(*x, 1337); // oops, the value changed! I guess not all pointers were invalidated
265266
}
267+
268+
fn box_into_raw_allows_interior_mutable_alias() { unsafe {
269+
let b = Box::new(std::cell::Cell::new(42));
270+
let raw = Box::into_raw(b);
271+
let c = &*raw;
272+
let d = raw.cast::<i32>(); // bypassing `Cell` -- only okay in Miri tests
273+
// `c` and `d` should permit arbitrary aliasing with each other now.
274+
*d = 1;
275+
c.set(2);
276+
drop(Box::from_raw(raw));
277+
} }

‎src/tools/run-make-support/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ edition = "2021"
66
[dependencies]
77
object = "0.34.0"
88
wasmparser = "0.118.2"
9+
regex = "1.8" # 1.8 to avoid memchr 2.6.0, as 2.5.0 is pinned in the workspace

‎src/tools/run-make-support/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ use std::path::{Path, PathBuf};
1313
use std::process::{Command, Output};
1414

1515
pub use object;
16+
pub use regex;
1617
pub use wasmparser;
1718

1819
pub use cc::{cc, extra_c_flags, extra_cxx_flags, Cc};

‎src/tools/run-make-support/src/rustc.rs

+7-2
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,8 @@ impl Rustc {
128128
self
129129
}
130130

131-
/// Specify target triple.
131+
/// Specify the target triple, or a path to a custom target json spec file.
132132
pub fn target(&mut self, target: &str) -> &mut Self {
133-
assert!(!target.contains(char::is_whitespace), "target triple cannot contain spaces");
134133
self.cmd.arg(format!("--target={target}"));
135134
self
136135
}
@@ -149,6 +148,12 @@ impl Rustc {
149148
self
150149
}
151150

151+
/// Add an extra argument to the linker invocation, via `-Clink-arg`.
152+
pub fn link_arg(&mut self, link_arg: &str) -> &mut Self {
153+
self.cmd.arg(format!("-Clink-arg={link_arg}"));
154+
self
155+
}
156+
152157
#[track_caller]
153158
pub fn run_fail_assert_exit_code(&mut self, code: i32) -> Output {
154159
let caller_location = std::panic::Location::caller();

‎src/tools/tidy/src/allowed_run_make_makefiles.txt

-2
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,6 @@ run-make/rlib-format-packed-bundled-libs-2/Makefile
249249
run-make/rlib-format-packed-bundled-libs-3/Makefile
250250
run-make/rlib-format-packed-bundled-libs/Makefile
251251
run-make/rmeta-preferred/Makefile
252-
run-make/rust-lld-custom-target/Makefile
253-
run-make/rust-lld/Makefile
254252
run-make/rustc-macro-dep-files/Makefile
255253
run-make/rustdoc-determinism/Makefile
256254
run-make/rustdoc-error-lines/Makefile

‎tests/crashes/123153.rs

-17
This file was deleted.

‎tests/run-make/rust-lld-custom-target/Makefile

-7
This file was deleted.

0 commit comments

Comments
 (0)