Skip to content

Commit 722b3ee

Browse files
committed
Auto merge of rust-lang#117498 - matthiaskrgr:rollup-z7mg4ck, r=matthiaskrgr
Rollup of 4 pull requests Successful merges: - rust-lang#117298 (Recover from missing param list in function definitions) - rust-lang#117373 (Avoid the path trimming ICE lint in error reporting) - rust-lang#117441 (Do not assert in op_to_const.) - rust-lang#117488 (Update minifier-rs version to 0.3.0) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 75b064d + effc27d commit 722b3ee

25 files changed

+540
-41
lines changed

Cargo.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -2465,9 +2465,9 @@ dependencies = [
24652465

24662466
[[package]]
24672467
name = "minifier"
2468-
version = "0.2.3"
2468+
version = "0.3.0"
24692469
source = "registry+https://github.com/rust-lang/crates.io-index"
2470-
checksum = "5394aa376422b4b2b6c02fd9cfcb657e4ec544ae98e43d7d5d785fd0d042fd6d"
2470+
checksum = "95bbbf96b9ac3482c2a25450b67a15ed851319bc5fabf3b40742ea9066e84282"
24712471

24722472
[[package]]
24732473
name = "minimal-lexical"

compiler/rustc_const_eval/src/const_eval/eval_queries.rs

+14-2
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,16 @@ pub(crate) fn mk_eval_cx<'mir, 'tcx>(
106106
}
107107

108108
/// This function converts an interpreter value into a MIR constant.
109+
///
110+
/// The `for_diagnostics` flag turns the usual rules for returning `ConstValue::Scalar` into a
111+
/// best-effort attempt. This is not okay for use in const-eval sine it breaks invariants rustc
112+
/// relies on, but it is okay for diagnostics which will just give up gracefully when they
113+
/// encounter an `Indirect` they cannot handle.
109114
#[instrument(skip(ecx), level = "debug")]
110115
pub(super) fn op_to_const<'tcx>(
111116
ecx: &CompileTimeEvalContext<'_, 'tcx>,
112117
op: &OpTy<'tcx>,
118+
for_diagnostics: bool,
113119
) -> ConstValue<'tcx> {
114120
// Handle ZST consistently and early.
115121
if op.layout.is_zst() {
@@ -133,7 +139,13 @@ pub(super) fn op_to_const<'tcx>(
133139
_ => false,
134140
};
135141
let immediate = if force_as_immediate {
136-
Right(ecx.read_immediate(op).expect("normalization works on validated constants"))
142+
match ecx.read_immediate(op) {
143+
Ok(imm) => Right(imm),
144+
Err(err) if !for_diagnostics => {
145+
panic!("normalization works on validated constants: {err:?}")
146+
}
147+
_ => op.as_mplace_or_imm(),
148+
}
137149
} else {
138150
op.as_mplace_or_imm()
139151
};
@@ -205,7 +217,7 @@ pub(crate) fn turn_into_const_value<'tcx>(
205217
);
206218

207219
// Turn this into a proper constant.
208-
op_to_const(&ecx, &mplace.into())
220+
op_to_const(&ecx, &mplace.into(), /* for diagnostics */ false)
209221
}
210222

211223
#[instrument(skip(tcx), level = "debug")]

compiler/rustc_const_eval/src/const_eval/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ pub(crate) fn eval_to_valtree<'tcx>(
7272
}
7373

7474
#[instrument(skip(tcx), level = "debug")]
75-
pub(crate) fn try_destructure_mir_constant_for_diagnostics<'tcx>(
75+
pub(crate) fn try_destructure_mir_constant_for_user_output<'tcx>(
7676
tcx: TyCtxtAt<'tcx>,
7777
val: mir::ConstValue<'tcx>,
7878
ty: Ty<'tcx>,
@@ -99,7 +99,7 @@ pub(crate) fn try_destructure_mir_constant_for_diagnostics<'tcx>(
9999
let fields_iter = (0..field_count)
100100
.map(|i| {
101101
let field_op = ecx.project_field(&down, i).ok()?;
102-
let val = op_to_const(&ecx, &field_op);
102+
let val = op_to_const(&ecx, &field_op, /* for diagnostics */ true);
103103
Some((val, field_op.layout.ty))
104104
})
105105
.collect::<Option<Vec<_>>>()?;

compiler/rustc_const_eval/src/const_eval/valtrees.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ pub fn valtree_to_const_value<'tcx>(
232232
let mut ecx = mk_eval_cx(tcx, DUMMY_SP, param_env, CanAccessStatics::No);
233233
let imm = valtree_to_ref(&mut ecx, valtree, *inner_ty);
234234
let imm = ImmTy::from_immediate(imm, tcx.layout_of(param_env_ty).unwrap());
235-
op_to_const(&ecx, &imm.into())
235+
op_to_const(&ecx, &imm.into(), /* for diagnostics */ false)
236236
}
237237
ty::Tuple(_) | ty::Array(_, _) | ty::Adt(..) => {
238238
let layout = tcx.layout_of(param_env_ty).unwrap();
@@ -265,7 +265,7 @@ pub fn valtree_to_const_value<'tcx>(
265265
dump_place(&ecx, &place);
266266
intern_const_alloc_recursive(&mut ecx, InternKind::Constant, &place).unwrap();
267267

268-
op_to_const(&ecx, &place.into())
268+
op_to_const(&ecx, &place.into(), /* for diagnostics */ false)
269269
}
270270
ty::Never
271271
| ty::Error(_)

compiler/rustc_const_eval/src/interpret/cast.rs

+4-8
Original file line numberDiff line numberDiff line change
@@ -145,16 +145,12 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
145145
assert!(dest.layout.is_sized());
146146
assert_eq!(cast_ty, dest.layout.ty); // we otherwise ignore `cast_ty` enirely...
147147
if src.layout.size != dest.layout.size {
148-
let src_bytes = src.layout.size.bytes();
149-
let dest_bytes = dest.layout.size.bytes();
150-
let src_ty = format!("{}", src.layout.ty);
151-
let dest_ty = format!("{}", dest.layout.ty);
152148
throw_ub_custom!(
153149
fluent::const_eval_invalid_transmute,
154-
src_bytes = src_bytes,
155-
dest_bytes = dest_bytes,
156-
src = src_ty,
157-
dest = dest_ty,
150+
src_bytes = src.layout.size.bytes(),
151+
dest_bytes = dest.layout.size.bytes(),
152+
src = src.layout.ty,
153+
dest = dest.layout.ty,
158154
);
159155
}
160156

compiler/rustc_const_eval/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ pub fn provide(providers: &mut Providers) {
5454
let (param_env, raw) = param_env_and_value.into_parts();
5555
const_eval::eval_to_valtree(tcx, param_env, raw)
5656
};
57-
providers.hooks.try_destructure_mir_constant_for_diagnostics =
58-
const_eval::try_destructure_mir_constant_for_diagnostics;
57+
providers.hooks.try_destructure_mir_constant_for_user_output =
58+
const_eval::try_destructure_mir_constant_for_user_output;
5959
providers.valtree_to_const_val = |tcx, (ty, valtree)| {
6060
const_eval::valtree_to_const_value(tcx, ty::ParamEnv::empty().and(ty), valtree)
6161
};

compiler/rustc_middle/src/hooks/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ macro_rules! declare_hooks {
6666
declare_hooks! {
6767
/// Tries to destructure an `mir::Const` ADT or array into its variant index
6868
/// and its field values. This should only be used for pretty printing.
69-
hook try_destructure_mir_constant_for_diagnostics(val: mir::ConstValue<'tcx>, ty: Ty<'tcx>) -> Option<mir::DestructuredConstant<'tcx>>;
69+
hook try_destructure_mir_constant_for_user_output(val: mir::ConstValue<'tcx>, ty: Ty<'tcx>) -> Option<mir::DestructuredConstant<'tcx>>;
7070

7171
/// Getting a &core::panic::Location referring to a span.
7272
hook const_caller_location(file: rustc_span::Symbol, line: u32, col: u32) -> mir::ConstValue<'tcx>;

compiler/rustc_middle/src/mir/pretty.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1713,7 +1713,7 @@ fn pretty_print_const_value_tcx<'tcx>(
17131713
(_, ty::Array(..) | ty::Tuple(..) | ty::Adt(..)) if !ty.has_non_region_param() => {
17141714
let ct = tcx.lift(ct).unwrap();
17151715
let ty = tcx.lift(ty).unwrap();
1716-
if let Some(contents) = tcx.try_destructure_mir_constant_for_diagnostics(ct, ty) {
1716+
if let Some(contents) = tcx.try_destructure_mir_constant_for_user_output(ct, ty) {
17171717
let fields: Vec<(ConstValue<'_>, Ty<'_>)> = contents.fields.to_vec();
17181718
match *ty.kind() {
17191719
ty::Array(..) => {

compiler/rustc_parse/messages.ftl

+3
Original file line numberDiff line numberDiff line change
@@ -526,6 +526,9 @@ parse_missing_fn_for_function_definition = missing `fn` for function definition
526526
parse_missing_fn_for_method_definition = missing `fn` for method definition
527527
.suggestion = add `fn` here to parse `{$ident}` as a public method
528528
529+
parse_missing_fn_params = missing parameters for function definition
530+
.suggestion = add a parameter list
531+
529532
parse_missing_for_in_trait_impl = missing `for` in a trait impl
530533
.suggestion = add `for` here
531534

compiler/rustc_parse/src/errors.rs

+8
Original file line numberDiff line numberDiff line change
@@ -1551,6 +1551,14 @@ pub(crate) enum AmbiguousMissingKwForItemSub {
15511551
HelpMacro,
15521552
}
15531553

1554+
#[derive(Diagnostic)]
1555+
#[diag(parse_missing_fn_params)]
1556+
pub(crate) struct MissingFnParams {
1557+
#[primary_span]
1558+
#[suggestion(code = "()", applicability = "machine-applicable", style = "short")]
1559+
pub span: Span,
1560+
}
1561+
15541562
#[derive(Diagnostic)]
15551563
#[diag(parse_missing_trait_in_trait_impl)]
15561564
pub(crate) struct MissingTraitInTraitImpl {

compiler/rustc_parse/src/parser/item.rs

+10
Original file line numberDiff line numberDiff line change
@@ -2499,6 +2499,16 @@ impl<'a> Parser<'a> {
24992499
pub(super) fn parse_fn_params(&mut self, req_name: ReqName) -> PResult<'a, ThinVec<Param>> {
25002500
let mut first_param = true;
25012501
// Parse the arguments, starting out with `self` being allowed...
2502+
if self.token.kind != TokenKind::OpenDelim(Delimiter::Parenthesis)
2503+
// might be typo'd trait impl, handled elsewhere
2504+
&& !self.token.is_keyword(kw::For)
2505+
{
2506+
// recover from missing argument list, e.g. `fn main -> () {}`
2507+
self.sess
2508+
.emit_err(errors::MissingFnParams { span: self.prev_token.span.shrink_to_hi() });
2509+
return Ok(ThinVec::new());
2510+
}
2511+
25022512
let (mut params, _) = self.parse_paren_comma_seq(|p| {
25032513
p.recover_diff_marker();
25042514
let snapshot = p.create_snapshot_for_diagnostic();

src/librustdoc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ arrayvec = { version = "0.7", default-features = false }
1111
askama = { version = "0.12", default-features = false, features = ["config"] }
1212
itertools = "0.10.1"
1313
indexmap = "2"
14-
minifier = "0.2.3"
14+
minifier = "0.3.0"
1515
once_cell = "1.10.0"
1616
regex = "1"
1717
rustdoc-json-types = { path = "../rustdoc-json-types" }

src/tools/clippy/clippy_utils/src/consts.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,7 @@ fn field_of_struct<'tcx>(
710710
field: &Ident,
711711
) -> Option<mir::Const<'tcx>> {
712712
if let mir::Const::Val(result, ty) = result
713-
&& let Some(dc) = lcx.tcx.try_destructure_mir_constant_for_diagnostics(result, ty)
713+
&& let Some(dc) = lcx.tcx.try_destructure_mir_constant_for_user_output(result, ty)
714714
&& let Some(dc_variant) = dc.variant
715715
&& let Some(variant) = adt_def.variants().get(dc_variant)
716716
&& let Some(field_idx) = variant.fields.iter().position(|el| el.name == field.name)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
- // MIR for `main` before GVN
2+
+ // MIR for `main` after GVN
3+
4+
fn main() -> () {
5+
let mut _0: ();
6+
let _1: std::alloc::Layout;
7+
let mut _2: std::option::Option<std::alloc::Layout>;
8+
let mut _3: *mut u8;
9+
let mut _4: *mut [u8];
10+
let mut _5: std::ptr::NonNull<[u8]>;
11+
let mut _6: std::result::Result<std::ptr::NonNull<[u8]>, std::alloc::AllocError>;
12+
let mut _7: &std::alloc::Global;
13+
let mut _8: std::alloc::Layout;
14+
scope 1 {
15+
debug layout => _1;
16+
let mut _9: &std::alloc::Global;
17+
scope 2 {
18+
debug ptr => _3;
19+
}
20+
scope 5 (inlined <std::alloc::Global as Allocator>::allocate) {
21+
debug self => _9;
22+
debug layout => _1;
23+
}
24+
scope 6 (inlined #[track_caller] Result::<NonNull<[u8]>, std::alloc::AllocError>::unwrap) {
25+
debug self => _6;
26+
let mut _12: isize;
27+
let _13: std::alloc::AllocError;
28+
let mut _14: !;
29+
let _15: &str;
30+
let mut _16: &dyn std::fmt::Debug;
31+
let mut _17: &std::alloc::AllocError;
32+
scope 7 {
33+
debug t => _5;
34+
}
35+
scope 8 {
36+
debug e => const std::alloc::AllocError;
37+
}
38+
}
39+
scope 9 (inlined NonNull::<[u8]>::as_ptr) {
40+
debug self => _5;
41+
let mut _18: *const [u8];
42+
}
43+
}
44+
scope 3 (inlined #[track_caller] Option::<Layout>::unwrap) {
45+
debug self => _2;
46+
let mut _10: isize;
47+
let mut _11: !;
48+
scope 4 {
49+
debug val => _1;
50+
}
51+
}
52+
53+
bb0: {
54+
StorageLive(_2);
55+
- _2 = Option::<Layout>::None;
56+
+ _2 = const Option::<Layout>::None;
57+
StorageLive(_10);
58+
_10 = const 0_isize;
59+
switchInt(const 0_isize) -> [0: bb1, 1: bb3, otherwise: bb2];
60+
}
61+
62+
bb1: {
63+
_11 = core::panicking::panic(const "called `Option::unwrap()` on a `None` value") -> unwind unreachable;
64+
}
65+
66+
bb2: {
67+
unreachable;
68+
}
69+
70+
bb3: {
71+
- _1 = move ((_2 as Some).0: std::alloc::Layout);
72+
+ _1 = const Layout {{ size: Indirect { alloc_id: ALLOC0, offset: Size(4 bytes) }: usize, align: std::ptr::Alignment(Scalar(0x00000000): ptr::alignment::AlignmentEnum32) }};
73+
StorageDead(_10);
74+
StorageDead(_2);
75+
StorageLive(_3);
76+
StorageLive(_4);
77+
StorageLive(_5);
78+
StorageLive(_6);
79+
_9 = const _;
80+
- _6 = std::alloc::Global::alloc_impl(_9, _1, const false) -> [return: bb4, unwind unreachable];
81+
+ _6 = std::alloc::Global::alloc_impl(const {ALLOC1: &std::alloc::Global}, const Layout {{ size: Indirect { alloc_id: ALLOC0, offset: Size(4 bytes) }: usize, align: std::ptr::Alignment(Scalar(0x00000000): ptr::alignment::AlignmentEnum32) }}, const false) -> [return: bb4, unwind unreachable];
82+
}
83+
84+
bb4: {
85+
StorageLive(_12);
86+
StorageLive(_15);
87+
_12 = discriminant(_6);
88+
switchInt(move _12) -> [0: bb6, 1: bb5, otherwise: bb2];
89+
}
90+
91+
bb5: {
92+
_15 = const "called `Result::unwrap()` on an `Err` value";
93+
StorageLive(_16);
94+
StorageLive(_17);
95+
_17 = &_13;
96+
_16 = move _17 as &dyn std::fmt::Debug (PointerCoercion(Unsize));
97+
StorageDead(_17);
98+
_14 = result::unwrap_failed(move _15, move _16) -> unwind unreachable;
99+
}
100+
101+
bb6: {
102+
_5 = move ((_6 as Ok).0: std::ptr::NonNull<[u8]>);
103+
StorageDead(_15);
104+
StorageDead(_12);
105+
StorageDead(_6);
106+
StorageLive(_18);
107+
_18 = (_5.0: *const [u8]);
108+
_4 = move _18 as *mut [u8] (PtrToPtr);
109+
StorageDead(_18);
110+
StorageDead(_5);
111+
_3 = move _4 as *mut u8 (PtrToPtr);
112+
StorageDead(_4);
113+
StorageDead(_3);
114+
return;
115+
}
116+
}
117+
+
118+
+ ALLOC0 (size: 8, align: 4) {
119+
+ 00 00 00 00 __ __ __ __ │ ....░░░░
120+
+ }
121+
+
122+
+ ALLOC1 (size: 0, align: 1) {}
123+

0 commit comments

Comments
 (0)