Skip to content

fix(emit): gate std/alloc injection on loaded crates instead of #![no_std] #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jakobjung10 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(emit): gate std/alloc injection on loaded crates instead of #![no_std] #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions mutest-emit/src/codegen/expansion.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,10 @@ pub fn insert_generated_code_prelude_attrs<'tcx>(tcx: TyCtxt<'tcx>, krate: &mut
}
}

// NOTE: Some features are only valid if the std crate is loaded.
if !tcx.hir_krate_attrs().iter().any(|attr| hir::attr::is_word_attr(attr, None, sym::no_std)) {
// NOTE: Some features are only valid if the std crate is loaded. We check for the loaded
// crate rather than the absence of `#![no_std]`, which does not reliably survive to
// this stage (e.g. under the external-mutant recompilation of a no_std crate).
if tcx.used_crates(()).iter().any(|&cnum| tcx.crate_name(cnum) == sym::std) {
ensure_attrs! {
#![feature(print_internals)]
#![feature(libstd_sys_internals)]
Expand All @@ -122,7 +124,7 @@ pub fn insert_generated_code_crate_refs<'tcx>(tcx: TyCtxt<'tcx>, krate: &mut ast
);
let def_site = DUMMY_SP.with_def_site_ctxt(expn_id.to_expn_id());

if !tcx.hir_krate_attrs().iter().any(|attr| hir::attr::is_word_attr(attr, None, sym::no_std)) {
if tcx.used_crates(()).iter().any(|&cnum| tcx.crate_name(cnum) == sym::alloc) {
// NOTE: For std-dependent crates, we often rewrite paths through alloc,
// which is the actual definition crate.
// However, these references can only be resolved correctly if an explicit
Expand Down