Skip to content

Commit 2aecdf3

Browse files
cjgillotcjgillot
committed
Remove -Zfuel.
1 parent 249cf71 commit 2aecdf3

26 files changed

+18
-290
lines changed

‎compiler/rustc_driver_impl/src/lib.rs‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -461,14 +461,6 @@ fn run_compiler(
461461
linker.link(sess, codegen_backend)?
462462
}
463463

464-
if sess.opts.unstable_opts.print_fuel.is_some() {
465-
eprintln!(
466-
"Fuel used by {}: {}",
467-
sess.opts.unstable_opts.print_fuel.as_ref().unwrap(),
468-
sess.print_fuel.load(Ordering::SeqCst)
469-
);
470-
}
471-
472464
Ok(())
473465
})
474466
}

‎compiler/rustc_interface/src/tests.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,6 @@ fn test_unstable_options_tracking_hash() {
779779
tracked!(fixed_x18, true);
780780
tracked!(flatten_format_args, false);
781781
tracked!(force_unstable_if_unmarked, true);
782-
tracked!(fuel, Some(("abc".to_string(), 99)));
783782
tracked!(function_return, FunctionReturn::ThunkExtern);
784783
tracked!(function_sections, Some(false));
785784
tracked!(human_readable_cgu_names, true);
@@ -824,7 +823,6 @@ fn test_unstable_options_tracking_hash() {
824823
tracked!(plt, Some(true));
825824
tracked!(polonius, Polonius::Legacy);
826825
tracked!(precise_enum_drop_elaboration, false);
827-
tracked!(print_fuel, Some("abc".to_string()));
828826
tracked!(profile, true);
829827
tracked!(profile_emit, Some(PathBuf::from("abc")));
830828
tracked!(profile_sample_use, Some(PathBuf::from("abc")));

‎compiler/rustc_middle/src/ty/context.rs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1538,10 +1538,6 @@ impl<'tcx> TyCtxt<'tcx> {
15381538
}
15391539
}
15401540

1541-
pub fn consider_optimizing<T: Fn() -> String>(self, msg: T) -> bool {
1542-
self.sess.consider_optimizing(|| self.crate_name(LOCAL_CRATE), msg)
1543-
}
1544-
15451541
/// Obtain all lang items of this crate and all dependencies (recursively)
15461542
pub fn lang_items(self) -> &'tcx rustc_hir::lang_items::LanguageItems {
15471543
self.get_lang_items(())

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1569,11 +1569,6 @@ impl<'tcx> TyCtxt<'tcx> {
15691569
flags.insert(ReprFlags::RANDOMIZE_LAYOUT);
15701570
}
15711571

1572-
// This is here instead of layout because the choice must make it into metadata.
1573-
if !self.consider_optimizing(|| format!("Reorder fields of {:?}", self.def_path_str(did))) {
1574-
flags.insert(ReprFlags::IS_LINEAR);
1575-
}
1576-
15771572
ReprOptions { int: size, align: max_align, pack: min_pack, flags, field_shuffle_seed }
15781573
}
15791574

‎compiler/rustc_mir_transform/src/dest_prop.rs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -225,11 +225,6 @@ impl<'tcx> MirPass<'tcx> for DestinationPropagation {
225225
else {
226226
continue;
227227
};
228-
if !tcx.consider_optimizing(|| {
229-
format!("{} round {}", tcx.def_path_str(def_id), round_count)
230-
}) {
231-
break;
232-
}
233228

234229
// Replace `src` by `dest` everywhere.
235230
merges.insert(*src, *dest);

‎compiler/rustc_mir_transform/src/early_otherwise_branch.rs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,6 @@ impl<'tcx> MirPass<'tcx> for EarlyOtherwiseBranch {
107107
let parent = BasicBlock::from_usize(i);
108108
let Some(opt_data) = evaluate_candidate(tcx, body, parent) else { continue };
109109

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

116112
should_cleanup = true;

‎compiler/rustc_mir_transform/src/inline.rs‎

Lines changed: 0 additions & 6 deletions
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.param_env,

‎compiler/rustc_mir_transform/src/instsimplify.rs‎

Lines changed: 14 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ use rustc_middle::bug;
66
use rustc_middle::mir::*;
77
use rustc_middle::ty::layout::ValidityRequirement;
88
use rustc_middle::ty::{self, layout, GenericArgsRef, ParamEnv, Ty, TyCtxt};
9-
use rustc_span::sym;
109
use rustc_span::symbol::Symbol;
10+
use rustc_span::{sym, DUMMY_SP};
1111
use rustc_target::spec::abi::Abi;
1212

1313
use crate::simplify::simplify_duplicate_switch_targets;
@@ -49,12 +49,12 @@ impl<'tcx> MirPass<'tcx> for InstSimplify {
4949
match statement.kind {
5050
StatementKind::Assign(box (_place, ref mut rvalue)) => {
5151
if !preserve_ub_checks {
52-
ctx.simplify_ub_check(&statement.source_info, rvalue);
52+
ctx.simplify_ub_check(rvalue);
5353
}
54-
ctx.simplify_bool_cmp(&statement.source_info, rvalue);
55-
ctx.simplify_ref_deref(&statement.source_info, rvalue);
56-
ctx.simplify_len(&statement.source_info, rvalue);
57-
ctx.simplify_ptr_aggregate(&statement.source_info, rvalue);
54+
ctx.simplify_bool_cmp(rvalue);
55+
ctx.simplify_ref_deref(rvalue);
56+
ctx.simplify_len(rvalue);
57+
ctx.simplify_ptr_aggregate(rvalue);
5858
ctx.simplify_cast(rvalue);
5959
}
6060
_ => {}
@@ -76,23 +76,8 @@ struct InstSimplifyContext<'tcx, 'a> {
7676
}
7777

7878
impl<'tcx> InstSimplifyContext<'tcx, '_> {
79-
fn should_simplify(&self, source_info: &SourceInfo, rvalue: &Rvalue<'tcx>) -> bool {
80-
self.should_simplify_custom(source_info, "Rvalue", rvalue)
81-
}
82-
83-
fn should_simplify_custom(
84-
&self,
85-
source_info: &SourceInfo,
86-
label: &str,
87-
value: impl std::fmt::Debug,
88-
) -> bool {
89-
self.tcx.consider_optimizing(|| {
90-
format!("InstSimplify - {label}: {value:?} SourceInfo: {source_info:?}")
91-
})
92-
}
93-
9479
/// Transform boolean comparisons into logical operations.
95-
fn simplify_bool_cmp(&self, source_info: &SourceInfo, rvalue: &mut Rvalue<'tcx>) {
80+
fn simplify_bool_cmp(&self, rvalue: &mut Rvalue<'tcx>) {
9681
match rvalue {
9782
Rvalue::BinaryOp(op @ (BinOp::Eq | BinOp::Ne), box (a, b)) => {
9883
let new = match (op, self.try_eval_bool(a), self.try_eval_bool(b)) {
@@ -123,9 +108,7 @@ impl<'tcx> InstSimplifyContext<'tcx, '_> {
123108
_ => None,
124109
};
125110

126-
if let Some(new) = new
127-
&& self.should_simplify(source_info, rvalue)
128-
{
111+
if let Some(new) = new {
129112
*rvalue = new;
130113
}
131114
}
@@ -140,17 +123,13 @@ impl<'tcx> InstSimplifyContext<'tcx, '_> {
140123
}
141124

142125
/// Transform `&(*a)` ==> `a`.
143-
fn simplify_ref_deref(&self, source_info: &SourceInfo, rvalue: &mut Rvalue<'tcx>) {
126+
fn simplify_ref_deref(&self, rvalue: &mut Rvalue<'tcx>) {
144127
if let Rvalue::Ref(_, _, place) | Rvalue::AddressOf(_, place) = rvalue {
145128
if let Some((base, ProjectionElem::Deref)) = place.as_ref().last_projection() {
146129
if rvalue.ty(self.local_decls, self.tcx) != base.ty(self.local_decls, self.tcx).ty {
147130
return;
148131
}
149132

150-
if !self.should_simplify(source_info, rvalue) {
151-
return;
152-
}
153-
154133
*rvalue = Rvalue::Use(Operand::Copy(Place {
155134
local: base.local,
156135
projection: self.tcx.mk_place_elems(base.projection),
@@ -160,36 +139,24 @@ impl<'tcx> InstSimplifyContext<'tcx, '_> {
160139
}
161140

162141
/// Transform `Len([_; N])` ==> `N`.
163-
fn simplify_len(&self, source_info: &SourceInfo, rvalue: &mut Rvalue<'tcx>) {
142+
fn simplify_len(&self, rvalue: &mut Rvalue<'tcx>) {
164143
if let Rvalue::Len(ref place) = *rvalue {
165144
let place_ty = place.ty(self.local_decls, self.tcx).ty;
166145
if let ty::Array(_, len) = *place_ty.kind() {
167-
if !self.should_simplify(source_info, rvalue) {
168-
return;
169-
}
170-
171146
let const_ = Const::from_ty_const(len, self.tcx.types.usize, self.tcx);
172-
let constant = ConstOperand { span: source_info.span, const_, user_ty: None };
147+
let constant = ConstOperand { span: DUMMY_SP, const_, user_ty: None };
173148
*rvalue = Rvalue::Use(Operand::Constant(Box::new(constant)));
174149
}
175150
}
176151
}
177152

178153
/// Transform `Aggregate(RawPtr, [p, ()])` ==> `Cast(PtrToPtr, p)`.
179-
fn simplify_ptr_aggregate(&self, source_info: &SourceInfo, rvalue: &mut Rvalue<'tcx>) {
154+
fn simplify_ptr_aggregate(&self, rvalue: &mut Rvalue<'tcx>) {
180155
if let Rvalue::Aggregate(box AggregateKind::RawPtr(pointee_ty, mutability), fields) = rvalue
181156
{
182157
let meta_ty = fields.raw[1].ty(self.local_decls, self.tcx);
183158
if meta_ty.is_unit() {
184159
// The mutable borrows we're holding prevent printing `rvalue` here
185-
if !self.should_simplify_custom(
186-
source_info,
187-
"Aggregate::RawPtr",
188-
(&pointee_ty, *mutability, &fields),
189-
) {
190-
return;
191-
}
192-
193160
let mut fields = std::mem::take(fields);
194161
let _meta = fields.pop().unwrap();
195162
let data = fields.pop().unwrap();
@@ -199,10 +166,10 @@ impl<'tcx> InstSimplifyContext<'tcx, '_> {
199166
}
200167
}
201168

202-
fn simplify_ub_check(&self, source_info: &SourceInfo, rvalue: &mut Rvalue<'tcx>) {
169+
fn simplify_ub_check(&self, rvalue: &mut Rvalue<'tcx>) {
203170
if let Rvalue::NullaryOp(NullOp::UbChecks, _) = *rvalue {
204171
let const_ = Const::from_bool(self.tcx, self.tcx.sess.ub_checks());
205-
let constant = ConstOperand { span: source_info.span, const_, user_ty: None };
172+
let constant = ConstOperand { span: DUMMY_SP, const_, user_ty: None };
206173
*rvalue = Rvalue::Use(Operand::Constant(Box::new(constant)));
207174
}
208175
}
@@ -292,16 +259,6 @@ impl<'tcx> InstSimplifyContext<'tcx, '_> {
292259
return;
293260
}
294261

295-
if !self.tcx.consider_optimizing(|| {
296-
format!(
297-
"InstSimplify - Call: {:?} SourceInfo: {:?}",
298-
(fn_def_id, fn_args),
299-
terminator.source_info
300-
)
301-
}) {
302-
return;
303-
}
304-
305262
let Ok([arg]) = take_array(args) else { return };
306263
let Some(arg_place) = arg.node.place() else { return };
307264

‎compiler/rustc_mir_transform/src/match_branches.rs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ impl<'tcx> MirPass<'tcx> for MatchBranchSimplification {
2323
for i in 0..body.basic_blocks.len() {
2424
let bbs = &*body.basic_blocks;
2525
let bb_idx = BasicBlock::from_usize(i);
26-
if !tcx.consider_optimizing(|| format!("MatchBranchSimplification {def_id:?} ")) {
27-
continue;
28-
}
29-
3026
match bbs[bb_idx].terminator().kind {
3127
TerminatorKind::SwitchInt {
3228
discr: ref _discr @ (Operand::Copy(_) | Operand::Move(_)),

‎compiler/rustc_mir_transform/src/multiple_return_terminators.rs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@ impl<'tcx> MirPass<'tcx> for MultipleReturnTerminators {
1414
sess.mir_opt_level() >= 4
1515
}
1616

17-
fn run_pass(&self, tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) {
17+
fn run_pass(&self, _: TyCtxt<'tcx>, body: &mut Body<'tcx>) {
1818
// find basic blocks with no statement and a return terminator
1919
let mut bbs_simple_returns = BitSet::new_empty(body.basic_blocks.len());
20-
let def_id = body.source.def_id();
2120
let bbs = body.basic_blocks_mut();
2221
for idx in bbs.indices() {
2322
if bbs[idx].statements.is_empty()
@@ -28,10 +27,6 @@ impl<'tcx> MirPass<'tcx> for MultipleReturnTerminators {
2827
}
2928

3029
for bb in bbs {
31-
if !tcx.consider_optimizing(|| format!("MultipleReturnTerminators {def_id:?} ")) {
32-
break;
33-
}
34-
3530
if let TerminatorKind::Goto { target } = bb.terminator().kind {
3631
if bbs_simple_returns.contains(target) {
3732
bb.terminator_mut().kind = TerminatorKind::Return;

0 commit comments

Comments
 (0)