Skip to content

Commit a655e64

Browse files
borsbors
committed
Auto merge of rust-lang#122190 - matthiaskrgr:rollup-9ol4y30, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - rust-lang#121025 (add known-bug tests for derive failure to detect packed repr) - rust-lang#121194 (Refactor pre-getopts command line argument handling) - rust-lang#121563 (Use `ControlFlow` in visitors.) - rust-lang#122173 (Don't ICE in CTFE if raw/fn-ptr types differ) - rust-lang#122175 (Bless tidy issues order) - rust-lang#122179 (rustc: Fix typo) - rust-lang#122181 (Fix crash in internal late lint checking) - rust-lang#122183 (interpret: update comment about read_discriminant on uninhabited variants) Failed merges: - rust-lang#122076 (Tweak the way we protect in-place function arguments in interpreters) - rust-lang#122132 (Diagnostic renaming 3) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 74acabe + 8abeac2 commit a655e64

File tree

76 files changed

+821
-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.

76 files changed

+821
-457
lines changed

Diff for: ‎compiler/rustc_ast_lowering/src/format.rs

+11-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
use super::LoweringContext;
2+
use core::ops::ControlFlow;
23
use rustc_ast as ast;
34
use rustc_ast::visit::Visitor;
45
use rustc_ast::*;
@@ -594,30 +595,32 @@ fn expand_format_args<'hir>(
594595
}
595596

596597
fn may_contain_yield_point(e: &ast::Expr) -> bool {
597-
struct MayContainYieldPoint(bool);
598+
struct MayContainYieldPoint;
598599

599600
impl Visitor<'_> for MayContainYieldPoint {
600-
fn visit_expr(&mut self, e: &ast::Expr) {
601+
type Result = ControlFlow<()>;
602+
603+
fn visit_expr(&mut self, e: &ast::Expr) -> ControlFlow<()> {
601604
if let ast::ExprKind::Await(_, _) | ast::ExprKind::Yield(_) = e.kind {
602-
self.0 = true;
605+
ControlFlow::Break(())
603606
} else {
604607
visit::walk_expr(self, e);
608+
ControlFlow::Continue(())
605609
}
606610
}
607611

608-
fn visit_mac_call(&mut self, _: &ast::MacCall) {
612+
fn visit_mac_call(&mut self, _: &ast::MacCall) -> ControlFlow<()> {
609613
// Macros should be expanded at this point.
610614
unreachable!("unexpanded macro in ast lowering");
611615
}
612616

613-
fn visit_item(&mut self, _: &ast::Item) {
617+
fn visit_item(&mut self, _: &ast::Item) -> ControlFlow<()> {
614618
// Do not recurse into nested items.
619+
ControlFlow::Continue(())
615620
}
616621
}
617622

618-
let mut visitor = MayContainYieldPoint(false);
619-
visitor.visit_expr(e);
620-
visitor.0
623+
MayContainYieldPoint.visit_expr(e).is_break()
621624
}
622625

623626
fn for_all_argument_indexes(template: &mut [FormatArgsPiece], mut f: impl FnMut(&mut usize)) {

Diff for: ‎compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs

+29-47
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#![allow(rustc::diagnostic_outside_of_impl)]
22
#![allow(rustc::untranslatable_diagnostic)]
33

4+
use core::ops::ControlFlow;
45
use hir::ExprKind;
56
use rustc_errors::{Applicability, Diag};
67
use rustc_hir as hir;
@@ -727,30 +728,12 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
727728
_ => local_decl.source_info.span,
728729
};
729730

730-
struct BindingFinder {
731-
span: Span,
732-
hir_id: Option<hir::HirId>,
733-
}
734-
735-
impl<'tcx> Visitor<'tcx> for BindingFinder {
736-
fn visit_stmt(&mut self, s: &'tcx hir::Stmt<'tcx>) {
737-
if let hir::StmtKind::Local(local) = s.kind {
738-
if local.pat.span == self.span {
739-
self.hir_id = Some(local.hir_id);
740-
}
741-
}
742-
hir::intravisit::walk_stmt(self, s);
743-
}
744-
}
745-
746731
let def_id = self.body.source.def_id();
747732
let hir_id = if let Some(local_def_id) = def_id.as_local()
748733
&& let Some(body_id) = self.infcx.tcx.hir().maybe_body_owned_by(local_def_id)
749734
{
750735
let body = self.infcx.tcx.hir().body(body_id);
751-
let mut v = BindingFinder { span: pat_span, hir_id: None };
752-
v.visit_body(body);
753-
v.hir_id
736+
BindingFinder { span: pat_span }.visit_body(body).break_value()
754737
} else {
755738
None
756739
};
@@ -859,17 +842,18 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
859842
};
860843

861844
let hir_map = self.infcx.tcx.hir();
862-
struct Finder<'tcx> {
845+
struct Finder {
863846
span: Span,
864-
expr: Option<&'tcx Expr<'tcx>>,
865847
}
866848

867-
impl<'tcx> Visitor<'tcx> for Finder<'tcx> {
868-
fn visit_expr(&mut self, e: &'tcx hir::Expr<'tcx>) {
869-
if e.span == self.span && self.expr.is_none() {
870-
self.expr = Some(e);
849+
impl<'tcx> Visitor<'tcx> for Finder {
850+
type Result = ControlFlow<&'tcx Expr<'tcx>>;
851+
fn visit_expr(&mut self, e: &'tcx hir::Expr<'tcx>) -> Self::Result {
852+
if e.span == self.span {
853+
ControlFlow::Break(e)
854+
} else {
855+
hir::intravisit::walk_expr(self, e)
871856
}
872-
hir::intravisit::walk_expr(self, e);
873857
}
874858
}
875859
if let Some(body_id) = hir_map.maybe_body_owned_by(self.mir_def_id())
@@ -878,9 +862,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
878862
// `span` corresponds to the expression being iterated, find the `for`-loop desugared
879863
// expression with that span in order to identify potential fixes when encountering a
880864
// read-only iterator that should be mutable.
881-
let mut v = Finder { span, expr: None };
882-
v.visit_block(block);
883-
if let Some(expr) = v.expr
865+
if let ControlFlow::Break(expr) = (Finder { span }).visit_block(block)
884866
&& let Call(_, [expr]) = expr.kind
885867
{
886868
match expr.kind {
@@ -1179,29 +1161,12 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
11791161
);
11801162
}
11811163
Some((false, err_label_span, message)) => {
1182-
struct BindingFinder {
1183-
span: Span,
1184-
hir_id: Option<hir::HirId>,
1185-
}
1186-
1187-
impl<'tcx> Visitor<'tcx> for BindingFinder {
1188-
fn visit_stmt(&mut self, s: &'tcx hir::Stmt<'tcx>) {
1189-
if let hir::StmtKind::Local(local) = s.kind {
1190-
if local.pat.span == self.span {
1191-
self.hir_id = Some(local.hir_id);
1192-
}
1193-
}
1194-
hir::intravisit::walk_stmt(self, s);
1195-
}
1196-
}
11971164
let def_id = self.body.source.def_id();
11981165
let hir_id = if let Some(local_def_id) = def_id.as_local()
11991166
&& let Some(body_id) = self.infcx.tcx.hir().maybe_body_owned_by(local_def_id)
12001167
{
12011168
let body = self.infcx.tcx.hir().body(body_id);
1202-
let mut v = BindingFinder { span: err_label_span, hir_id: None };
1203-
v.visit_body(body);
1204-
v.hir_id
1169+
BindingFinder { span: err_label_span }.visit_body(body).break_value()
12051170
} else {
12061171
None
12071172
};
@@ -1333,6 +1298,23 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
13331298
}
13341299
}
13351300

1301+
struct BindingFinder {
1302+
span: Span,
1303+
}
1304+
1305+
impl<'tcx> Visitor<'tcx> for BindingFinder {
1306+
type Result = ControlFlow<hir::HirId>;
1307+
fn visit_stmt(&mut self, s: &'tcx hir::Stmt<'tcx>) -> Self::Result {
1308+
if let hir::StmtKind::Local(local) = s.kind
1309+
&& local.pat.span == self.span
1310+
{
1311+
ControlFlow::Break(local.hir_id)
1312+
} else {
1313+
hir::intravisit::walk_stmt(self, s)
1314+
}
1315+
}
1316+
}
1317+
13361318
pub fn mut_borrow_of_mutable_ref(local_decl: &LocalDecl<'_>, local_name: Option<Symbol>) -> bool {
13371319
debug!("local_info: {:?}, ty.kind(): {:?}", local_decl.local_info, local_decl.ty.kind());
13381320

Diff for: ‎compiler/rustc_borrowck/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#![feature(assert_matches)]
77
#![feature(associated_type_bounds)]
88
#![feature(box_patterns)]
9+
#![feature(control_flow_enum)]
910
#![feature(let_chains)]
1011
#![feature(min_specialization)]
1112
#![feature(never_type)]

Diff for: ‎compiler/rustc_builtin_macros/src/cfg_eval.rs

+33-33
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use crate::util::{check_builtin_macro_attribute, warn_on_duplicate_attribute};
22

3+
use core::ops::ControlFlow;
34
use rustc_ast as ast;
45
use rustc_ast::mut_visit::MutVisitor;
56
use rustc_ast::ptr::P;
@@ -87,41 +88,40 @@ fn flat_map_annotatable(
8788
}
8889
}
8990

90-
struct CfgFinder {
91-
has_cfg_or_cfg_attr: bool,
92-
}
93-
94-
impl CfgFinder {
95-
fn has_cfg_or_cfg_attr(annotatable: &Annotatable) -> bool {
96-
let mut finder = CfgFinder { has_cfg_or_cfg_attr: false };
97-
match annotatable {
98-
Annotatable::Item(item) => finder.visit_item(item),
99-
Annotatable::TraitItem(item) => finder.visit_assoc_item(item, visit::AssocCtxt::Trait),
100-
Annotatable::ImplItem(item) => finder.visit_assoc_item(item, visit::AssocCtxt::Impl),
101-
Annotatable::ForeignItem(item) => finder.visit_foreign_item(item),
102-
Annotatable::Stmt(stmt) => finder.visit_stmt(stmt),
103-
Annotatable::Expr(expr) => finder.visit_expr(expr),
104-
Annotatable::Arm(arm) => finder.visit_arm(arm),
105-
Annotatable::ExprField(field) => finder.visit_expr_field(field),
106-
Annotatable::PatField(field) => finder.visit_pat_field(field),
107-
Annotatable::GenericParam(param) => finder.visit_generic_param(param),
108-
Annotatable::Param(param) => finder.visit_param(param),
109-
Annotatable::FieldDef(field) => finder.visit_field_def(field),
110-
Annotatable::Variant(variant) => finder.visit_variant(variant),
111-
Annotatable::Crate(krate) => finder.visit_crate(krate),
112-
};
113-
finder.has_cfg_or_cfg_attr
114-
}
115-
}
91+
fn has_cfg_or_cfg_attr(annotatable: &Annotatable) -> bool {
92+
struct CfgFinder;
11693

117-
impl<'ast> visit::Visitor<'ast> for CfgFinder {
118-
fn visit_attribute(&mut self, attr: &'ast Attribute) {
119-
// We want short-circuiting behavior, so don't use the '|=' operator.
120-
self.has_cfg_or_cfg_attr = self.has_cfg_or_cfg_attr
121-
|| attr
94+
impl<'ast> visit::Visitor<'ast> for CfgFinder {
95+
type Result = ControlFlow<()>;
96+
fn visit_attribute(&mut self, attr: &'ast Attribute) -> ControlFlow<()> {
97+
if attr
12298
.ident()
123-
.is_some_and(|ident| ident.name == sym::cfg || ident.name == sym::cfg_attr);
99+
.is_some_and(|ident| ident.name == sym::cfg || ident.name == sym::cfg_attr)
100+
{
101+
ControlFlow::Break(())
102+
} else {
103+
ControlFlow::Continue(())
104+
}
105+
}
124106
}
107+
108+
let res = match annotatable {
109+
Annotatable::Item(item) => CfgFinder.visit_item(item),
110+
Annotatable::TraitItem(item) => CfgFinder.visit_assoc_item(item, visit::AssocCtxt::Trait),
111+
Annotatable::ImplItem(item) => CfgFinder.visit_assoc_item(item, visit::AssocCtxt::Impl),
112+
Annotatable::ForeignItem(item) => CfgFinder.visit_foreign_item(item),
113+
Annotatable::Stmt(stmt) => CfgFinder.visit_stmt(stmt),
114+
Annotatable::Expr(expr) => CfgFinder.visit_expr(expr),
115+
Annotatable::Arm(arm) => CfgFinder.visit_arm(arm),
116+
Annotatable::ExprField(field) => CfgFinder.visit_expr_field(field),
117+
Annotatable::PatField(field) => CfgFinder.visit_pat_field(field),
118+
Annotatable::GenericParam(param) => CfgFinder.visit_generic_param(param),
119+
Annotatable::Param(param) => CfgFinder.visit_param(param),
120+
Annotatable::FieldDef(field) => CfgFinder.visit_field_def(field),
121+
Annotatable::Variant(variant) => CfgFinder.visit_variant(variant),
122+
Annotatable::Crate(krate) => CfgFinder.visit_crate(krate),
123+
};
124+
res.is_break()
125125
}
126126

127127
impl CfgEval<'_, '_> {
@@ -132,7 +132,7 @@ impl CfgEval<'_, '_> {
132132
fn configure_annotatable(&mut self, mut annotatable: Annotatable) -> Option<Annotatable> {
133133
// Tokenizing and re-parsing the `Annotatable` can have a significant
134134
// performance impact, so try to avoid it if possible
135-
if !CfgFinder::has_cfg_or_cfg_attr(&annotatable) {
135+
if !has_cfg_or_cfg_attr(&annotatable) {
136136
return Some(annotatable);
137137
}
138138

Diff for: ‎compiler/rustc_builtin_macros/src/deriving/default.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use crate::deriving::generic::ty::*;
22
use crate::deriving::generic::*;
33
use crate::errors;
4+
use core::ops::ControlFlow;
45
use rustc_ast as ast;
56
use rustc_ast::visit::walk_list;
67
use rustc_ast::{attr, EnumDef, VariantData};
@@ -231,20 +232,19 @@ impl<'a, 'b> rustc_ast::visit::Visitor<'a> for DetectNonVariantDefaultAttr<'a, '
231232
}
232233

233234
fn has_a_default_variant(item: &Annotatable) -> bool {
234-
struct HasDefaultAttrOnVariant {
235-
found: bool,
236-
}
235+
struct HasDefaultAttrOnVariant;
237236

238237
impl<'ast> rustc_ast::visit::Visitor<'ast> for HasDefaultAttrOnVariant {
239-
fn visit_variant(&mut self, v: &'ast rustc_ast::Variant) {
238+
type Result = ControlFlow<()>;
239+
fn visit_variant(&mut self, v: &'ast rustc_ast::Variant) -> ControlFlow<()> {
240240
if v.attrs.iter().any(|attr| attr.has_name(kw::Default)) {
241-
self.found = true;
241+
ControlFlow::Break(())
242+
} else {
243+
// no need to subrecurse.
244+
ControlFlow::Continue(())
242245
}
243-
// no need to subrecurse.
244246
}
245247
}
246248

247-
let mut visitor = HasDefaultAttrOnVariant { found: false };
248-
item.visit_with(&mut visitor);
249-
visitor.found
249+
item.visit_with(&mut HasDefaultAttrOnVariant).is_break()
250250
}

Diff for: ‎compiler/rustc_codegen_ssa/src/back/metadata.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ pub(crate) fn create_object_file(sess: &Session) -> Option<write::Object<'static
339339
"ilp32s" | "lp64s" => e_flags |= elf::EF_LARCH_ABI_SOFT_FLOAT,
340340
"ilp32f" | "lp64f" => e_flags |= elf::EF_LARCH_ABI_SINGLE_FLOAT,
341341
"ilp32d" | "lp64d" => e_flags |= elf::EF_LARCH_ABI_DOUBLE_FLOAT,
342-
_ => bug!("unknown RISC-V ABI name"),
342+
_ => bug!("unknown LoongArch ABI name"),
343343
}
344344

345345
e_flags

Diff for: ‎compiler/rustc_const_eval/src/interpret/discriminant.rs

+7-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ use super::{ImmTy, InterpCx, InterpResult, Machine, Readable, Scalar, Writeable}
1010

1111
impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
1212
/// Writes the discriminant of the given variant.
13+
///
14+
/// If the variant is uninhabited, this is UB.
1315
#[instrument(skip(self), level = "trace")]
1416
pub fn write_discriminant(
1517
&mut self,
@@ -102,6 +104,8 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
102104

103105
/// Read discriminant, return the runtime value as well as the variant index.
104106
/// Can also legally be called on non-enums (e.g. through the discriminant_value intrinsic)!
107+
///
108+
/// Will never return an uninhabited variant.
105109
#[instrument(skip(self), level = "trace")]
106110
pub fn read_discriminant(
107111
&self,
@@ -244,7 +248,9 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
244248
variant
245249
}
246250
};
247-
// For consistency with `write_discriminant`, and to make sure that `project_downcast` cannot fail due to strange layouts, we declare immediate UB for uninhabited variants.
251+
// Reading the discriminant of an uninhabited variant is UB. This is the basis for the
252+
// `uninhabited_enum_branching` MIR pass. It also ensures consistency with
253+
// `write_discriminant`.
248254
if op.layout().for_variant(self, index).abi.is_uninhabited() {
249255
throw_ub!(UninhabitedEnumVariantRead(index))
250256
}

Diff for: ‎compiler/rustc_const_eval/src/transform/check_consts/check.rs

-1
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,6 @@ impl<'tcx> Visitor<'tcx> for Checker<'_, 'tcx> {
581581
if is_int_bool_or_char(lhs_ty) && is_int_bool_or_char(rhs_ty) {
582582
// Int, bool, and char operations are fine.
583583
} else if lhs_ty.is_fn_ptr() || lhs_ty.is_unsafe_ptr() {
584-
assert_eq!(lhs_ty, rhs_ty);
585584
assert!(matches!(
586585
op,
587586
BinOp::Eq

0 commit comments

Comments
 (0)