Skip to content

Commit d662f80

Browse files
borsbors
committed
Auto merge of #78697 - JohnTitor:rollup-q0fchpv, r=JohnTitor
Rollup of 8 pull requests Successful merges: - #78376 (Treat trailing semicolon as a statement in macro call) - #78400 (Fix unindent in doc comments) - #78575 (Add a test for compiletest rustc-env & unset-rustc-env directives) - #78616 (Document -Zinstrument-coverage) - #78663 (Fix ICE when a future-incompat-report has its command-line level capped) - #78664 (Fix intrinsic size_of stable link) - #78668 (inliner: Remove redundant loop) - #78676 (add mipsel-unknown-none target) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 7b5a9e9 + 1cb137b commit d662f80

27 files changed

+578
-185
lines changed

‎compiler/rustc_ast/src/ast.rs

+7
Original file line numberDiff line numberDiff line change
@@ -905,6 +905,13 @@ pub struct Stmt {
905905
}
906906

907907
impl Stmt {
908+
pub fn has_trailing_semicolon(&self) -> bool {
909+
match &self.kind {
910+
StmtKind::Semi(_) => true,
911+
StmtKind::MacCall(mac) => matches!(mac.style, MacStmtStyle::Semicolon),
912+
_ => false,
913+
}
914+
}
908915
pub fn add_trailing_semicolon(mut self) -> Self {
909916
self.kind = match self.kind {
910917
StmtKind::Expr(expr) => StmtKind::Semi(expr),

‎compiler/rustc_expand/src/placeholders.rs

+37-1
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,44 @@ impl<'a, 'b> MutVisitor for PlaceholderExpander<'a, 'b> {
310310
};
311311

312312
if style == ast::MacStmtStyle::Semicolon {
313+
// Implement the proposal described in
314+
// https://github.com/rust-lang/rust/issues/61733#issuecomment-509626449
315+
//
316+
// The macro invocation expands to the list of statements.
317+
// If the list of statements is empty, then 'parse'
318+
// the trailing semicolon on the original invocation
319+
// as an empty statement. That is:
320+
//
321+
// `empty();` is parsed as a single `StmtKind::Empty`
322+
//
323+
// If the list of statements is non-empty, see if the
324+
// final statement alreayd has a trailing semicolon.
325+
//
326+
// If it doesn't have a semicolon, then 'parse' the trailing semicolon
327+
// from the invocation as part of the final statement,
328+
// using `stmt.add_trailing_semicolon()`
329+
//
330+
// If it does have a semicolon, then 'parse' the trailing semicolon
331+
// from the invocation as a new StmtKind::Empty
332+
333+
// FIXME: We will need to preserve the original
334+
// semicolon token and span as part of #15701
335+
let empty_stmt = ast::Stmt {
336+
id: ast::DUMMY_NODE_ID,
337+
kind: ast::StmtKind::Empty,
338+
span: DUMMY_SP,
339+
tokens: None,
340+
};
341+
313342
if let Some(stmt) = stmts.pop() {
314-
stmts.push(stmt.add_trailing_semicolon());
343+
if stmt.has_trailing_semicolon() {
344+
stmts.push(stmt);
345+
stmts.push(empty_stmt);
346+
} else {
347+
stmts.push(stmt.add_trailing_semicolon());
348+
}
349+
} else {
350+
stmts.push(empty_stmt);
315351
}
316352
}
317353

‎compiler/rustc_lint/src/levels.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ impl<'s> LintLevelsBuilder<'s> {
7474

7575
for &(ref lint_name, level) in &sess.opts.lint_opts {
7676
store.check_lint_name_cmdline(sess, &lint_name, level);
77+
let orig_level = level;
7778

7879
// If the cap is less than this specified level, e.g., if we've got
7980
// `--cap-lints allow` but we've also got `-D foo` then we ignore
@@ -88,7 +89,7 @@ impl<'s> LintLevelsBuilder<'s> {
8889
};
8990
for id in ids {
9091
self.check_gated_lint(id, DUMMY_SP);
91-
let src = LintSource::CommandLine(lint_flag_val);
92+
let src = LintSource::CommandLine(lint_flag_val, orig_level);
9293
specs.insert(id, (level, src));
9394
}
9495
}
@@ -123,7 +124,7 @@ impl<'s> LintLevelsBuilder<'s> {
123124
diag_builder.note(&rationale.as_str());
124125
}
125126
}
126-
LintSource::CommandLine(_) => {
127+
LintSource::CommandLine(_, _) => {
127128
diag_builder.note("`forbid` lint level was set on command line");
128129
}
129130
}
@@ -422,7 +423,7 @@ impl<'s> LintLevelsBuilder<'s> {
422423
let forbidden_lint_name = match forbid_src {
423424
LintSource::Default => id.to_string(),
424425
LintSource::Node(name, _, _) => name.to_string(),
425-
LintSource::CommandLine(name) => name.to_string(),
426+
LintSource::CommandLine(name, _) => name.to_string(),
426427
};
427428
let (lint_attr_name, lint_attr_span) = match *src {
428429
LintSource::Node(name, span, _) => (name, span),
@@ -446,7 +447,7 @@ impl<'s> LintLevelsBuilder<'s> {
446447
diag_builder.note(&rationale.as_str());
447448
}
448449
}
449-
LintSource::CommandLine(_) => {
450+
LintSource::CommandLine(_, _) => {
450451
diag_builder.note("`forbid` lint level was set on command line");
451452
}
452453
}

‎compiler/rustc_lint/src/redundant_semicolon.rs

+5
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@ impl EarlyLintPass for RedundantSemicolons {
4242

4343
fn maybe_lint_redundant_semis(cx: &EarlyContext<'_>, seq: &mut Option<(Span, bool)>) {
4444
if let Some((span, multiple)) = seq.take() {
45+
// FIXME: Find a better way of ignoring the trailing
46+
// semicolon from macro expansion
47+
if span == rustc_span::DUMMY_SP {
48+
return;
49+
}
4550
cx.struct_span_lint(REDUNDANT_SEMICOLONS, span, |lint| {
4651
let (msg, rem) = if multiple {
4752
("unnecessary trailing semicolons", "remove these semicolons")

‎compiler/rustc_middle/src/lint.rs

+8-6
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,25 @@ pub enum LintSource {
2222
Node(Symbol, Span, Option<Symbol> /* RFC 2383 reason */),
2323

2424
/// Lint level was set by a command-line flag.
25-
CommandLine(Symbol),
25+
/// The provided `Level` is the level specified on the command line -
26+
/// the actual level may be lower due to `--cap-lints`
27+
CommandLine(Symbol, Level),
2628
}
2729

2830
impl LintSource {
2931
pub fn name(&self) -> Symbol {
3032
match *self {
3133
LintSource::Default => symbol::kw::Default,
3234
LintSource::Node(name, _, _) => name,
33-
LintSource::CommandLine(name) => name,
35+
LintSource::CommandLine(name, _) => name,
3436
}
3537
}
3638

3739
pub fn span(&self) -> Span {
3840
match *self {
3941
LintSource::Default => DUMMY_SP,
4042
LintSource::Node(_, span, _) => span,
41-
LintSource::CommandLine(_) => DUMMY_SP,
43+
LintSource::CommandLine(_, _) => DUMMY_SP,
4244
}
4345
}
4446
}
@@ -279,12 +281,12 @@ pub fn struct_lint_level<'s, 'd>(
279281
&format!("`#[{}({})]` on by default", level.as_str(), name),
280282
);
281283
}
282-
LintSource::CommandLine(lint_flag_val) => {
283-
let flag = match level {
284+
LintSource::CommandLine(lint_flag_val, orig_level) => {
285+
let flag = match orig_level {
284286
Level::Warn => "-W",
285287
Level::Deny => "-D",
286288
Level::Forbid => "-F",
287-
Level::Allow => panic!(),
289+
Level::Allow => "-A",
288290
};
289291
let hyphen_case_lint_name = name.replace("_", "-");
290292
if lint_flag_val.as_str() == name {

‎compiler/rustc_mir/src/transform/inline.rs

+60-77
Original file line numberDiff line numberDiff line change
@@ -93,96 +93,79 @@ impl Inliner<'tcx> {
9393
return;
9494
}
9595

96-
let mut local_change;
9796
let mut changed = false;
97+
while let Some(callsite) = callsites.pop_front() {
98+
debug!("checking whether to inline callsite {:?}", callsite);
9899

99-
loop {
100-
local_change = false;
101-
while let Some(callsite) = callsites.pop_front() {
102-
debug!("checking whether to inline callsite {:?}", callsite);
103-
104-
if let InstanceDef::Item(_) = callsite.callee.def {
105-
if !self.tcx.is_mir_available(callsite.callee.def_id()) {
106-
debug!(
107-
"checking whether to inline callsite {:?} - MIR unavailable",
108-
callsite,
109-
);
110-
continue;
111-
}
100+
if let InstanceDef::Item(_) = callsite.callee.def {
101+
if !self.tcx.is_mir_available(callsite.callee.def_id()) {
102+
debug!("checking whether to inline callsite {:?} - MIR unavailable", callsite,);
103+
continue;
112104
}
105+
}
113106

114-
let callee_body = if let Some(callee_def_id) = callsite.callee.def_id().as_local() {
115-
let callee_hir_id = self.tcx.hir().local_def_id_to_hir_id(callee_def_id);
116-
// Avoid a cycle here by only using `instance_mir` only if we have
117-
// a lower `HirId` than the callee. This ensures that the callee will
118-
// not inline us. This trick only works without incremental compilation.
119-
// So don't do it if that is enabled. Also avoid inlining into generators,
120-
// since their `optimized_mir` is used for layout computation, which can
121-
// create a cycle, even when no attempt is made to inline the function
122-
// in the other direction.
123-
if !self.tcx.dep_graph.is_fully_enabled()
124-
&& self_hir_id < callee_hir_id
125-
&& caller_body.generator_kind.is_none()
126-
{
127-
self.tcx.instance_mir(callsite.callee.def)
128-
} else {
129-
continue;
130-
}
131-
} else {
132-
// This cannot result in a cycle since the callee MIR is from another crate
133-
// and is already optimized.
107+
let callee_body = if let Some(callee_def_id) = callsite.callee.def_id().as_local() {
108+
let callee_hir_id = self.tcx.hir().local_def_id_to_hir_id(callee_def_id);
109+
// Avoid a cycle here by only using `instance_mir` only if we have
110+
// a lower `HirId` than the callee. This ensures that the callee will
111+
// not inline us. This trick only works without incremental compilation.
112+
// So don't do it if that is enabled. Also avoid inlining into generators,
113+
// since their `optimized_mir` is used for layout computation, which can
114+
// create a cycle, even when no attempt is made to inline the function
115+
// in the other direction.
116+
if !self.tcx.dep_graph.is_fully_enabled()
117+
&& self_hir_id < callee_hir_id
118+
&& caller_body.generator_kind.is_none()
119+
{
134120
self.tcx.instance_mir(callsite.callee.def)
135-
};
136-
137-
let callee_body: &Body<'tcx> = &*callee_body;
138-
139-
let callee_body = if self.consider_optimizing(callsite, callee_body) {
140-
self.tcx.subst_and_normalize_erasing_regions(
141-
&callsite.callee.substs,
142-
self.param_env,
143-
callee_body,
144-
)
145121
} else {
146122
continue;
147-
};
123+
}
124+
} else {
125+
// This cannot result in a cycle since the callee MIR is from another crate
126+
// and is already optimized.
127+
self.tcx.instance_mir(callsite.callee.def)
128+
};
148129

149-
// Copy only unevaluated constants from the callee_body into the caller_body.
150-
// Although we are only pushing `ConstKind::Unevaluated` consts to
151-
// `required_consts`, here we may not only have `ConstKind::Unevaluated`
152-
// because we are calling `subst_and_normalize_erasing_regions`.
153-
caller_body.required_consts.extend(
154-
callee_body.required_consts.iter().copied().filter(|&constant| {
155-
matches!(constant.literal.val, ConstKind::Unevaluated(_, _, _))
156-
}),
157-
);
130+
let callee_body: &Body<'tcx> = &*callee_body;
158131

159-
let start = caller_body.basic_blocks().len();
160-
debug!("attempting to inline callsite {:?} - body={:?}", callsite, callee_body);
161-
if !self.inline_call(callsite, caller_body, callee_body) {
162-
debug!("attempting to inline callsite {:?} - failure", callsite);
163-
continue;
164-
}
165-
debug!("attempting to inline callsite {:?} - success", callsite);
166-
167-
// Add callsites from inlined function
168-
for (bb, bb_data) in caller_body.basic_blocks().iter_enumerated().skip(start) {
169-
if let Some(new_callsite) =
170-
self.get_valid_function_call(bb, bb_data, caller_body)
171-
{
172-
// Don't inline the same function multiple times.
173-
if callsite.callee != new_callsite.callee {
174-
callsites.push_back(new_callsite);
175-
}
132+
let callee_body = if self.consider_optimizing(callsite, callee_body) {
133+
self.tcx.subst_and_normalize_erasing_regions(
134+
&callsite.callee.substs,
135+
self.param_env,
136+
callee_body,
137+
)
138+
} else {
139+
continue;
140+
};
141+
142+
// Copy only unevaluated constants from the callee_body into the caller_body.
143+
// Although we are only pushing `ConstKind::Unevaluated` consts to
144+
// `required_consts`, here we may not only have `ConstKind::Unevaluated`
145+
// because we are calling `subst_and_normalize_erasing_regions`.
146+
caller_body.required_consts.extend(callee_body.required_consts.iter().copied().filter(
147+
|&constant| matches!(constant.literal.val, ConstKind::Unevaluated(_, _, _)),
148+
));
149+
150+
let start = caller_body.basic_blocks().len();
151+
debug!("attempting to inline callsite {:?} - body={:?}", callsite, callee_body);
152+
if !self.inline_call(callsite, caller_body, callee_body) {
153+
debug!("attempting to inline callsite {:?} - failure", callsite);
154+
continue;
155+
}
156+
debug!("attempting to inline callsite {:?} - success", callsite);
157+
158+
// Add callsites from inlined function
159+
for (bb, bb_data) in caller_body.basic_blocks().iter_enumerated().skip(start) {
160+
if let Some(new_callsite) = self.get_valid_function_call(bb, bb_data, caller_body) {
161+
// Don't inline the same function multiple times.
162+
if callsite.callee != new_callsite.callee {
163+
callsites.push_back(new_callsite);
176164
}
177165
}
178-
179-
local_change = true;
180-
changed = true;
181166
}
182167

183-
if !local_change {
184-
break;
185-
}
168+
changed = true;
186169
}
187170

188171
// Simplify if we inlined anything.

‎compiler/rustc_target/src/spec/mipsel_unknown_none.rs

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
//! Bare MIPS32r2, little endian, softfloat, O32 calling convention
2+
//!
3+
//! Can be used for MIPS M4K core (e.g. on PIC32MX devices)
4+
5+
use crate::spec::abi::Abi;
6+
use crate::spec::{LinkerFlavor, LldFlavor, RelocModel};
7+
use crate::spec::{PanicStrategy, Target, TargetOptions};
8+
9+
pub fn target() -> Target {
10+
Target {
11+
llvm_target: "mipsel-unknown-none".to_string(),
12+
target_endian: "little".to_string(),
13+
pointer_width: 32,
14+
target_c_int_width: "32".to_string(),
15+
data_layout: "e-m:m-p:32:32-i8:8:32-i16:16:32-i64:64-n32-S64".to_string(),
16+
arch: "mips".to_string(),
17+
target_os: "none".to_string(),
18+
target_env: String::new(),
19+
target_vendor: String::new(),
20+
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
21+
22+
options: TargetOptions {
23+
cpu: "mips32r2".to_string(),
24+
features: "+mips32r2,+soft-float,+noabicalls".to_string(),
25+
max_atomic_width: Some(32),
26+
executables: true,
27+
linker: Some("rust-lld".to_owned()),
28+
panic_strategy: PanicStrategy::Abort,
29+
relocation_model: RelocModel::Static,
30+
unsupported_abis: vec![
31+
Abi::Stdcall,
32+
Abi::Fastcall,
33+
Abi::Vectorcall,
34+
Abi::Thiscall,
35+
Abi::Win64,
36+
Abi::SysV64,
37+
],
38+
emit_debug_gdb_scripts: false,
39+
..Default::default()
40+
},
41+
}
42+
}

‎compiler/rustc_target/src/spec/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -653,6 +653,7 @@ supported_targets! {
653653
("powerpc64-wrs-vxworks", powerpc64_wrs_vxworks),
654654

655655
("mipsel-sony-psp", mipsel_sony_psp),
656+
("mipsel-unknown-none", mipsel_unknown_none),
656657
("thumbv4t-none-eabi", thumbv4t_none_eabi),
657658
}
658659

‎library/core/src/intrinsics.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -764,7 +764,7 @@ extern "rust-intrinsic" {
764764
/// More specifically, this is the offset in bytes between successive
765765
/// items of the same type, including alignment padding.
766766
///
767-
/// The stabilized version of this intrinsic is [`size_of`].
767+
/// The stabilized version of this intrinsic is [`crate::mem::size_of`].
768768
#[rustc_const_stable(feature = "const_size_of", since = "1.40.0")]
769769
pub fn size_of<T>() -> usize;
770770

‎src/doc/rustc/src/platform-support.md

+1
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ target | std | host | notes
180180
`i686-wrs-vxworks` | ? | |
181181
`mips-unknown-linux-uclibc` | ✓ | | MIPS Linux with uClibc
182182
`mipsel-unknown-linux-uclibc` | ✓ | | MIPS (LE) Linux with uClibc
183+
`mipsel-unknown-none` | * | | Bare MIPS (LE) softfloat
183184
`mipsel-sony-psp` | * | | MIPS (LE) Sony PlayStation Portable (PSP)
184185
`mipsisa32r6-unknown-linux-gnu` | ? | |
185186
`mipsisa32r6el-unknown-linux-gnu` | ? | |

‎src/doc/unstable-book/src/compiler-flags/img/llvm-cov-show-01.png

407 KB
Loading

0 commit comments

Comments
 (0)