about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-07-02 11:58:45 +0000
committerbors <bors@rust-lang.org>2018-07-02 11:58:45 +0000
commite75e78256f07aadd120fb867880c0c7913748cbe (patch)
tree649062a93a4c61f487ab4e049c6a1ec43eaced2c
parenta96c88e80fce9d1950aa4700bdeacee35cb9ac02 (diff)
parent28670b68c9b8f4d4e364188b599ec72bed5a593f (diff)
downloadrust-e75e78256f07aadd120fb867880c0c7913748cbe.tar.gz
rust-e75e78256f07aadd120fb867880c0c7913748cbe.zip
Auto merge of #51645 - marco-c:error_when_incremental_and_profile, r=michaelwoerister
Raise an error if gcov profiling and incremental compilation are both enabled

Fixes #50203.
-rw-r--r--src/librustc/session/config.rs7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs
index f831b006642..f97e11ef72f 100644
--- a/src/librustc/session/config.rs
+++ b/src/librustc/session/config.rs
@@ -1970,6 +1970,13 @@ pub fn build_session_options_and_crate_config(
         );
     }
 
+    if debugging_opts.profile && incremental.is_some() {
+        early_error(
+            error_format,
+            "can't instrument with gcov profiling when compiling incrementally",
+        );
+    }
+
     let mut prints = Vec::<PrintRequest>::new();
     if cg.target_cpu.as_ref().map_or(false, |s| s == "help") {
         prints.push(PrintRequest::TargetCPUs);