diff options
| author | Pietro Albini <pietro@pietroalbini.org> | 2018-12-06 07:49:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-06 07:49:02 +0100 |
| commit | cd1ee5edbd080659f1ff353dd828bdf9749cf11d (patch) | |
| tree | 70e249dbf8e55a9e249d9d32f8235abf069c1c9b /src | |
| parent | e9e92d53ade5767e533338bc6b2aaa70083c30ec (diff) | |
| parent | 3858aff9d3c47405051bb87c2c61f709bb690b7b (diff) | |
| download | rust-cd1ee5edbd080659f1ff353dd828bdf9749cf11d.tar.gz rust-cd1ee5edbd080659f1ff353dd828bdf9749cf11d.zip | |
Rollup merge of #56553 - wesleywiser:silence_profiler_output, r=Mark-Simulacrum
Don't print the profiling summary to stdout when -Zprofile-json is set cc rust-lang-nursery/rustc-perf#299
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc/session/mod.rs | 2 | ||||
| -rw-r--r-- | src/librustc_driver/driver.rs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/librustc/session/mod.rs b/src/librustc/session/mod.rs index d1c3acc57b7..293cd0c7c54 100644 --- a/src/librustc/session/mod.rs +++ b/src/librustc/session/mod.rs @@ -826,7 +826,7 @@ impl Session { } pub fn profiler<F: FnOnce(&mut SelfProfiler) -> ()>(&self, f: F) { - if self.opts.debugging_opts.self_profile { + if self.opts.debugging_opts.self_profile || self.opts.debugging_opts.profile_json { let mut profiler = self.self_profiling.borrow_mut(); f(&mut profiler); } diff --git a/src/librustc_driver/driver.rs b/src/librustc_driver/driver.rs index 777cc09b8b1..48014a9e119 100644 --- a/src/librustc_driver/driver.rs +++ b/src/librustc_driver/driver.rs @@ -356,10 +356,10 @@ pub fn compile_input( if sess.opts.debugging_opts.self_profile { sess.print_profiler_results(); + } - if sess.opts.debugging_opts.profile_json { - sess.save_json_results(); - } + if sess.opts.debugging_opts.profile_json { + sess.save_json_results(); } controller_entry_point!( |