Skip to content

Commit d36bdd1

Browse files
borsbors
committed
Auto merge of rust-lang#123004 - matthiaskrgr:rollup-s3v4p50, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - rust-lang#122737 (conditionally ignore fatal diagnostic in the SilentEmitter) - rust-lang#122757 (Fixed the `private-dependency` bug) - rust-lang#122886 (add test for rust-lang#90192) - rust-lang#122937 (Unbox and unwrap the contents of `StatementKind::Coverage`) - rust-lang#122949 (Add a regression test for rust-lang#117310) - rust-lang#122962 (Track run-make-support lib in common inputs stamp) - rust-lang#122977 (Rename `Arguments::as_const_str` to `as_statically_known_str`) - rust-lang#122983 (Fix build failure on ARM/AArch64/PowerPC/RISC-V FreeBSD/NetBSD) - rust-lang#122984 (panic-in-panic-hook: formatting a message that's just a string is risk-free) - rust-lang#122992 (std::thread: refine available_parallelism for solaris/illumos.) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 6e6c721 + cdf86bf commit d36bdd1

File tree

33 files changed

+176
-96
lines changed

33 files changed

+176
-96
lines changed

‎compiler/rustc_codegen_gcc/src/coverageinfo.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use rustc_codegen_ssa::traits::CoverageInfoBuilderMethods;
2-
use rustc_middle::mir::Coverage;
2+
use rustc_middle::mir::coverage::CoverageKind;
33
use rustc_middle::ty::Instance;
44

55
use crate::builder::Builder;
66

77
impl<'a, 'gcc, 'tcx> CoverageInfoBuilderMethods<'tcx> for Builder<'a, 'gcc, 'tcx> {
8-
fn add_coverage(&mut self, _instance: Instance<'tcx>, _coverage: &Coverage) {
8+
fn add_coverage(&mut self, _instance: Instance<'tcx>, _kind: &CoverageKind) {
99
// TODO(antoyo)
1010
}
1111
}

‎compiler/rustc_codegen_llvm/src/coverageinfo/mod.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ use rustc_data_structures::fx::{FxHashMap, FxIndexMap};
1414
use rustc_llvm::RustString;
1515
use rustc_middle::bug;
1616
use rustc_middle::mir::coverage::CoverageKind;
17-
use rustc_middle::mir::Coverage;
1817
use rustc_middle::ty::layout::HasTyCtxt;
1918
use rustc_middle::ty::Instance;
2019

@@ -75,7 +74,7 @@ impl<'ll, 'tcx> CodegenCx<'ll, 'tcx> {
7574

7675
impl<'tcx> CoverageInfoBuilderMethods<'tcx> for Builder<'_, '_, 'tcx> {
7776
#[instrument(level = "debug", skip(self))]
78-
fn add_coverage(&mut self, instance: Instance<'tcx>, coverage: &Coverage) {
77+
fn add_coverage(&mut self, instance: Instance<'tcx>, kind: &CoverageKind) {
7978
// Our caller should have already taken care of inlining subtleties,
8079
// so we can assume that counter/expression IDs in this coverage
8180
// statement are meaningful for the given instance.
@@ -98,7 +97,6 @@ impl<'tcx> CoverageInfoBuilderMethods<'tcx> for Builder<'_, '_, 'tcx> {
9897
.entry(instance)
9998
.or_insert_with(|| FunctionCoverageCollector::new(instance, function_coverage_info));
10099

101-
let Coverage { kind } = coverage;
102100
match *kind {
103101
CoverageKind::SpanMarker | CoverageKind::BlockMarker { .. } => unreachable!(
104102
"marker statement {kind:?} should have been removed by CleanupPostBorrowck"

‎compiler/rustc_codegen_ssa/src/mir/coverageinfo.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
use crate::traits::*;
22

3-
use rustc_middle::mir::Coverage;
3+
use rustc_middle::mir::coverage::CoverageKind;
44
use rustc_middle::mir::SourceScope;
55

66
use super::FunctionCx;
77

88
impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
9-
pub fn codegen_coverage(&self, bx: &mut Bx, coverage: &Coverage, scope: SourceScope) {
9+
pub fn codegen_coverage(&self, bx: &mut Bx, kind: &CoverageKind, scope: SourceScope) {
1010
// Determine the instance that coverage data was originally generated for.
1111
let instance = if let Some(inlined) = scope.inlined_instance(&self.mir.source_scopes) {
1212
self.monomorphize(inlined)
@@ -15,6 +15,6 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
1515
};
1616

1717
// Handle the coverage info in a backend-specific way.
18-
bx.add_coverage(instance, coverage);
18+
bx.add_coverage(instance, kind);
1919
}
2020
}

‎compiler/rustc_codegen_ssa/src/mir/statement.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
6464
cg_indirect_place.storage_dead(bx);
6565
}
6666
}
67-
mir::StatementKind::Coverage(box ref coverage) => {
68-
self.codegen_coverage(bx, coverage, statement.source_info.scope);
67+
mir::StatementKind::Coverage(ref kind) => {
68+
self.codegen_coverage(bx, kind, statement.source_info.scope);
6969
}
7070
mir::StatementKind::Intrinsic(box NonDivergingIntrinsic::Assume(ref op)) => {
7171
if !matches!(bx.tcx().sess.opts.optimize, OptLevel::No | OptLevel::Less) {

‎compiler/rustc_codegen_ssa/src/traits/coverageinfo.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use super::BackendTypes;
2-
use rustc_middle::mir::Coverage;
2+
use rustc_middle::mir::coverage::CoverageKind;
33
use rustc_middle::ty::Instance;
44

55
pub trait CoverageInfoBuilderMethods<'tcx>: BackendTypes {
66
/// Handle the MIR coverage info in a backend-specific way.
77
///
88
/// This can potentially be a no-op in backends that don't support
99
/// coverage instrumentation.
10-
fn add_coverage(&mut self, instance: Instance<'tcx>, coverage: &Coverage);
10+
fn add_coverage(&mut self, instance: Instance<'tcx>, kind: &CoverageKind);
1111
}

‎compiler/rustc_const_eval/src/transform/validate.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -346,8 +346,7 @@ impl<'a, 'tcx> Visitor<'tcx> for CfgChecker<'a, 'tcx> {
346346
self.fail(location, format!("explicit `{kind:?}` is forbidden"));
347347
}
348348
}
349-
StatementKind::Coverage(coverage) => {
350-
let kind = &coverage.kind;
349+
StatementKind::Coverage(kind) => {
351350
if self.mir_phase >= MirPhase::Analysis(AnalysisPhase::PostCleanup)
352351
&& let CoverageKind::BlockMarker { .. } | CoverageKind::SpanMarker { .. } = kind
353352
{

‎compiler/rustc_errors/src/emitter.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -541,6 +541,7 @@ pub struct SilentEmitter {
541541
pub fallback_bundle: LazyFallbackBundle,
542542
pub fatal_dcx: DiagCtxt,
543543
pub fatal_note: Option<String>,
544+
pub emit_fatal_diagnostic: bool,
544545
}
545546

546547
impl Translate for SilentEmitter {
@@ -561,7 +562,7 @@ impl Emitter for SilentEmitter {
561562
}
562563

563564
fn emit_diagnostic(&mut self, mut diag: DiagInner) {
564-
if diag.level == Level::Fatal {
565+
if self.emit_fatal_diagnostic && diag.level == Level::Fatal {
565566
if let Some(fatal_note) = &self.fatal_note {
566567
diag.sub(Level::Note, fatal_note.clone(), MultiSpan::new());
567568
}

‎compiler/rustc_errors/src/lib.rs

+7-1
Original file line numberDiff line numberDiff line change
@@ -612,12 +612,18 @@ impl DiagCtxt {
612612
Self { inner: Lock::new(DiagCtxtInner::new(emitter)) }
613613
}
614614

615-
pub fn make_silent(&mut self, fallback_bundle: LazyFallbackBundle, fatal_note: Option<String>) {
615+
pub fn make_silent(
616+
&mut self,
617+
fallback_bundle: LazyFallbackBundle,
618+
fatal_note: Option<String>,
619+
emit_fatal_diagnostic: bool,
620+
) {
616621
self.wrap_emitter(|old_dcx| {
617622
Box::new(emitter::SilentEmitter {
618623
fallback_bundle,
619624
fatal_dcx: DiagCtxt { inner: Lock::new(old_dcx) },
620625
fatal_note,
626+
emit_fatal_diagnostic,
621627
})
622628
});
623629
}

‎compiler/rustc_interface/src/interface.rs

+2
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ pub(crate) fn parse_cfg(dcx: &DiagCtxt, cfgs: Vec<String>) -> Cfg {
4848
let psess = ParseSess::with_silent_emitter(
4949
vec![crate::DEFAULT_LOCALE_RESOURCE, rustc_parse::DEFAULT_LOCALE_RESOURCE],
5050
format!("this error occurred on the command line: `--cfg={s}`"),
51+
true,
5152
);
5253
let filename = FileName::cfg_spec_source_code(&s);
5354

@@ -111,6 +112,7 @@ pub(crate) fn parse_check_cfg(dcx: &DiagCtxt, specs: Vec<String>) -> CheckCfg {
111112
let psess = ParseSess::with_silent_emitter(
112113
vec![crate::DEFAULT_LOCALE_RESOURCE, rustc_parse::DEFAULT_LOCALE_RESOURCE],
113114
format!("this error occurred on the command line: `--check-cfg={s}`"),
115+
true,
114116
);
115117
let filename = FileName::cfg_spec_source_code(&s);
116118

‎compiler/rustc_metadata/src/creader.rs

+16-11
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,15 @@ impl<'a, 'tcx> CrateLoader<'a, 'tcx> {
389389
None
390390
}
391391

392+
// The `dependency` type is determined by the command line arguments(`--extern`) and
393+
// `private_dep`. However, sometimes the directly dependent crate is not specified by
394+
// `--extern`, in this case, `private-dep` is none during loading. This is equivalent to the
395+
// scenario where the command parameter is set to `public-dependency`
396+
fn is_private_dep(&self, name: &str, private_dep: Option<bool>) -> bool {
397+
self.sess.opts.externs.get(name).map_or(private_dep.unwrap_or(false), |e| e.is_private_dep)
398+
&& private_dep.unwrap_or(true)
399+
}
400+
392401
fn register_crate(
393402
&mut self,
394403
host_lib: Option<Library>,
@@ -404,14 +413,7 @@ impl<'a, 'tcx> CrateLoader<'a, 'tcx> {
404413
let Library { source, metadata } = lib;
405414
let crate_root = metadata.get_root();
406415
let host_hash = host_lib.as_ref().map(|lib| lib.metadata.get_root().hash());
407-
408-
let private_dep = self
409-
.sess
410-
.opts
411-
.externs
412-
.get(name.as_str())
413-
.map_or(private_dep.unwrap_or(false), |e| e.is_private_dep)
414-
&& private_dep.unwrap_or(true);
416+
let private_dep = self.is_private_dep(name.as_str(), private_dep);
415417

416418
// Claim this crate number and cache it
417419
let cnum = self.cstore.intern_stable_crate_id(&crate_root)?;
@@ -601,14 +603,17 @@ impl<'a, 'tcx> CrateLoader<'a, 'tcx> {
601603

602604
match result {
603605
(LoadResult::Previous(cnum), None) => {
606+
// When `private_dep` is none, it indicates the directly dependent crate. If it is
607+
// not specified by `--extern` on command line parameters, it may be
608+
// `private-dependency` when `register_crate` is called for the first time. Then it must be updated to
609+
// `public-dependency` here.
610+
let private_dep = self.is_private_dep(name.as_str(), private_dep);
604611
let data = self.cstore.get_crate_data_mut(cnum);
605612
if data.is_proc_macro_crate() {
606613
dep_kind = CrateDepKind::MacrosOnly;
607614
}
608615
data.set_dep_kind(cmp::max(data.dep_kind(), dep_kind));
609-
if let Some(private_dep) = private_dep {
610-
data.update_and_private_dep(private_dep);
611-
}
616+
data.update_and_private_dep(private_dep);
612617
Ok(cnum)
613618
}
614619
(LoadResult::Loaded(library), host_library) => {

‎compiler/rustc_middle/src/mir/pretty.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use rustc_middle::mir::interpret::{
1313
Provenance,
1414
};
1515
use rustc_middle::mir::visit::Visitor;
16-
use rustc_middle::mir::{self, *};
16+
use rustc_middle::mir::*;
1717
use rustc_target::abi::Size;
1818

1919
const INDENT: &str = " ";
@@ -711,7 +711,7 @@ impl Debug for Statement<'_> {
711711
AscribeUserType(box (ref place, ref c_ty), ref variance) => {
712712
write!(fmt, "AscribeUserType({place:?}, {variance:?}, {c_ty:?})")
713713
}
714-
Coverage(box mir::Coverage { ref kind }) => write!(fmt, "Coverage::{kind:?}"),
714+
Coverage(ref kind) => write!(fmt, "Coverage::{kind:?}"),
715715
Intrinsic(box ref intrinsic) => write!(fmt, "{intrinsic}"),
716716
ConstEvalCounter => write!(fmt, "ConstEvalCounter"),
717717
Nop => write!(fmt, "nop"),

‎compiler/rustc_middle/src/mir/syntax.rs

+2-7
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ pub enum StatementKind<'tcx> {
373373
///
374374
/// Interpreters and codegen backends that don't support coverage instrumentation
375375
/// can usually treat this as a no-op.
376-
Coverage(Box<Coverage>),
376+
Coverage(CoverageKind),
377377

378378
/// Denotes a call to an intrinsic that does not require an unwind path and always returns.
379379
/// This avoids adding a new block and a terminator for simple intrinsics.
@@ -517,12 +517,6 @@ pub enum FakeReadCause {
517517
ForIndex,
518518
}
519519

520-
#[derive(Clone, Debug, PartialEq, TyEncodable, TyDecodable, Hash, HashStable)]
521-
#[derive(TypeFoldable, TypeVisitable)]
522-
pub struct Coverage {
523-
pub kind: CoverageKind,
524-
}
525-
526520
#[derive(Clone, Debug, PartialEq, TyEncodable, TyDecodable, Hash, HashStable)]
527521
#[derive(TypeFoldable, TypeVisitable)]
528522
pub struct CopyNonOverlapping<'tcx> {
@@ -1458,5 +1452,6 @@ mod size_asserts {
14581452
static_assert_size!(Place<'_>, 16);
14591453
static_assert_size!(PlaceElem<'_>, 24);
14601454
static_assert_size!(Rvalue<'_>, 40);
1455+
static_assert_size!(StatementKind<'_>, 16);
14611456
// tidy-alphabetical-end
14621457
}

‎compiler/rustc_middle/src/mir/visit.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,10 @@ macro_rules! make_mir_visitor {
156156

157157
fn visit_coverage(
158158
&mut self,
159-
coverage: & $($mutability)? Coverage,
159+
kind: & $($mutability)? coverage::CoverageKind,
160160
location: Location,
161161
) {
162-
self.super_coverage(coverage, location);
162+
self.super_coverage(kind, location);
163163
}
164164

165165
fn visit_retag(
@@ -803,7 +803,7 @@ macro_rules! make_mir_visitor {
803803
}
804804

805805
fn super_coverage(&mut self,
806-
_coverage: & $($mutability)? Coverage,
806+
_kind: & $($mutability)? coverage::CoverageKind,
807807
_location: Location) {
808808
}
809809

‎compiler/rustc_mir_build/src/build/cfg.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,7 @@ impl<'tcx> CFG<'tcx> {
107107
/// This results in more accurate coverage reports for certain kinds of
108108
/// syntax (e.g. `continue` or `if !`) that would otherwise not appear in MIR.
109109
pub(crate) fn push_coverage_span_marker(&mut self, block: BasicBlock, source_info: SourceInfo) {
110-
let kind = StatementKind::Coverage(Box::new(Coverage {
111-
kind: coverage::CoverageKind::SpanMarker,
112-
}));
110+
let kind = StatementKind::Coverage(coverage::CoverageKind::SpanMarker);
113111
let stmt = Statement { source_info, kind };
114112
self.push(block, stmt);
115113
}

‎compiler/rustc_mir_build/src/build/coverageinfo.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,7 @@ impl Builder<'_, '_> {
127127

128128
let marker_statement = mir::Statement {
129129
source_info,
130-
kind: mir::StatementKind::Coverage(Box::new(mir::Coverage {
131-
kind: CoverageKind::BlockMarker { id },
132-
})),
130+
kind: mir::StatementKind::Coverage(CoverageKind::BlockMarker { id }),
133131
};
134132
self.cfg.push(block, marker_statement);
135133

‎compiler/rustc_mir_transform/src/cleanup_post_borrowck.rs

+4-5
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
1919
use crate::MirPass;
2020
use rustc_middle::mir::coverage::CoverageKind;
21-
use rustc_middle::mir::{Body, BorrowKind, Coverage, Rvalue, StatementKind, TerminatorKind};
21+
use rustc_middle::mir::{Body, BorrowKind, Rvalue, StatementKind, TerminatorKind};
2222
use rustc_middle::ty::TyCtxt;
2323

2424
pub struct CleanupPostBorrowck;
@@ -30,12 +30,11 @@ impl<'tcx> MirPass<'tcx> for CleanupPostBorrowck {
3030
match statement.kind {
3131
StatementKind::AscribeUserType(..)
3232
| StatementKind::Assign(box (_, Rvalue::Ref(_, BorrowKind::Fake, _)))
33-
| StatementKind::Coverage(box Coverage {
33+
| StatementKind::Coverage(
3434
// These kinds of coverage statements are markers inserted during
3535
// MIR building, and are not needed after InstrumentCoverage.
36-
kind: CoverageKind::BlockMarker { .. } | CoverageKind::SpanMarker { .. },
37-
..
38-
})
36+
CoverageKind::BlockMarker { .. } | CoverageKind::SpanMarker { .. },
37+
)
3938
| StatementKind::FakeRead(..) => statement.make_nop(),
4039
_ => (),
4140
}

‎compiler/rustc_mir_transform/src/coverage/mod.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use crate::MirPass;
1515

1616
use rustc_middle::mir::coverage::*;
1717
use rustc_middle::mir::{
18-
self, BasicBlock, BasicBlockData, Coverage, SourceInfo, Statement, StatementKind, Terminator,
18+
self, BasicBlock, BasicBlockData, SourceInfo, Statement, StatementKind, Terminator,
1919
TerminatorKind,
2020
};
2121
use rustc_middle::ty::TyCtxt;
@@ -230,10 +230,7 @@ fn inject_statement(mir_body: &mut mir::Body<'_>, counter_kind: CoverageKind, bb
230230
debug!(" injecting statement {counter_kind:?} for {bb:?}");
231231
let data = &mut mir_body[bb];
232232
let source_info = data.terminator().source_info;
233-
let statement = Statement {
234-
source_info,
235-
kind: StatementKind::Coverage(Box::new(Coverage { kind: counter_kind })),
236-
};
233+
let statement = Statement { source_info, kind: StatementKind::Coverage(counter_kind) };
237234
data.statements.insert(0, statement);
238235
}
239236

‎compiler/rustc_mir_transform/src/coverage/query.rs

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use rustc_data_structures::captures::Captures;
22
use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
33
use rustc_middle::mir::coverage::{CounterId, CoverageKind};
4-
use rustc_middle::mir::{Body, Coverage, CoverageIdsInfo, Statement, StatementKind};
4+
use rustc_middle::mir::{Body, CoverageIdsInfo, Statement, StatementKind};
55
use rustc_middle::query::TyCtxtAt;
66
use rustc_middle::ty::{self, TyCtxt};
77
use rustc_middle::util::Providers;
@@ -54,7 +54,7 @@ fn coverage_ids_info<'tcx>(
5454
let mir_body = tcx.instance_mir(instance_def);
5555

5656
let max_counter_id = all_coverage_in_mir_body(mir_body)
57-
.filter_map(|coverage| match coverage.kind {
57+
.filter_map(|kind| match *kind {
5858
CoverageKind::CounterIncrement { id } => Some(id),
5959
_ => None,
6060
})
@@ -66,12 +66,10 @@ fn coverage_ids_info<'tcx>(
6666

6767
fn all_coverage_in_mir_body<'a, 'tcx>(
6868
body: &'a Body<'tcx>,
69-
) -> impl Iterator<Item = &'a Coverage> + Captures<'tcx> {
69+
) -> impl Iterator<Item = &'a CoverageKind> + Captures<'tcx> {
7070
body.basic_blocks.iter().flat_map(|bb_data| &bb_data.statements).filter_map(|statement| {
7171
match statement.kind {
72-
StatementKind::Coverage(box ref coverage) if !is_inlined(body, statement) => {
73-
Some(coverage)
74-
}
72+
StatementKind::Coverage(ref kind) if !is_inlined(body, statement) => Some(kind),
7573
_ => None,
7674
}
7775
})

0 commit comments

Comments
 (0)