diff options
| author | bors <bors@rust-lang.org> | 2023-09-13 18:19:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-09-13 18:19:15 +0000 |
| commit | eb2446a57e74c66c691e6e869faa5a8ec7b8c32b (patch) | |
| tree | f942f7ae6f83e8cf863e9b2b81b08f0ab2da9c79 /compiler/rustc_codegen_llvm/src | |
| parent | 5adddad28c6c6ae467061ca22dd9819bb0069d1a (diff) | |
| parent | 156f50bef4945846fd29aabe808abcc46517b02e (diff) | |
| download | rust-eb2446a57e74c66c691e6e869faa5a8ec7b8c32b.tar.gz rust-eb2446a57e74c66c691e6e869faa5a8ec7b8c32b.zip | |
Auto merge of #115820 - matthiaskrgr:rollup-kyglvpu, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #115736 (Remove `verbose_generic_activity_with_arg`) - #115771 (cleanup leftovers of const_err lint) - #115798 (add helper method for finding the one non-1-ZST field) - #115812 (Merge settings.css into rustdoc.css) - #115815 (fix: return early when has tainted in mir pass) - #115816 (Disabled socketpair for Vita) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/back/lto.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/back/lto.rs b/compiler/rustc_codegen_llvm/src/back/lto.rs index 5cf83b1accb..ba263296bb4 100644 --- a/compiler/rustc_codegen_llvm/src/back/lto.rs +++ b/compiler/rustc_codegen_llvm/src/back/lto.rs @@ -605,7 +605,7 @@ pub(crate) fn run_pass_manager( module: &mut ModuleCodegen<ModuleLlvm>, thin: bool, ) -> Result<(), FatalError> { - let _timer = cgcx.prof.verbose_generic_activity_with_arg("LLVM_lto_optimize", &*module.name); + let _timer = cgcx.prof.generic_activity_with_arg("LLVM_lto_optimize", &*module.name); let config = cgcx.config(module.kind); // Now we have one massive module inside of llmod. Time to run the |