From 3858aff9d3c47405051bb87c2c61f709bb690b7b Mon Sep 17 00:00:00 2001
From: Wesley Wiser <wwiser@gmail.com>
Date: Wed, 5 Dec 2018 20:25:00 -0500
Subject: [PATCH] Don't print the profiling summary to stdout when
 -Zprofile-json is set

cc rust-lang-nursery/rustc-perf#299
---
 src/librustc/session/mod.rs   | 2 +-
 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 @@ pub fn incr_comp_session_dir_opt(&self) -> Option<cell::Ref<'_, PathBuf>> {
     }
 
     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 c1705ad2d58..87ef232b9d8 100644
--- a/src/librustc_driver/driver.rs
+++ b/src/librustc_driver/driver.rs
@@ -356,10 +356,10 @@ macro_rules! controller_entry_point {
 
     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!(
-- 
2.44.0