Skip to content

Commit 48696f5

Browse files
borsbors
committed
Auto merge of rust-lang#133516 - compiler-errors:rollup-mq334h8, r=compiler-errors
Rollup of 8 pull requests Successful merges: - rust-lang#115293 (Remove -Zfuel.) - rust-lang#132605 (CI: increase timeout from 4h to 6h) - rust-lang#133304 (Revert diagnostics hack to fix ICE 132920) - rust-lang#133402 (Constify `Drop` and `Destruct`) - rust-lang#133458 (Fix `Result` and `Option` not getting a jump to def link generated) - rust-lang#133471 (gce: fix typing_mode mismatch) - rust-lang#133475 (`MaybeStorage` improvements) - rust-lang#133513 (Only ignore windows-gnu in avr-jmp-offset) r? `@ghost` `@rustbot` modify labels: rollup
2 parents dd2837e + 702996c commit 48696f5

File tree

73 files changed

+371
-1069
lines changed

Some content is hidden

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

73 files changed

+371
-1069
lines changed

Diff for: ‎.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
defaults:
6666
run:
6767
shell: ${{ contains(matrix.os, 'windows') && 'msys2 {0}' || 'bash' }}
68-
timeout-minutes: 240
68+
timeout-minutes: 360
6969
env:
7070
CI_JOB_NAME: ${{ matrix.image }}
7171
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse

Diff for: ‎compiler/rustc_const_eval/src/check_consts/check.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ use rustc_middle::span_bug;
1818
use rustc_middle::ty::adjustment::PointerCoercion;
1919
use rustc_middle::ty::{self, Ty, TypeVisitableExt};
2020
use rustc_mir_dataflow::Analysis;
21-
use rustc_mir_dataflow::impls::MaybeStorageLive;
22-
use rustc_mir_dataflow::storage::always_storage_live_locals;
21+
use rustc_mir_dataflow::impls::{MaybeStorageLive, always_storage_live_locals};
2322
use rustc_span::{Span, Symbol, sym};
2423
use rustc_trait_selection::traits::{
2524
Obligation, ObligationCause, ObligationCauseCode, ObligationCtxt,

Diff for: ‎compiler/rustc_const_eval/src/interpret/stack.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use rustc_index::IndexVec;
1010
use rustc_middle::ty::layout::{LayoutOf, TyAndLayout};
1111
use rustc_middle::ty::{self, Ty, TyCtxt};
1212
use rustc_middle::{bug, mir};
13-
use rustc_mir_dataflow::storage::always_storage_live_locals;
13+
use rustc_mir_dataflow::impls::always_storage_live_locals;
1414
use rustc_span::Span;
1515
use tracing::{info_span, instrument, trace};
1616

Diff for: ‎compiler/rustc_driver_impl/src/lib.rs

-4
Original file line numberDiff line numberDiff line change
@@ -472,10 +472,6 @@ fn run_compiler(
472472
linker.link(sess, codegen_backend)?
473473
}
474474

475-
if let Some(fuel) = sess.opts.unstable_opts.print_fuel.as_deref() {
476-
eprintln!("Fuel used by {}: {}", fuel, sess.print_fuel.load(Ordering::SeqCst));
477-
}
478-
479475
Ok(())
480476
})
481477
}

Diff for: ‎compiler/rustc_interface/src/tests.rs

-2
Original file line numberDiff line numberDiff line change
@@ -784,7 +784,6 @@ fn test_unstable_options_tracking_hash() {
784784
tracked!(flatten_format_args, false);
785785
tracked!(fmt_debug, FmtDebug::Shallow);
786786
tracked!(force_unstable_if_unmarked, true);
787-
tracked!(fuel, Some(("abc".to_string(), 99)));
788787
tracked!(function_return, FunctionReturn::ThunkExtern);
789788
tracked!(function_sections, Some(false));
790789
tracked!(human_readable_cgu_names, true);
@@ -830,7 +829,6 @@ fn test_unstable_options_tracking_hash() {
830829
tracked!(plt, Some(true));
831830
tracked!(polonius, Polonius::Legacy);
832831
tracked!(precise_enum_drop_elaboration, false);
833-
tracked!(print_fuel, Some("abc".to_string()));
834832
tracked!(profile_sample_use, Some(PathBuf::from("abc")));
835833
tracked!(profiler_runtime, "abc".to_string());
836834
tracked!(regparm, Some(3));

Diff for: ‎compiler/rustc_middle/src/ty/context.rs

-4
Original file line numberDiff line numberDiff line change
@@ -1566,10 +1566,6 @@ impl<'tcx> TyCtxt<'tcx> {
15661566
}
15671567
}
15681568

1569-
pub fn consider_optimizing<T: Fn() -> String>(self, msg: T) -> bool {
1570-
self.sess.consider_optimizing(|| self.crate_name(LOCAL_CRATE), msg)
1571-
}
1572-
15731569
/// Obtain all lang items of this crate and all dependencies (recursively)
15741570
pub fn lang_items(self) -> &'tcx rustc_hir::lang_items::LanguageItems {
15751571
self.get_lang_items(())

Diff for: ‎compiler/rustc_middle/src/ty/mod.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -1558,10 +1558,7 @@ impl<'tcx> TyCtxt<'tcx> {
15581558
let is_box = self.is_lang_item(did.to_def_id(), LangItem::OwnedBox);
15591559

15601560
// This is here instead of layout because the choice must make it into metadata.
1561-
if is_box
1562-
|| !self
1563-
.consider_optimizing(|| format!("Reorder fields of {:?}", self.def_path_str(did)))
1564-
{
1561+
if is_box {
15651562
flags.insert(ReprFlags::IS_LINEAR);
15661563
}
15671564

Diff for: ‎compiler/rustc_mir_dataflow/src/impls/mod.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,6 @@ pub use self::initialized::{
1414
pub use self::liveness::{
1515
MaybeLiveLocals, MaybeTransitiveLiveLocals, TransferFunction as LivenessTransferFunction,
1616
};
17-
pub use self::storage_liveness::{MaybeRequiresStorage, MaybeStorageDead, MaybeStorageLive};
17+
pub use self::storage_liveness::{
18+
MaybeRequiresStorage, MaybeStorageDead, MaybeStorageLive, always_storage_live_locals,
19+
};

Diff for: ‎compiler/rustc_mir_dataflow/src/impls/storage_liveness.rs

+18-4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,23 @@ use rustc_middle::mir::*;
77
use super::MaybeBorrowedLocals;
88
use crate::{Analysis, GenKill, ResultsCursor};
99

10+
/// The set of locals in a MIR body that do not have `StorageLive`/`StorageDead` annotations.
11+
///
12+
/// These locals have fixed storage for the duration of the body.
13+
pub fn always_storage_live_locals(body: &Body<'_>) -> BitSet<Local> {
14+
let mut always_live_locals = BitSet::new_filled(body.local_decls.len());
15+
16+
for block in &*body.basic_blocks {
17+
for statement in &block.statements {
18+
if let StatementKind::StorageLive(l) | StatementKind::StorageDead(l) = statement.kind {
19+
always_live_locals.remove(l);
20+
}
21+
}
22+
}
23+
24+
always_live_locals
25+
}
26+
1027
pub struct MaybeStorageLive<'a> {
1128
always_live_locals: Cow<'a, BitSet<Local>>,
1229
}
@@ -28,10 +45,7 @@ impl<'a, 'tcx> Analysis<'tcx> for MaybeStorageLive<'a> {
2845
}
2946

3047
fn initialize_start_block(&self, body: &Body<'tcx>, on_entry: &mut Self::Domain) {
31-
assert_eq!(body.local_decls.len(), self.always_live_locals.domain_size());
32-
for local in self.always_live_locals.iter() {
33-
on_entry.insert(local);
34-
}
48+
on_entry.union(&*self.always_live_locals);
3549

3650
for arg in body.args_iter() {
3751
on_entry.insert(arg);

Diff for: ‎compiler/rustc_mir_dataflow/src/lib.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,15 @@ pub use self::framework::{
2525
use self::move_paths::MoveData;
2626

2727
pub mod debuginfo;
28-
pub mod drop_flag_effects;
28+
mod drop_flag_effects;
2929
pub mod elaborate_drops;
3030
mod errors;
3131
mod framework;
3232
pub mod impls;
3333
pub mod move_paths;
3434
pub mod points;
3535
pub mod rustc_peek;
36-
pub mod storage;
37-
pub mod un_derefer;
36+
mod un_derefer;
3837
pub mod value_analysis;
3938

4039
rustc_fluent_macro::fluent_messages! { "../messages.ftl" }

Diff for: ‎compiler/rustc_mir_dataflow/src/storage.rs

-20
This file was deleted.

Diff for: ‎compiler/rustc_mir_transform/src/coroutine.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ use rustc_middle::ty::{
7070
use rustc_middle::{bug, span_bug};
7171
use rustc_mir_dataflow::impls::{
7272
MaybeBorrowedLocals, MaybeLiveLocals, MaybeRequiresStorage, MaybeStorageLive,
73+
always_storage_live_locals,
7374
};
74-
use rustc_mir_dataflow::storage::always_storage_live_locals;
7575
use rustc_mir_dataflow::{Analysis, Results, ResultsVisitor};
7676
use rustc_span::Span;
7777
use rustc_span::def_id::{DefId, LocalDefId};
@@ -696,8 +696,7 @@ fn locals_live_across_suspend_points<'tcx>(
696696
let loc = Location { block, statement_index: data.statements.len() };
697697

698698
liveness.seek_to_block_end(block);
699-
let mut live_locals: BitSet<_> = BitSet::new_empty(body.local_decls.len());
700-
live_locals.union(liveness.get());
699+
let mut live_locals = liveness.get().clone();
701700

702701
if !movable {
703702
// The `liveness` variable contains the liveness of MIR locals ignoring borrows.

Diff for: ‎compiler/rustc_mir_transform/src/dest_prop.rs

-5
Original file line numberDiff line numberDiff line change
@@ -217,11 +217,6 @@ impl<'tcx> crate::MirPass<'tcx> for DestinationPropagation {
217217
else {
218218
continue;
219219
};
220-
if !tcx.consider_optimizing(|| {
221-
format!("{} round {}", tcx.def_path_str(def_id), round_count)
222-
}) {
223-
break;
224-
}
225220

226221
// Replace `src` by `dest` everywhere.
227222
merges.insert(*src, *dest);

Diff for: ‎compiler/rustc_mir_transform/src/early_otherwise_branch.rs

-4
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,6 @@ impl<'tcx> crate::MirPass<'tcx> for EarlyOtherwiseBranch {
108108
let parent = BasicBlock::from_usize(i);
109109
let Some(opt_data) = evaluate_candidate(tcx, body, parent) else { continue };
110110

111-
if !tcx.consider_optimizing(|| format!("EarlyOtherwiseBranch {opt_data:?}")) {
112-
break;
113-
}
114-
115111
trace!("SUCCESS: found optimization possibility to apply: {opt_data:?}");
116112

117113
should_cleanup = true;

Diff for: ‎compiler/rustc_mir_transform/src/inline.rs

-6
Original file line numberDiff line numberDiff line change
@@ -210,12 +210,6 @@ impl<'tcx> Inliner<'tcx> {
210210
let callee_body = try_instance_mir(self.tcx, callsite.callee.def)?;
211211
self.check_mir_body(callsite, callee_body, callee_attrs, cross_crate_inlinable)?;
212212

213-
if !self.tcx.consider_optimizing(|| {
214-
format!("Inline {:?} into {:?}", callsite.callee, caller_body.source)
215-
}) {
216-
return Err("optimization fuel exhausted");
217-
}
218-
219213
let Ok(callee_body) = callsite.callee.try_instantiate_mir_and_normalize_erasing_regions(
220214
self.tcx,
221215
self.typing_env,

Diff for: ‎compiler/rustc_mir_transform/src/instsimplify.rs

+14-57
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ use rustc_middle::bug;
77
use rustc_middle::mir::*;
88
use rustc_middle::ty::layout::ValidityRequirement;
99
use rustc_middle::ty::{self, GenericArgsRef, Ty, TyCtxt, layout};
10-
use rustc_span::sym;
1110
use rustc_span::symbol::Symbol;
11+
use rustc_span::{DUMMY_SP, sym};
1212

1313
use crate::simplify::simplify_duplicate_switch_targets;
1414
use crate::take_array;
@@ -43,12 +43,12 @@ impl<'tcx> crate::MirPass<'tcx> for InstSimplify {
4343
match statement.kind {
4444
StatementKind::Assign(box (_place, ref mut rvalue)) => {
4545
if !preserve_ub_checks {
46-
ctx.simplify_ub_check(&statement.source_info, rvalue);
46+
ctx.simplify_ub_check(rvalue);
4747
}
48-
ctx.simplify_bool_cmp(&statement.source_info, rvalue);
49-
ctx.simplify_ref_deref(&statement.source_info, rvalue);
50-
ctx.simplify_len(&statement.source_info, rvalue);
51-
ctx.simplify_ptr_aggregate(&statement.source_info, rvalue);
48+
ctx.simplify_bool_cmp(rvalue);
49+
ctx.simplify_ref_deref(rvalue);
50+
ctx.simplify_len(rvalue);
51+
ctx.simplify_ptr_aggregate(rvalue);
5252
ctx.simplify_cast(rvalue);
5353
}
5454
_ => {}
@@ -70,23 +70,8 @@ struct InstSimplifyContext<'a, 'tcx> {
7070
}
7171

7272
impl<'tcx> InstSimplifyContext<'_, 'tcx> {
73-
fn should_simplify(&self, source_info: &SourceInfo, rvalue: &Rvalue<'tcx>) -> bool {
74-
self.should_simplify_custom(source_info, "Rvalue", rvalue)
75-
}
76-
77-
fn should_simplify_custom(
78-
&self,
79-
source_info: &SourceInfo,
80-
label: &str,
81-
value: impl std::fmt::Debug,
82-
) -> bool {
83-
self.tcx.consider_optimizing(|| {
84-
format!("InstSimplify - {label}: {value:?} SourceInfo: {source_info:?}")
85-
})
86-
}
87-
8873
/// Transform boolean comparisons into logical operations.
89-
fn simplify_bool_cmp(&self, source_info: &SourceInfo, rvalue: &mut Rvalue<'tcx>) {
74+
fn simplify_bool_cmp(&self, rvalue: &mut Rvalue<'tcx>) {
9075
match rvalue {
9176
Rvalue::BinaryOp(op @ (BinOp::Eq | BinOp::Ne), box (a, b)) => {
9277
let new = match (op, self.try_eval_bool(a), self.try_eval_bool(b)) {
@@ -117,9 +102,7 @@ impl<'tcx> InstSimplifyContext<'_, 'tcx> {
117102
_ => None,
118103
};
119104

120-
if let Some(new) = new
121-
&& self.should_simplify(source_info, rvalue)
122-
{
105+
if let Some(new) = new {
123106
*rvalue = new;
124107
}
125108
}
@@ -134,17 +117,13 @@ impl<'tcx> InstSimplifyContext<'_, 'tcx> {
134117
}
135118

136119
/// Transform `&(*a)` ==> `a`.
137-
fn simplify_ref_deref(&self, source_info: &SourceInfo, rvalue: &mut Rvalue<'tcx>) {
120+
fn simplify_ref_deref(&self, rvalue: &mut Rvalue<'tcx>) {
138121
if let Rvalue::Ref(_, _, place) | Rvalue::RawPtr(_, place) = rvalue {
139122
if let Some((base, ProjectionElem::Deref)) = place.as_ref().last_projection() {
140123
if rvalue.ty(self.local_decls, self.tcx) != base.ty(self.local_decls, self.tcx).ty {
141124
return;
142125
}
143126

144-
if !self.should_simplify(source_info, rvalue) {
145-
return;
146-
}
147-
148127
*rvalue = Rvalue::Use(Operand::Copy(Place {
149128
local: base.local,
150129
projection: self.tcx.mk_place_elems(base.projection),
@@ -154,36 +133,24 @@ impl<'tcx> InstSimplifyContext<'_, 'tcx> {
154133
}
155134

156135
/// Transform `Len([_; N])` ==> `N`.
157-
fn simplify_len(&self, source_info: &SourceInfo, rvalue: &mut Rvalue<'tcx>) {
136+
fn simplify_len(&self, rvalue: &mut Rvalue<'tcx>) {
158137
if let Rvalue::Len(ref place) = *rvalue {
159138
let place_ty = place.ty(self.local_decls, self.tcx).ty;
160139
if let ty::Array(_, len) = *place_ty.kind() {
161-
if !self.should_simplify(source_info, rvalue) {
162-
return;
163-
}
164-
165140
let const_ = Const::from_ty_const(len, self.tcx.types.usize, self.tcx);
166-
let constant = ConstOperand { span: source_info.span, const_, user_ty: None };
141+
let constant = ConstOperand { span: DUMMY_SP, const_, user_ty: None };
167142
*rvalue = Rvalue::Use(Operand::Constant(Box::new(constant)));
168143
}
169144
}
170145
}
171146

172147
/// Transform `Aggregate(RawPtr, [p, ()])` ==> `Cast(PtrToPtr, p)`.
173-
fn simplify_ptr_aggregate(&self, source_info: &SourceInfo, rvalue: &mut Rvalue<'tcx>) {
148+
fn simplify_ptr_aggregate(&self, rvalue: &mut Rvalue<'tcx>) {
174149
if let Rvalue::Aggregate(box AggregateKind::RawPtr(pointee_ty, mutability), fields) = rvalue
175150
{
176151
let meta_ty = fields.raw[1].ty(self.local_decls, self.tcx);
177152
if meta_ty.is_unit() {
178153
// The mutable borrows we're holding prevent printing `rvalue` here
179-
if !self.should_simplify_custom(
180-
source_info,
181-
"Aggregate::RawPtr",
182-
(&pointee_ty, *mutability, &fields),
183-
) {
184-
return;
185-
}
186-
187154
let mut fields = std::mem::take(fields);
188155
let _meta = fields.pop().unwrap();
189156
let data = fields.pop().unwrap();
@@ -193,10 +160,10 @@ impl<'tcx> InstSimplifyContext<'_, 'tcx> {
193160
}
194161
}
195162

196-
fn simplify_ub_check(&self, source_info: &SourceInfo, rvalue: &mut Rvalue<'tcx>) {
163+
fn simplify_ub_check(&self, rvalue: &mut Rvalue<'tcx>) {
197164
if let Rvalue::NullaryOp(NullOp::UbChecks, _) = *rvalue {
198165
let const_ = Const::from_bool(self.tcx, self.tcx.sess.ub_checks());
199-
let constant = ConstOperand { span: source_info.span, const_, user_ty: None };
166+
let constant = ConstOperand { span: DUMMY_SP, const_, user_ty: None };
200167
*rvalue = Rvalue::Use(Operand::Constant(Box::new(constant)));
201168
}
202169
}
@@ -284,16 +251,6 @@ impl<'tcx> InstSimplifyContext<'_, 'tcx> {
284251
return;
285252
}
286253

287-
if !self.tcx.consider_optimizing(|| {
288-
format!(
289-
"InstSimplify - Call: {:?} SourceInfo: {:?}",
290-
(fn_def_id, fn_args),
291-
terminator.source_info
292-
)
293-
}) {
294-
return;
295-
}
296-
297254
let Ok([arg]) = take_array(args) else { return };
298255
let Some(arg_place) = arg.node.place() else { return };
299256

Diff for: ‎compiler/rustc_mir_transform/src/lint.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ use rustc_index::bit_set::BitSet;
99
use rustc_middle::mir::visit::{PlaceContext, Visitor};
1010
use rustc_middle::mir::*;
1111
use rustc_middle::ty::TyCtxt;
12-
use rustc_mir_dataflow::impls::{MaybeStorageDead, MaybeStorageLive};
13-
use rustc_mir_dataflow::storage::always_storage_live_locals;
12+
use rustc_mir_dataflow::impls::{MaybeStorageDead, MaybeStorageLive, always_storage_live_locals};
1413
use rustc_mir_dataflow::{Analysis, ResultsCursor};
1514

1615
pub(super) fn lint_body<'tcx>(tcx: TyCtxt<'tcx>, body: &Body<'tcx>, when: String) {

Diff for: ‎compiler/rustc_mir_transform/src/match_branches.rs

-5
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,11 @@ impl<'tcx> crate::MirPass<'tcx> for MatchBranchSimplification {
1818
}
1919

2020
fn run_pass(&self, tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) {
21-
let def_id = body.source.def_id();
2221
let typing_env = body.typing_env(tcx);
2322
let mut should_cleanup = false;
2423
for i in 0..body.basic_blocks.len() {
2524
let bbs = &*body.basic_blocks;
2625
let bb_idx = BasicBlock::from_usize(i);
27-
if !tcx.consider_optimizing(|| format!("MatchBranchSimplification {def_id:?} ")) {
28-
continue;
29-
}
30-
3126
match bbs[bb_idx].terminator().kind {
3227
TerminatorKind::SwitchInt {
3328
discr: ref _discr @ (Operand::Copy(_) | Operand::Move(_)),

0 commit comments

Comments
 (0)