Skip to content

Commit 6a62871

Browse files
borsbors
committed
Auto merge of #119053 - matthiaskrgr:rollup-hky3ld3, r=matthiaskrgr
Rollup of 4 pull requests Successful merges: - #118880 (More expressions correctly are marked to end with curly braces) - #118928 (fix: Overlapping spans in delimited meta-vars) - #119022 (Remove unnecessary constness from ProjectionCandidate) - #119052 (Avoid overflow in GVN constant indexing.) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 4283aea + 39fe059 commit 6a62871

File tree

14 files changed

+739
-27
lines changed

14 files changed

+739
-27
lines changed

‎compiler/rustc_ast/src/util/classify.rs

+32-3
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,44 @@ pub fn expr_trailing_brace(mut expr: &ast::Expr) -> Option<&ast::Expr> {
4040
| Range(_, Some(e), _)
4141
| Ret(Some(e))
4242
| Unary(_, e)
43-
| Yield(Some(e)) => {
43+
| Yield(Some(e))
44+
| Yeet(Some(e))
45+
| Become(e) => {
4446
expr = e;
4547
}
4648
Closure(closure) => {
4749
expr = &closure.body;
4850
}
4951
Gen(..) | Block(..) | ForLoop(..) | If(..) | Loop(..) | Match(..) | Struct(..)
50-
| TryBlock(..) | While(..) => break Some(expr),
51-
_ => break None,
52+
| TryBlock(..) | While(..) | ConstBlock(_) => break Some(expr),
53+
54+
// FIXME: These can end in `}`, but changing these would break stable code.
55+
InlineAsm(_) | OffsetOf(_, _) | MacCall(_) | IncludedBytes(_) | FormatArgs(_) => {
56+
break None;
57+
}
58+
59+
Break(_, None)
60+
| Range(_, None, _)
61+
| Ret(None)
62+
| Yield(None)
63+
| Array(_)
64+
| Call(_, _)
65+
| MethodCall(_)
66+
| Tup(_)
67+
| Lit(_)
68+
| Cast(_, _)
69+
| Type(_, _)
70+
| Await(_, _)
71+
| Field(_, _)
72+
| Index(_, _, _)
73+
| Underscore
74+
| Path(_, _)
75+
| Continue(_)
76+
| Repeat(_, _)
77+
| Paren(_)
78+
| Try(_)
79+
| Yeet(None)
80+
| Err => break None,
5281
}
5382
}
5483
}

‎compiler/rustc_expand/src/mbe/macro_rules.rs

+7
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,13 @@ fn expand_macro<'cx>(
236236
target_sp.open = source_sp.open.with_ctxt(ctxt);
237237
target_sp.close = source_sp.close.with_ctxt(ctxt);
238238
}
239+
(
240+
TokenTree::Delimited(target_sp, ..),
241+
mbe::TokenTree::MetaVar(source_sp, ..),
242+
) => {
243+
target_sp.open = source_sp.with_ctxt(ctxt);
244+
target_sp.close = source_sp.with_ctxt(ctxt).shrink_to_hi();
245+
}
239246
_ => {
240247
let sp = rhs_tt.span().with_ctxt(ctxt);
241248
tt.set_span(sp);

‎compiler/rustc_middle/src/traits/select.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,8 @@ pub enum SelectionCandidate<'tcx> {
125125

126126
/// This is a trait matching with a projected type as `Self`, and we found
127127
/// an applicable bound in the trait definition. The `usize` is an index
128-
/// into the list returned by `tcx.item_bounds`. The constness is the
129-
/// constness of the bound in the trait.
130-
// FIXME(effects) do we need this constness
131-
ProjectionCandidate(usize, ty::BoundConstness),
128+
/// into the list returned by `tcx.item_bounds`.
129+
ProjectionCandidate(usize),
132130

133131
/// Implementation of a `Fn`-family trait by one of the anonymous types
134132
/// generated for an `||` expression.

‎compiler/rustc_mir_transform/src/gvn.rs

+3-5
Original file line numberDiff line numberDiff line change
@@ -644,12 +644,10 @@ impl<'body, 'tcx> VnState<'body, 'tcx> {
644644
{
645645
if let Some(offset) = self.evaluated[idx].as_ref()
646646
&& let Ok(offset) = self.ecx.read_target_usize(offset)
647+
&& let Some(min_length) = offset.checked_add(1)
647648
{
648-
projection.to_mut()[i] = ProjectionElem::ConstantIndex {
649-
offset,
650-
min_length: offset + 1,
651-
from_end: false,
652-
};
649+
projection.to_mut()[i] =
650+
ProjectionElem::ConstantIndex { offset, min_length, from_end: false };
653651
} else if let Some(new_idx) = self.try_as_local(idx, location) {
654652
projection.to_mut()[i] = ProjectionElem::Index(new_idx);
655653
self.reused_locals.insert(new_idx);

‎compiler/rustc_trait_selection/src/traits/select/candidate_assembly.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
154154
.infcx
155155
.probe(|_| self.match_projection_obligation_against_definition_bounds(obligation));
156156

157-
// FIXME(effects) proper constness needed?
158-
candidates.vec.extend(
159-
result.into_iter().map(|idx| ProjectionCandidate(idx, ty::BoundConstness::NotConst)),
160-
);
157+
candidates.vec.extend(result.into_iter().map(|idx| ProjectionCandidate(idx)));
161158
}
162159

163160
/// Given an obligation like `<SomeTrait for T>`, searches the obligations that the caller
@@ -585,7 +582,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
585582
}
586583

587584
ty::Alias(ty::Opaque, _) => {
588-
if candidates.vec.iter().any(|c| matches!(c, ProjectionCandidate(..))) {
585+
if candidates.vec.iter().any(|c| matches!(c, ProjectionCandidate(_))) {
589586
// We do not generate an auto impl candidate for `impl Trait`s which already
590587
// reference our auto trait.
591588
//

‎compiler/rustc_trait_selection/src/traits/select/confirmation.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
7171
ImplSource::Builtin(BuiltinImplSource::Misc, data)
7272
}
7373

74-
ProjectionCandidate(idx, _) => {
74+
ProjectionCandidate(idx) => {
7575
let obligations = self.confirm_projection_candidate(obligation, idx)?;
7676
ImplSource::Param(obligations)
7777
}
@@ -1313,7 +1313,6 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
13131313
// If we have a projection type, make sure to normalize it so we replace it
13141314
// with a fresh infer variable
13151315
ty::Alias(ty::Projection | ty::Inherent, ..) => {
1316-
// FIXME(effects) this needs constness
13171316
let predicate = normalize_with_depth_to(
13181317
self,
13191318
obligation.param_env,
@@ -1344,7 +1343,6 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
13441343
// since it's either not `const Drop` (and we raise an error during selection),
13451344
// or it's an ADT (and we need to check for a custom impl during selection)
13461345
_ => {
1347-
// FIXME(effects) this needs constness
13481346
let predicate = self_ty.rebind(ty::TraitPredicate {
13491347
trait_ref: ty::TraitRef::from_lang_item(
13501348
self.tcx(),

‎compiler/rustc_trait_selection/src/traits/select/mod.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -1883,7 +1883,7 @@ impl<'tcx> SelectionContext<'_, 'tcx> {
18831883
| BuiltinCandidate { .. }
18841884
| TraitAliasCandidate
18851885
| ObjectCandidate(_)
1886-
| ProjectionCandidate(..),
1886+
| ProjectionCandidate(_),
18871887
) => {
18881888
// We have a where clause so don't go around looking
18891889
// for impls. Arbitrarily give param candidates priority
@@ -1893,7 +1893,7 @@ impl<'tcx> SelectionContext<'_, 'tcx> {
18931893
// here (see issue #50825).
18941894
DropVictim::drop_if(!is_global(other_cand))
18951895
}
1896-
(ObjectCandidate(_) | ProjectionCandidate(..), ParamCandidate(ref victim_cand)) => {
1896+
(ObjectCandidate(_) | ProjectionCandidate(_), ParamCandidate(ref victim_cand)) => {
18971897
// Prefer these to a global where-clause bound
18981898
// (see issue #50825).
18991899
if is_global(victim_cand) { DropVictim::Yes } else { DropVictim::No }
@@ -1921,20 +1921,20 @@ impl<'tcx> SelectionContext<'_, 'tcx> {
19211921
)
19221922
}
19231923

1924-
(ProjectionCandidate(i, _), ProjectionCandidate(j, _))
1924+
(ProjectionCandidate(i), ProjectionCandidate(j))
19251925
| (ObjectCandidate(i), ObjectCandidate(j)) => {
19261926
// Arbitrarily pick the lower numbered candidate for backwards
19271927
// compatibility reasons. Don't let this affect inference.
19281928
DropVictim::drop_if(i < j && !has_non_region_infer)
19291929
}
1930-
(ObjectCandidate(_), ProjectionCandidate(..))
1931-
| (ProjectionCandidate(..), ObjectCandidate(_)) => {
1930+
(ObjectCandidate(_), ProjectionCandidate(_))
1931+
| (ProjectionCandidate(_), ObjectCandidate(_)) => {
19321932
bug!("Have both object and projection candidate")
19331933
}
19341934

19351935
// Arbitrarily give projection and object candidates priority.
19361936
(
1937-
ObjectCandidate(_) | ProjectionCandidate(..),
1937+
ObjectCandidate(_) | ProjectionCandidate(_),
19381938
ImplCandidate(..)
19391939
| AutoImplCandidate
19401940
| ClosureCandidate { .. }
@@ -1964,7 +1964,7 @@ impl<'tcx> SelectionContext<'_, 'tcx> {
19641964
| TraitUpcastingUnsizeCandidate(_)
19651965
| BuiltinCandidate { .. }
19661966
| TraitAliasCandidate,
1967-
ObjectCandidate(_) | ProjectionCandidate(..),
1967+
ObjectCandidate(_) | ProjectionCandidate(_),
19681968
) => DropVictim::No,
19691969

19701970
(&ImplCandidate(other_def), &ImplCandidate(victim_def)) => {

‎tests/mir-opt/gvn.constant_index_overflow.GVN.panic-abort.diff

+104
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
- // MIR for `constant_index_overflow` before GVN
2+
+ // MIR for `constant_index_overflow` after GVN
3+
4+
fn constant_index_overflow(_1: &[T]) -> () {
5+
debug x => _1;
6+
let mut _0: ();
7+
let _2: usize;
8+
let mut _4: bool;
9+
let mut _5: usize;
10+
let mut _6: usize;
11+
let mut _7: &[T];
12+
let _8: usize;
13+
let mut _9: usize;
14+
let mut _10: bool;
15+
let _11: usize;
16+
let mut _12: usize;
17+
let mut _13: bool;
18+
let mut _14: T;
19+
scope 1 {
20+
debug a => _2;
21+
let _3: T;
22+
scope 2 {
23+
debug b => _3;
24+
}
25+
}
26+
27+
bb0: {
28+
- StorageLive(_2);
29+
- _2 = const _ as usize (IntToInt);
30+
+ nop;
31+
+ _2 = const usize::MAX;
32+
StorageLive(_3);
33+
StorageLive(_4);
34+
StorageLive(_5);
35+
- _5 = _2;
36+
+ _5 = const usize::MAX;
37+
StorageLive(_6);
38+
StorageLive(_7);
39+
_7 = &(*_1);
40+
_6 = core::slice::<impl [T]>::len(move _7) -> [return: bb1, unwind unreachable];
41+
}
42+
43+
bb1: {
44+
StorageDead(_7);
45+
- _4 = Lt(move _5, move _6);
46+
+ _4 = Lt(const usize::MAX, move _6);
47+
switchInt(move _4) -> [0: bb4, otherwise: bb2];
48+
}
49+
50+
bb2: {
51+
StorageDead(_6);
52+
StorageDead(_5);
53+
StorageLive(_8);
54+
- _8 = _2;
55+
+ _8 = const usize::MAX;
56+
_9 = Len((*_1));
57+
- _10 = Lt(_8, _9);
58+
- assert(move _10, "index out of bounds: the length is {} but the index is {}", move _9, _8) -> [success: bb3, unwind unreachable];
59+
+ _10 = Lt(const usize::MAX, _9);
60+
+ assert(move _10, "index out of bounds: the length is {} but the index is {}", move _9, const usize::MAX) -> [success: bb3, unwind unreachable];
61+
}
62+
63+
bb3: {
64+
- _3 = (*_1)[_8];
65+
+ _3 = (*_1)[_2];
66+
StorageDead(_8);
67+
goto -> bb6;
68+
}
69+
70+
bb4: {
71+
StorageDead(_6);
72+
StorageDead(_5);
73+
StorageLive(_11);
74+
_11 = const 0_usize;
75+
_12 = Len((*_1));
76+
- _13 = Lt(_11, _12);
77+
- assert(move _13, "index out of bounds: the length is {} but the index is {}", move _12, _11) -> [success: bb5, unwind unreachable];
78+
+ _13 = Lt(const 0_usize, _12);
79+
+ assert(move _13, "index out of bounds: the length is {} but the index is {}", move _12, const 0_usize) -> [success: bb5, unwind unreachable];
80+
}
81+
82+
bb5: {
83+
- _3 = (*_1)[_11];
84+
+ _3 = (*_1)[0 of 1];
85+
StorageDead(_11);
86+
goto -> bb6;
87+
}
88+
89+
bb6: {
90+
StorageDead(_4);
91+
StorageLive(_14);
92+
_14 = _3;
93+
_0 = opaque::<T>(move _14) -> [return: bb7, unwind unreachable];
94+
}
95+
96+
bb7: {
97+
StorageDead(_14);
98+
StorageDead(_3);
99+
- StorageDead(_2);
100+
+ nop;
101+
return;
102+
}
103+
}
104+

‎tests/mir-opt/gvn.constant_index_overflow.GVN.panic-unwind.diff

+104
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
- // MIR for `constant_index_overflow` before GVN
2+
+ // MIR for `constant_index_overflow` after GVN
3+
4+
fn constant_index_overflow(_1: &[T]) -> () {
5+
debug x => _1;
6+
let mut _0: ();
7+
let _2: usize;
8+
let mut _4: bool;
9+
let mut _5: usize;
10+
let mut _6: usize;
11+
let mut _7: &[T];
12+
let _8: usize;
13+
let mut _9: usize;
14+
let mut _10: bool;
15+
let _11: usize;
16+
let mut _12: usize;
17+
let mut _13: bool;
18+
let mut _14: T;
19+
scope 1 {
20+
debug a => _2;
21+
let _3: T;
22+
scope 2 {
23+
debug b => _3;
24+
}
25+
}
26+
27+
bb0: {
28+
- StorageLive(_2);
29+
- _2 = const _ as usize (IntToInt);
30+
+ nop;
31+
+ _2 = const usize::MAX;
32+
StorageLive(_3);
33+
StorageLive(_4);
34+
StorageLive(_5);
35+
- _5 = _2;
36+
+ _5 = const usize::MAX;
37+
StorageLive(_6);
38+
StorageLive(_7);
39+
_7 = &(*_1);
40+
_6 = core::slice::<impl [T]>::len(move _7) -> [return: bb1, unwind continue];
41+
}
42+
43+
bb1: {
44+
StorageDead(_7);
45+
- _4 = Lt(move _5, move _6);
46+
+ _4 = Lt(const usize::MAX, move _6);
47+
switchInt(move _4) -> [0: bb4, otherwise: bb2];
48+
}
49+
50+
bb2: {
51+
StorageDead(_6);
52+
StorageDead(_5);
53+
StorageLive(_8);
54+
- _8 = _2;
55+
+ _8 = const usize::MAX;
56+
_9 = Len((*_1));
57+
- _10 = Lt(_8, _9);
58+
- assert(move _10, "index out of bounds: the length is {} but the index is {}", move _9, _8) -> [success: bb3, unwind continue];
59+
+ _10 = Lt(const usize::MAX, _9);
60+
+ assert(move _10, "index out of bounds: the length is {} but the index is {}", move _9, const usize::MAX) -> [success: bb3, unwind continue];
61+
}
62+
63+
bb3: {
64+
- _3 = (*_1)[_8];
65+
+ _3 = (*_1)[_2];
66+
StorageDead(_8);
67+
goto -> bb6;
68+
}
69+
70+
bb4: {
71+
StorageDead(_6);
72+
StorageDead(_5);
73+
StorageLive(_11);
74+
_11 = const 0_usize;
75+
_12 = Len((*_1));
76+
- _13 = Lt(_11, _12);
77+
- assert(move _13, "index out of bounds: the length is {} but the index is {}", move _12, _11) -> [success: bb5, unwind continue];
78+
+ _13 = Lt(const 0_usize, _12);
79+
+ assert(move _13, "index out of bounds: the length is {} but the index is {}", move _12, const 0_usize) -> [success: bb5, unwind continue];
80+
}
81+
82+
bb5: {
83+
- _3 = (*_1)[_11];
84+
+ _3 = (*_1)[0 of 1];
85+
StorageDead(_11);
86+
goto -> bb6;
87+
}
88+
89+
bb6: {
90+
StorageDead(_4);
91+
StorageLive(_14);
92+
_14 = _3;
93+
_0 = opaque::<T>(move _14) -> [return: bb7, unwind continue];
94+
}
95+
96+
bb7: {
97+
StorageDead(_14);
98+
StorageDead(_3);
99+
- StorageDead(_2);
100+
+ nop;
101+
return;
102+
}
103+
}
104+

0 commit comments

Comments
 (0)