about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJohn Kåre Alsaker <john.kare.alsaker@gmail.com>2018-04-17 20:09:40 +0200
committerJohn Kåre Alsaker <john.kare.alsaker@gmail.com>2018-06-01 14:55:55 +0200
commit9eb4f7329b130cca7a8850a93534197aa6af3657 (patch)
tree0ee2e4e91fc3c05620ca81c3c864745b328891b2
parentd6c63ec949c09e30f89f4bc63b42f7822c197b2b (diff)
downloadrust-9eb4f7329b130cca7a8850a93534197aa6af3657.tar.gz
rust-9eb4f7329b130cca7a8850a93534197aa6af3657.zip
Fix optimization_fuel
-rw-r--r--src/librustc/session/mod.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/librustc/session/mod.rs b/src/librustc/session/mod.rs
index 8df66d8d688..076d56fb808 100644
--- a/src/librustc/session/mod.rs
+++ b/src/librustc/session/mod.rs
@@ -845,10 +845,10 @@ impl Session {
     /// We want to know if we're allowed to do an optimization for crate foo from -z fuel=foo=n.
     /// This expends fuel if applicable, and records fuel if applicable.
     pub fn consider_optimizing<T: Fn() -> String>(&self, crate_name: &str, msg: T) -> bool {
-        assert!(self.query_threads() == 1);
         let mut ret = true;
         match self.optimization_fuel_crate {
             Some(ref c) if c == crate_name => {
+                assert!(self.query_threads() == 1);
                 let fuel = self.optimization_fuel_limit.get();
                 ret = fuel != 0;
                 if fuel == 0 && !self.out_of_fuel.get() {
@@ -862,6 +862,7 @@ impl Session {
         }
         match self.print_fuel_crate {
             Some(ref c) if c == crate_name => {
+                assert!(self.query_threads() == 1);
                 self.print_fuel.set(self.print_fuel.get() + 1);
             }
             _ => {}