mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Allow injecting a profiler runtime into #![no_core] crates

Browse source 
Now that the profiler runtime is itself `#![no_core]`, it can be a dependency
of other no_core crates, including core.
This commit is contained in:
Zalathar 2024-11-23 16:24:23 +11:00
parent bba3567386
commit 972663d8ec
3 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
compiler/rustc_metadata/messages.ftl
View file

@ -233,9 +233,6 @@ metadata_prev_alloc_error_handler =
metadata_prev_global_alloc = metadata_prev_global_alloc =
previous global allocator defined here previous global allocator defined here
metadata_profiler_builtins_needs_core =
`profiler_builtins` crate (required by compiler options) is not compatible with crate attribute `#![no_core]`
metadata_raw_dylib_no_nul = metadata_raw_dylib_no_nul =
link name must not contain NUL characters if link kind is `raw-dylib` link name must not contain NUL characters if link kind is `raw-dylib`

8
compiler/rustc_metadata/src/creader.rs
View file

@ -799,7 +799,7 @@ impl<'a, 'tcx> CrateLoader<'a, 'tcx> {
self.inject_dependency_if(cnum, "a panic runtime", &|data| data.needs_panic_runtime()); self.inject_dependency_if(cnum, "a panic runtime", &|data| data.needs_panic_runtime());
} }
fn inject_profiler_runtime(&mut self, krate: &ast::Crate) { fn inject_profiler_runtime(&mut self) {
let needs_profiler_runtime = let needs_profiler_runtime =
self.sess.instrument_coverage() || self.sess.opts.cg.profile_generate.enabled(); self.sess.instrument_coverage() || self.sess.opts.cg.profile_generate.enabled();
if !needs_profiler_runtime || self.sess.opts.unstable_opts.no_profiler_runtime { if !needs_profiler_runtime || self.sess.opts.unstable_opts.no_profiler_runtime {
@ -809,10 +809,6 @@ impl<'a, 'tcx> CrateLoader<'a, 'tcx> {
info!("loading profiler"); info!("loading profiler");
let name = Symbol::intern(&self.sess.opts.unstable_opts.profiler_runtime); let name = Symbol::intern(&self.sess.opts.unstable_opts.profiler_runtime);
if name == sym::profiler_builtins && attr::contains_name(&krate.attrs, sym::no_core) {
self.dcx().emit_err(errors::ProfilerBuiltinsNeedsCore);
}
let Some(cnum) = self.resolve_crate(name, DUMMY_SP, CrateDepKind::Implicit) else { let Some(cnum) = self.resolve_crate(name, DUMMY_SP, CrateDepKind::Implicit) else {
return; return;
}; };
@ -1046,7 +1042,7 @@ impl<'a, 'tcx> CrateLoader<'a, 'tcx> {
pub fn postprocess(&mut self, krate: &ast::Crate) { pub fn postprocess(&mut self, krate: &ast::Crate) {
self.inject_forced_externs(); self.inject_forced_externs();
self.inject_profiler_runtime(krate); self.inject_profiler_runtime();
self.inject_allocator_crate(krate); self.inject_allocator_crate(krate);
self.inject_panic_runtime(krate); self.inject_panic_runtime(krate);

4
compiler/rustc_metadata/src/errors.rs
View file

@ -339,10 +339,6 @@ pub struct NoPanicStrategy {
pub strategy: PanicStrategy, pub strategy: PanicStrategy,
} }
#[derive(Diagnostic)]
#[diag(metadata_profiler_builtins_needs_core)]
pub struct ProfilerBuiltinsNeedsCore;
#[derive(Diagnostic)] #[derive(Diagnostic)]
#[diag(metadata_not_profiler_runtime)] #[diag(metadata_not_profiler_runtime)]
pub struct NotProfilerRuntime { pub struct NotProfilerRuntime {