Skip to content

Commit fe158e6

Browse files
borsbors
committed
Auto merge of #120303 - fmease:rollup-to11ql5, r=fmease
Rollup of 10 pull requests Successful merges: - #114764 ([style edition 2024] Combine all delimited exprs as last argument) - #118326 (Add `NonZero*::count_ones`) - #118636 (Add the unstable option to reduce the binary size of dynamic library…) - #119460 (coverage: Never emit improperly-ordered coverage regions) - #119616 (Add a new `wasm32-wasi-preview2` target) - #120185 (coverage: Don't instrument `#[automatically_derived]` functions) - #120265 (Remove no-system-llvm) - #120284 (privacy: Refactor top-level visiting in `TypePrivacyVisitor`) - #120285 (Remove extra # from url in suggestion) - #120299 (Add mw to review rotation and add some owner assignments) Failed merges: - #120124 (Split assembly tests for ELF and MachO) r? `@ghost` `@rustbot` modify labels: rollup
2 parents cd6d8f2 + f79440e commit fe158e6

File tree

79 files changed

+824
-457
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+824
-457
lines changed

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

+45-1
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ fn make_code_region(
329329
start_line = source_map.doctest_offset_line(&file.name, start_line);
330330
end_line = source_map.doctest_offset_line(&file.name, end_line);
331331

332-
Some(CodeRegion {
332+
check_code_region(CodeRegion {
333333
file_name,
334334
start_line: start_line as u32,
335335
start_col: start_col as u32,
@@ -338,6 +338,39 @@ fn make_code_region(
338338
})
339339
}
340340

341+
/// If `llvm-cov` sees a code region that is improperly ordered (end < start),
342+
/// it will immediately exit with a fatal error. To prevent that from happening,
343+
/// discard regions that are improperly ordered, or might be interpreted in a
344+
/// way that makes them improperly ordered.
345+
fn check_code_region(code_region: CodeRegion) -> Option<CodeRegion> {
346+
let CodeRegion { file_name: _, start_line, start_col, end_line, end_col } = code_region;
347+
348+
// Line/column coordinates are supposed to be 1-based. If we ever emit
349+
// coordinates of 0, `llvm-cov` might misinterpret them.
350+
let all_nonzero = [start_line, start_col, end_line, end_col].into_iter().all(|x| x != 0);
351+
// Coverage mappings use the high bit of `end_col` to indicate that a
352+
// region is actually a "gap" region, so make sure it's unset.
353+
let end_col_has_high_bit_unset = (end_col & (1 << 31)) == 0;
354+
// If a region is improperly ordered (end < start), `llvm-cov` will exit
355+
// with a fatal error, which is inconvenient for users and hard to debug.
356+
let is_ordered = (start_line, start_col) <= (end_line, end_col);
357+
358+
if all_nonzero && end_col_has_high_bit_unset && is_ordered {
359+
Some(code_region)
360+
} else {
361+
debug!(
362+
?code_region,
363+
?all_nonzero,
364+
?end_col_has_high_bit_unset,
365+
?is_ordered,
366+
"Skipping code region that would be misinterpreted or rejected by LLVM"
367+
);
368+
// If this happens in a debug build, ICE to make it easier to notice.
369+
debug_assert!(false, "Improper code region: {code_region:?}");
370+
None
371+
}
372+
}
373+
341374
fn is_eligible_for_coverage(tcx: TyCtxt<'_>, def_id: LocalDefId) -> bool {
342375
// Only instrument functions, methods, and closures (not constants since they are evaluated
343376
// at compile time by Miri).
@@ -351,7 +384,18 @@ fn is_eligible_for_coverage(tcx: TyCtxt<'_>, def_id: LocalDefId) -> bool {
351384
return false;
352385
}
353386

387+
// Don't instrument functions with `#[automatically_derived]` on their
388+
// enclosing impl block, on the assumption that most users won't care about
389+
// coverage for derived impls.
390+
if let Some(impl_of) = tcx.impl_of_method(def_id.to_def_id())
391+
&& tcx.is_automatically_derived(impl_of)
392+
{
393+
trace!("InstrumentCoverage skipped for {def_id:?} (automatically derived)");
394+
return false;
395+
}
396+
354397
if tcx.codegen_fn_attrs(def_id).flags.contains(CodegenFnAttrFlags::NO_COVERAGE) {
398+
trace!("InstrumentCoverage skipped for {def_id:?} (`#[coverage(off)]`)");
355399
return false;
356400
}
357401

‎compiler/rustc_privacy/src/lib.rs

+27-63
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ use rustc_hir::def::{DefKind, Res};
2424
use rustc_hir::def_id::{DefId, LocalDefId, LocalModDefId, CRATE_DEF_ID};
2525
use rustc_hir::intravisit::{self, Visitor};
2626
use rustc_hir::{AssocItemKind, ForeignItemKind, ItemId, PatKind};
27-
use rustc_middle::bug;
2827
use rustc_middle::hir::nested_filter;
2928
use rustc_middle::middle::privacy::{EffectiveVisibilities, EffectiveVisibility, Level};
3029
use rustc_middle::query::Providers;
3130
use rustc_middle::ty::GenericArgs;
3231
use rustc_middle::ty::{self, Const, GenericParamDefKind};
3332
use rustc_middle::ty::{TraitRef, Ty, TyCtxt, TypeSuperVisitable, TypeVisitable, TypeVisitor};
33+
use rustc_middle::{bug, span_bug};
3434
use rustc_session::lint;
3535
use rustc_span::hygiene::Transparency;
3636
use rustc_span::symbol::{kw, sym, Ident};
@@ -1064,29 +1064,22 @@ impl<'tcx> Visitor<'tcx> for NamePrivacyVisitor<'tcx> {
10641064

10651065
struct TypePrivacyVisitor<'tcx> {
10661066
tcx: TyCtxt<'tcx>,
1067+
module_def_id: LocalModDefId,
10671068
maybe_typeck_results: Option<&'tcx ty::TypeckResults<'tcx>>,
1068-
current_item: LocalDefId,
10691069
span: Span,
10701070
}
10711071

10721072
impl<'tcx> TypePrivacyVisitor<'tcx> {
1073-
/// Gets the type-checking results for the current body.
1074-
/// As this will ICE if called outside bodies, only call when working with
1075-
/// `Expr` or `Pat` nodes (they are guaranteed to be found only in bodies).
1076-
#[track_caller]
1077-
fn typeck_results(&self) -> &'tcx ty::TypeckResults<'tcx> {
1078-
self.maybe_typeck_results
1079-
.expect("`TypePrivacyVisitor::typeck_results` called outside of body")
1080-
}
1081-
10821073
fn item_is_accessible(&self, did: DefId) -> bool {
1083-
self.tcx.visibility(did).is_accessible_from(self.current_item, self.tcx)
1074+
self.tcx.visibility(did).is_accessible_from(self.module_def_id, self.tcx)
10841075
}
10851076

10861077
// Take node-id of an expression or pattern and check its type for privacy.
10871078
fn check_expr_pat_type(&mut self, id: hir::HirId, span: Span) -> bool {
10881079
self.span = span;
1089-
let typeck_results = self.typeck_results();
1080+
let typeck_results = self
1081+
.maybe_typeck_results
1082+
.unwrap_or_else(|| span_bug!(span, "`hir::Expr` or `hir::Pat` outside of a body"));
10901083
let result: ControlFlow<()> = try {
10911084
self.visit(typeck_results.node_type(id))?;
10921085
self.visit(typeck_results.node_args(id))?;
@@ -1107,35 +1100,13 @@ impl<'tcx> TypePrivacyVisitor<'tcx> {
11071100
}
11081101

11091102
impl<'tcx> Visitor<'tcx> for TypePrivacyVisitor<'tcx> {
1110-
type NestedFilter = nested_filter::All;
1111-
1112-
/// We want to visit items in the context of their containing
1113-
/// module and so forth, so supply a crate for doing a deep walk.
1114-
fn nested_visit_map(&mut self) -> Self::Map {
1115-
self.tcx.hir()
1116-
}
1117-
1118-
fn visit_mod(&mut self, _m: &'tcx hir::Mod<'tcx>, _s: Span, _n: hir::HirId) {
1119-
// Don't visit nested modules, since we run a separate visitor walk
1120-
// for each module in `effective_visibilities`
1121-
}
1122-
1123-
fn visit_nested_body(&mut self, body: hir::BodyId) {
1103+
fn visit_nested_body(&mut self, body_id: hir::BodyId) {
11241104
let old_maybe_typeck_results =
1125-
self.maybe_typeck_results.replace(self.tcx.typeck_body(body));
1126-
let body = self.tcx.hir().body(body);
1127-
self.visit_body(body);
1105+
self.maybe_typeck_results.replace(self.tcx.typeck_body(body_id));
1106+
self.visit_body(self.tcx.hir().body(body_id));
11281107
self.maybe_typeck_results = old_maybe_typeck_results;
11291108
}
11301109

1131-
fn visit_generic_arg(&mut self, generic_arg: &'tcx hir::GenericArg<'tcx>) {
1132-
match generic_arg {
1133-
hir::GenericArg::Type(t) => self.visit_ty(t),
1134-
hir::GenericArg::Infer(inf) => self.visit_infer(inf),
1135-
hir::GenericArg::Lifetime(_) | hir::GenericArg::Const(_) => {}
1136-
}
1137-
}
1138-
11391110
fn visit_ty(&mut self, hir_ty: &'tcx hir::Ty<'tcx>) {
11401111
self.span = hir_ty.span;
11411112
if let Some(typeck_results) = self.maybe_typeck_results {
@@ -1163,19 +1134,19 @@ impl<'tcx> Visitor<'tcx> for TypePrivacyVisitor<'tcx> {
11631134
return;
11641135
}
11651136
} else {
1166-
// We don't do anything for const infers here.
1137+
// FIXME: check types of const infers here.
11671138
}
11681139
} else {
1169-
bug!("visit_infer without typeck_results");
1140+
span_bug!(self.span, "`hir::InferArg` outside of a body");
11701141
}
11711142
intravisit::walk_inf(self, inf);
11721143
}
11731144

11741145
fn visit_trait_ref(&mut self, trait_ref: &'tcx hir::TraitRef<'tcx>) {
11751146
self.span = trait_ref.path.span;
1176-
if self.maybe_typeck_results.is_none() {
1177-
// Avoid calling `hir_trait_to_predicates` in bodies, it will ICE.
1178-
// The traits' privacy in bodies is already checked as a part of trait object types.
1147+
if self.maybe_typeck_results.is_some() {
1148+
// Privacy of traits in bodies is checked as a part of trait object types.
1149+
} else {
11791150
let bounds = rustc_hir_analysis::hir_trait_to_predicates(
11801151
self.tcx,
11811152
trait_ref,
@@ -1223,7 +1194,10 @@ impl<'tcx> Visitor<'tcx> for TypePrivacyVisitor<'tcx> {
12231194
hir::ExprKind::MethodCall(segment, ..) => {
12241195
// Method calls have to be checked specially.
12251196
self.span = segment.ident.span;
1226-
if let Some(def_id) = self.typeck_results().type_dependent_def_id(expr.hir_id) {
1197+
let typeck_results = self
1198+
.maybe_typeck_results
1199+
.unwrap_or_else(|| span_bug!(self.span, "`hir::Expr` outside of a body"));
1200+
if let Some(def_id) = typeck_results.type_dependent_def_id(expr.hir_id) {
12271201
if self.visit(self.tcx.type_of(def_id).instantiate_identity()).is_break() {
12281202
return;
12291203
}
@@ -1251,9 +1225,13 @@ impl<'tcx> Visitor<'tcx> for TypePrivacyVisitor<'tcx> {
12511225
Res::Def(kind, def_id) => Some((kind, def_id)),
12521226
_ => None,
12531227
},
1254-
hir::QPath::TypeRelative(..) | hir::QPath::LangItem(..) => self
1255-
.maybe_typeck_results
1256-
.and_then(|typeck_results| typeck_results.type_dependent_def(id)),
1228+
hir::QPath::TypeRelative(..) | hir::QPath::LangItem(..) => {
1229+
match self.maybe_typeck_results {
1230+
Some(typeck_results) => typeck_results.type_dependent_def(id),
1231+
// FIXME: Check type-relative associated types in signatures.
1232+
None => None,
1233+
}
1234+
}
12571235
};
12581236
let def = def.filter(|(kind, _)| {
12591237
matches!(
@@ -1307,15 +1285,6 @@ impl<'tcx> Visitor<'tcx> for TypePrivacyVisitor<'tcx> {
13071285

13081286
intravisit::walk_local(self, local);
13091287
}
1310-
1311-
// Check types in item interfaces.
1312-
fn visit_item(&mut self, item: &'tcx hir::Item<'tcx>) {
1313-
let orig_current_item = mem::replace(&mut self.current_item, item.owner_id.def_id);
1314-
let old_maybe_typeck_results = self.maybe_typeck_results.take();
1315-
intravisit::walk_item(self, item);
1316-
self.maybe_typeck_results = old_maybe_typeck_results;
1317-
self.current_item = orig_current_item;
1318-
}
13191288
}
13201289

13211290
impl<'tcx> DefIdVisitor<'tcx> for TypePrivacyVisitor<'tcx> {
@@ -1785,13 +1754,8 @@ fn check_mod_privacy(tcx: TyCtxt<'_>, module_def_id: LocalModDefId) {
17851754

17861755
// Check privacy of explicitly written types and traits as well as
17871756
// inferred types of expressions and patterns.
1788-
let mut visitor = TypePrivacyVisitor {
1789-
tcx,
1790-
maybe_typeck_results: None,
1791-
current_item: module_def_id.to_local_def_id(),
1792-
span,
1793-
};
1794-
intravisit::walk_mod(&mut visitor, module, hir_id);
1757+
let mut visitor = TypePrivacyVisitor { tcx, module_def_id, maybe_typeck_results: None, span };
1758+
tcx.hir().visit_item_likes_in_module(module_def_id, &mut visitor);
17951759
}
17961760

17971761
fn effective_visibilities(tcx: TyCtxt<'_>, (): ()) -> &EffectiveVisibilities {

‎compiler/rustc_session/src/config.rs

+15
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,7 @@ impl SwitchWithOptPath {
347347
pub enum SymbolManglingVersion {
348348
Legacy,
349349
V0,
350+
Hashed,
350351
}
351352

352353
#[derive(Clone, Copy, Debug, PartialEq, Hash)]
@@ -2692,6 +2693,7 @@ pub fn build_session_options(early_dcx: &mut EarlyDiagCtxt, matches: &getopts::M
26922693
match cg.symbol_mangling_version {
26932694
// Stable values:
26942695
None | Some(SymbolManglingVersion::V0) => {}
2696+
26952697
// Unstable values:
26962698
Some(SymbolManglingVersion::Legacy) => {
26972699
if !unstable_opts.unstable_options {
@@ -2700,6 +2702,13 @@ pub fn build_session_options(early_dcx: &mut EarlyDiagCtxt, matches: &getopts::M
27002702
);
27012703
}
27022704
}
2705+
Some(SymbolManglingVersion::Hashed) => {
2706+
if !unstable_opts.unstable_options {
2707+
early_dcx.early_fatal(
2708+
"`-C symbol-mangling-version=hashed` requires `-Z unstable-options`",
2709+
);
2710+
}
2711+
}
27032712
}
27042713

27052714
// Check for unstable values of `-C instrument-coverage`.
@@ -2741,6 +2750,12 @@ pub fn build_session_options(early_dcx: &mut EarlyDiagCtxt, matches: &getopts::M
27412750
);
27422751
}
27432752
Some(SymbolManglingVersion::V0) => {}
2753+
Some(SymbolManglingVersion::Hashed) => {
2754+
early_dcx.early_warn(
2755+
"-C instrument-coverage requires symbol mangling version `v0`, \
2756+
but `-C symbol-mangling-version=hashed` was specified",
2757+
);
2758+
}
27442759
}
27452760
}
27462761

‎compiler/rustc_session/src/options.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,8 @@ mod desc {
407407
pub const parse_switch_with_opt_path: &str =
408408
"an optional path to the profiling data output directory";
409409
pub const parse_merge_functions: &str = "one of: `disabled`, `trampolines`, or `aliases`";
410-
pub const parse_symbol_mangling_version: &str = "either `legacy` or `v0` (RFC 2603)";
410+
pub const parse_symbol_mangling_version: &str =
411+
"one of: `legacy`, `v0` (RFC 2603), or `hashed`";
411412
pub const parse_src_file_hash: &str = "either `md5` or `sha1`";
412413
pub const parse_relocation_model: &str =
413414
"one of supported relocation models (`rustc --print relocation-models`)";
@@ -1180,6 +1181,7 @@ mod parse {
11801181
*slot = match v {
11811182
Some("legacy") => Some(SymbolManglingVersion::Legacy),
11821183
Some("v0") => Some(SymbolManglingVersion::V0),
1184+
Some("hashed") => Some(SymbolManglingVersion::Hashed),
11831185
_ => return false,
11841186
};
11851187
true
@@ -1504,7 +1506,7 @@ options! {
15041506
"tell the linker which information to strip (`none` (default), `debuginfo` or `symbols`)"),
15051507
symbol_mangling_version: Option<SymbolManglingVersion> = (None,
15061508
parse_symbol_mangling_version, [TRACKED],
1507-
"which mangling version to use for symbol names ('legacy' (default) or 'v0')"),
1509+
"which mangling version to use for symbol names ('legacy' (default), 'v0', or 'hashed')"),
15081510
target_cpu: Option<String> = (None, parse_opt_string, [TRACKED],
15091511
"select target processor (`rustc --print target-cpus` for details)"),
15101512
target_feature: String = (String::new(), parse_target_feature, [TRACKED],

‎compiler/rustc_span/src/symbol.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1793,6 +1793,7 @@ symbols! {
17931793
warn,
17941794
wasm_abi,
17951795
wasm_import_module,
1796+
wasm_preview2,
17961797
wasm_target_feature,
17971798
while_let,
17981799
windows,

‎compiler/rustc_symbol_mangling/src/hashed.rs

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
use crate::v0;
2+
use rustc_data_structures::stable_hasher::{Hash64, HashStable, StableHasher};
3+
use rustc_hir::def_id::CrateNum;
4+
use rustc_middle::ty::{Instance, TyCtxt};
5+
6+
use std::fmt::Write;
7+
8+
pub(super) fn mangle<'tcx>(
9+
tcx: TyCtxt<'tcx>,
10+
instance: Instance<'tcx>,
11+
instantiating_crate: Option<CrateNum>,
12+
full_mangling_name: impl FnOnce() -> String,
13+
) -> String {
14+
// The symbol of a generic function may be scattered in multiple downstream dylibs.
15+
// If the symbol of a generic function still contains `crate name`, hash conflicts between the
16+
// generic funcion and other symbols of the same `crate` cannot be detected in time during
17+
// construction. This symbol conflict is left over until it occurs during run time.
18+
// In this case, `instantiating-crate name` is used to replace `crate name` can completely
19+
// eliminate the risk of the preceding potential hash conflict.
20+
let crate_num =
21+
if let Some(krate) = instantiating_crate { krate } else { instance.def_id().krate };
22+
23+
let mut symbol = "_RNxC".to_string();
24+
v0::push_ident(tcx.crate_name(crate_num).as_str(), &mut symbol);
25+
26+
let hash = tcx.with_stable_hashing_context(|mut hcx| {
27+
let mut hasher = StableHasher::new();
28+
full_mangling_name().hash_stable(&mut hcx, &mut hasher);
29+
hasher.finish::<Hash64>().as_u64()
30+
});
31+
32+
push_hash64(hash, &mut symbol);
33+
34+
symbol
35+
}
36+
37+
// The hash is encoded based on `base-62` and the final terminator `_` is removed because it does
38+
// not help prevent hash collisions
39+
fn push_hash64(hash: u64, output: &mut String) {
40+
let hash = v0::encode_integer_62(hash);
41+
let hash_len = hash.len();
42+
let _ = write!(output, "{hash_len}H{}", &hash[..hash_len - 1]);
43+
}

‎compiler/rustc_symbol_mangling/src/lib.rs

+4
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ use rustc_middle::query::Providers;
111111
use rustc_middle::ty::{self, Instance, TyCtxt};
112112
use rustc_session::config::SymbolManglingVersion;
113113

114+
mod hashed;
114115
mod legacy;
115116
mod v0;
116117

@@ -265,6 +266,9 @@ fn compute_symbol_name<'tcx>(
265266
let symbol = match mangling_version {
266267
SymbolManglingVersion::Legacy => legacy::mangle(tcx, instance, instantiating_crate),
267268
SymbolManglingVersion::V0 => v0::mangle(tcx, instance, instantiating_crate),
269+
SymbolManglingVersion::Hashed => hashed::mangle(tcx, instance, instantiating_crate, || {
270+
v0::mangle(tcx, instance, instantiating_crate)
271+
}),
268272
};
269273

270274
debug_assert!(

0 commit comments

Comments
 (0)