diff options
| author | bjorn3 <bjorn3@users.noreply.github.com> | 2021-08-30 14:36:24 +0200 |
|---|---|---|
| committer | Tomasz Miąsko <tomasz.miasko@gmail.com> | 2021-09-28 14:36:59 +0200 |
| commit | 42e9dfd75d293e5051c0204eacd773e1453e3365 (patch) | |
| tree | 2395142aa4e6ec578b9fd6afce599f0724c04197 | |
| parent | 83f147b3baf21acfc367a6da1045d212cd3957e4 (diff) | |
| download | rust-42e9dfd75d293e5051c0204eacd773e1453e3365.tar.gz rust-42e9dfd75d293e5051c0204eacd773e1453e3365.zip | |
Reapply "Remove optimization_fuel_crate from Session"
| -rw-r--r-- | compiler/rustc_session/src/session.rs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/compiler/rustc_session/src/session.rs b/compiler/rustc_session/src/session.rs index 27215556045..b8b9c03091f 100644 --- a/compiler/rustc_session/src/session.rs +++ b/compiler/rustc_session/src/session.rs @@ -169,9 +169,6 @@ pub struct Session { /// Data about code being compiled, gathered during compilation. pub code_stats: CodeStats, - /// If `-zfuel=crate=n` is specified, `Some(crate)`. - optimization_fuel_crate: Option<String>, - /// Tracks fuel info if `-zfuel=crate=n` is specified. optimization_fuel: Lock<OptimizationFuel>, @@ -896,7 +893,7 @@ impl Session { /// This expends fuel if applicable, and records fuel if applicable. pub fn consider_optimizing<T: Fn() -> String>(&self, crate_name: &str, msg: T) -> bool { let mut ret = true; - if let Some(ref c) = self.optimization_fuel_crate { + if let Some((ref c, _)) = self.opts.debugging_opts.fuel { if c == crate_name { assert_eq!(self.threads(), 1); let mut fuel = self.optimization_fuel.lock(); @@ -1274,7 +1271,6 @@ pub fn build_session( let local_crate_source_file = local_crate_source_file.map(|path| file_path_mapping.map_prefix(path).0); - let optimization_fuel_crate = sopts.debugging_opts.fuel.as_ref().map(|i| i.0.clone()); let optimization_fuel = Lock::new(OptimizationFuel { remaining: sopts.debugging_opts.fuel.as_ref().map_or(0, |i| i.1), out_of_fuel: false, @@ -1326,7 +1322,6 @@ pub fn build_session( normalize_projection_ty: AtomicUsize::new(0), }, code_stats: Default::default(), - optimization_fuel_crate, optimization_fuel, print_fuel, jobserver: jobserver::client(), |