about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-10-07 10:36:46 +0200
committerGitHub <noreply@github.com>2019-10-07 10:36:46 +0200
commit3a1f8dfeb8a568294e90e1fc59446a4b3547bea1 (patch)
treefeb3f3f467571932077828441246b51fc8535a7d
parent0c96a12909709a0cce0adc67c8b67e977c42a738 (diff)
parent993e3a52cb33c4ea97ab8c73b449743669747497 (diff)
downloadrust-3a1f8dfeb8a568294e90e1fc59446a4b3547bea1.tar.gz
rust-3a1f8dfeb8a568294e90e1fc59446a4b3547bea1.zip
Rollup merge of #65137 - andjo403:selfProfiling_fix, r=michaelwoerister
remove event that causes panics in measureme tools

the measureme tools summarize and crox do not alow a event to go out of scope of the parent event

codegen_and_optimize_crate ends after the codegen_crate event

r? @wesleywiser
cc @michaelwoerister @Mark-Simulacrum
-rw-r--r--src/librustc_codegen_ssa/back/write.rs4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/librustc_codegen_ssa/back/write.rs b/src/librustc_codegen_ssa/back/write.rs
index f1cfac27033..481db26e1a8 100644
--- a/src/librustc_codegen_ssa/back/write.rs
+++ b/src/librustc_codegen_ssa/back/write.rs
@@ -324,8 +324,6 @@ pub fn start_async_codegen<B: ExtraBackendMethods>(
     let (coordinator_send, coordinator_receive) = channel();
     let sess = tcx.sess;
 
-    sess.prof.generic_activity_start("codegen_and_optimize_crate");
-
     let crate_name = tcx.crate_name(LOCAL_CRATE);
     let crate_hash = tcx.crate_hash(LOCAL_CRATE);
     let no_builtins = attr::contains_name(&tcx.hir().krate().attrs, sym::no_builtins);
@@ -1777,8 +1775,6 @@ impl<B: ExtraBackendMethods> OngoingCodegen<B> {
             self.backend.print_pass_timings()
         }
 
-        sess.prof.generic_activity_end("codegen_and_optimize_crate");
-
         (CodegenResults {
             crate_name: self.crate_name,
             crate_hash: self.crate_hash,