Skip to content

Commit

Permalink
Rollup merge of rust-lang#65137 - andjo403:selfProfiling_fix, r=micha…
Browse files Browse the repository at this point in the history
…elwoerister

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
  • Loading branch information
Centril authored Oct 7, 2019
2 parents 0c96a12 + 993e3a5 commit 3a1f8df
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions src/librustc_codegen_ssa/back/write.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 3a1f8df

Please sign in to comment.