mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add back -Zno-profiler-runtime

Browse Source 
This was removed by #85284 in favor of -Zprofiler-runtime=<name>.
However the suggested -Zprofiler-runtime=None doesn't work because
"None" is treated as a crate name.
This commit is contained in:
Amanieu d'Antras 2021-08-04 10:43:44 +01:00
parent 71ff9b41e9
commit 1247f9b829
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compiler/rustc_interface/src/tests.rs
View File

@ -740,6 +740,7 @@ fn test_debugging_options_tracking_hash() {
tracked!(new_llvm_pass_manager, Some(true)); tracked!(new_llvm_pass_manager, Some(true));
tracked!(no_generate_arange_section, true); tracked!(no_generate_arange_section, true);
tracked!(no_link, true); tracked!(no_link, true);
tracked!(no_profiler_runtime, true);
tracked!(osx_rpath_install_name, true); tracked!(osx_rpath_install_name, true);
tracked!(panic_abort_tests, true); tracked!(panic_abort_tests, true);
tracked!(plt, Some(true)); tracked!(plt, Some(true));
@ -748,7 +749,7 @@ fn test_debugging_options_tracking_hash() {
tracked!(print_fuel, Some("abc".to_string())); tracked!(print_fuel, Some("abc".to_string()));
tracked!(profile, true); tracked!(profile, true);
tracked!(profile_emit, Some(PathBuf::from("abc"))); tracked!(profile_emit, Some(PathBuf::from("abc")));
tracked!(profiler_runtime, None); tracked!(profiler_runtime, "abc".to_string());
tracked!(relax_elf_relocations, Some(true)); tracked!(relax_elf_relocations, Some(true));
tracked!(relro_level, Some(RelroLevel::Full)); tracked!(relro_level, Some(RelroLevel::Full));
tracked!(simulate_remapped_rust_src_base, Some(PathBuf::from("/rustc/abc"))); tracked!(simulate_remapped_rust_src_base, Some(PathBuf::from("/rustc/abc")));

10
compiler/rustc_metadata/src/creader.rs
View File

@ -777,19 +777,17 @@ impl<'a> CrateLoader<'a> {
} }
fn inject_profiler_runtime(&mut self, krate: &ast::Crate) { fn inject_profiler_runtime(&mut self, krate: &ast::Crate) {
let profiler_runtime = &self.sess.opts.debugging_opts.profiler_runtime; if self.sess.opts.debugging_opts.no_profiler_runtime
|| !(self.sess.instrument_coverage()
if !(profiler_runtime.is_some()
&& (self.sess.instrument_coverage()
|| self.sess.opts.debugging_opts.profile || self.sess.opts.debugging_opts.profile
|| self.sess.opts.cg.profile_generate.enabled())) || self.sess.opts.cg.profile_generate.enabled())
{ {
return; return;
} }
info!("loading profiler"); info!("loading profiler");
let name = Symbol::intern(profiler_runtime.as_ref().unwrap()); let name = Symbol::intern(&self.sess.opts.debugging_opts.profiler_runtime);
if name == sym::profiler_builtins && self.sess.contains_name(&krate.attrs, sym::no_core) { if name == sym::profiler_builtins && self.sess.contains_name(&krate.attrs, sym::no_core) {
self.sess.err( self.sess.err(
"`profiler_builtins` crate (required by compiler options) \ "`profiler_builtins` crate (required by compiler options) \

4
compiler/rustc_metadata/src/locator.rs
View File

@ -1103,8 +1103,8 @@ impl CrateError {
if sess.is_nightly_build() { if sess.is_nightly_build() {
err.help("consider building the standard library from source with `cargo build -Zbuild-std`"); err.help("consider building the standard library from source with `cargo build -Zbuild-std`");
} }
} else if Some(crate_name) } else if crate_name
== sess.opts.debugging_opts.profiler_runtime.as_deref().map(Symbol::intern) == Symbol::intern(&sess.opts.debugging_opts.profiler_runtime)
{ {
err.note(&"the compiler may have been built without the profiler runtime"); err.note(&"the compiler may have been built without the profiler runtime");
} }

6
compiler/rustc_session/src/options.rs
View File

@ -1172,6 +1172,8 @@ options! {
"compile without linking"), "compile without linking"),
no_parallel_llvm: bool = (false, parse_no_flag, [UNTRACKED], no_parallel_llvm: bool = (false, parse_no_flag, [UNTRACKED],
"run LLVM in non-parallel mode (while keeping codegen-units and ThinLTO)"), "run LLVM in non-parallel mode (while keeping codegen-units and ThinLTO)"),
no_profiler_runtime: bool = (false, parse_no_flag, [TRACKED],
"prevent automatic injection of the profiler_builtins crate"),
normalize_docs: bool = (false, parse_bool, [TRACKED], normalize_docs: bool = (false, parse_bool, [TRACKED],
"normalize associated items in rustdoc when generating documentation"), "normalize associated items in rustdoc when generating documentation"),
osx_rpath_install_name: bool = (false, parse_bool, [TRACKED], osx_rpath_install_name: bool = (false, parse_bool, [TRACKED],
@ -1217,8 +1219,8 @@ options! {
profile_emit: Option<PathBuf> = (None, parse_opt_pathbuf, [TRACKED], profile_emit: Option<PathBuf> = (None, parse_opt_pathbuf, [TRACKED],
"file path to emit profiling data at runtime when using 'profile' \ "file path to emit profiling data at runtime when using 'profile' \
(default based on relative source path)"), (default based on relative source path)"),
profiler_runtime: Option<String> = (Some(String::from("profiler_builtins")), parse_opt_string, [TRACKED], profiler_runtime: String = (String::from("profiler_builtins"), parse_string, [TRACKED],
"name of the profiler runtime crate to automatically inject, or None to disable"), "name of the profiler runtime crate to automatically inject (default: `profiler_builtins`)"),
query_dep_graph: bool = (false, parse_bool, [UNTRACKED], query_dep_graph: bool = (false, parse_bool, [UNTRACKED],
"enable queries of the dependency graph for regression testing (default: no)"), "enable queries of the dependency graph for regression testing (default: no)"),
query_stats: bool = (false, parse_bool, [UNTRACKED], query_stats: bool = (false, parse_bool, [UNTRACKED],