Skip to content

Commit d5586dc

Browse files
JonathanBrouwerJonathanBrouwer
committed
Port #[rustc_layout_scalar_valid_range_start/end] to the new attribute parsing infrastructure
Signed-off-by: Jonathan Brouwer <[email protected]>
1 parent a17780d commit d5586dc

File tree

13 files changed

+144
-69
lines changed

13 files changed

+144
-69
lines changed

‎compiler/rustc_attr_data_structures/src/attributes.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,12 @@ pub enum AttributeKind {
265265
/// Represents [`#[repr]`](https://doc.rust-lang.org/stable/reference/type-layout.html#representations).
266266
Repr(ThinVec<(ReprAttr, Span)>),
267267

268+
/// Represents `#[rustc_layout_scalar_valid_range_end]`.
269+
RustcLayoutScalarValidRangeEnd(Box<u128>, Span),
270+
271+
/// Represents `#[rustc_layout_scalar_valid_range_start]`.
272+
RustcLayoutScalarValidRangeStart(Box<u128>, Span),
273+
268274
/// Represents `#[rustc_skip_during_method_dispatch]`.
269275
SkipDuringMethodDispatch { array: bool, boxed_slice: bool, span: Span },
270276

‎compiler/rustc_attr_data_structures/src/lib.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,16 @@ pub trait PrintAttribute {
4747
fn print_attribute(&self, p: &mut Printer);
4848
}
4949

50+
impl PrintAttribute for u128 {
51+
fn should_render(&self) -> bool {
52+
true
53+
}
54+
55+
fn print_attribute(&self, p: &mut Printer) {
56+
p.word(self.to_string())
57+
}
58+
}
59+
5060
impl<T: PrintAttribute> PrintAttribute for &T {
5161
fn should_render(&self) -> bool {
5262
T::should_render(self)

‎compiler/rustc_attr_parsing/src/attributes/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ pub(crate) mod lint_helpers;
3535
pub(crate) mod loop_match;
3636
pub(crate) mod must_use;
3737
pub(crate) mod repr;
38+
pub(crate) mod rustc_internal;
3839
pub(crate) mod semantics;
3940
pub(crate) mod stability;
4041
pub(crate) mod traits;

‎compiler/rustc_attr_parsing/src/attributes/rustc_internal.rs

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
use rustc_ast::LitKind;
2+
use rustc_attr_data_structures::AttributeKind;
3+
use rustc_feature::{AttributeTemplate, template};
4+
use rustc_span::{Symbol, sym};
5+
6+
use crate::attributes::{AttributeOrder, OnDuplicate, SingleAttributeParser};
7+
use crate::context::{AcceptContext, Stage};
8+
use crate::parser::ArgParser;
9+
10+
pub(crate) struct RustcLayoutScalarValidRangeStart;
11+
12+
impl<S: Stage> SingleAttributeParser<S> for RustcLayoutScalarValidRangeStart {
13+
const PATH: &'static [Symbol] = &[sym::rustc_layout_scalar_valid_range_start];
14+
const ATTRIBUTE_ORDER: AttributeOrder = AttributeOrder::KeepFirst;
15+
const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::Error;
16+
const TEMPLATE: AttributeTemplate = template!(List: "start");
17+
18+
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser<'_>) -> Option<AttributeKind> {
19+
parse_rustc_layout_scalar_valid_range(cx, args)
20+
.map(|n| AttributeKind::RustcLayoutScalarValidRangeStart(n, cx.attr_span))
21+
}
22+
}
23+
24+
pub(crate) struct RustcLayoutScalarValidRangeEnd;
25+
26+
impl<S: Stage> SingleAttributeParser<S> for RustcLayoutScalarValidRangeEnd {
27+
const PATH: &'static [Symbol] = &[sym::rustc_layout_scalar_valid_range_end];
28+
const ATTRIBUTE_ORDER: AttributeOrder = AttributeOrder::KeepFirst;
29+
const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::Error;
30+
const TEMPLATE: AttributeTemplate = template!(List: "end");
31+
32+
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser<'_>) -> Option<AttributeKind> {
33+
parse_rustc_layout_scalar_valid_range(cx, args)
34+
.map(|n| AttributeKind::RustcLayoutScalarValidRangeEnd(n, cx.attr_span))
35+
}
36+
}
37+
38+
fn parse_rustc_layout_scalar_valid_range<S: Stage>(
39+
cx: &mut AcceptContext<'_, '_, S>,
40+
args: &ArgParser<'_>,
41+
) -> Option<Box<u128>> {
42+
let Some(list) = args.list() else {
43+
cx.expected_list(cx.attr_span);
44+
return None;
45+
};
46+
let Some(single) = list.single() else {
47+
cx.expected_single_argument(list.span);
48+
return None;
49+
};
50+
let Some(lit) = single.lit() else {
51+
cx.expected_integer_literal(single.span());
52+
return None;
53+
};
54+
let LitKind::Int(num, _ty) = lit.kind else {
55+
cx.expected_integer_literal(single.span());
56+
return None;
57+
};
58+
Some(Box::new(num.0))
59+
}

‎compiler/rustc_attr_parsing/src/context.rs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ use crate::attributes::lint_helpers::{AsPtrParser, PubTransparentParser};
2525
use crate::attributes::loop_match::{ConstContinueParser, LoopMatchParser};
2626
use crate::attributes::must_use::MustUseParser;
2727
use crate::attributes::repr::{AlignParser, ReprParser};
28+
use crate::attributes::rustc_internal::{
29+
RustcLayoutScalarValidRangeEnd, RustcLayoutScalarValidRangeStart,
30+
};
2831
use crate::attributes::semantics::MayDangleParser;
2932
use crate::attributes::stability::{
3033
BodyStabilityParser, ConstStabilityIndirectParser, ConstStabilityParser, StabilityParser,
@@ -125,6 +128,8 @@ attribute_parsers!(
125128
Single<OptimizeParser>,
126129
Single<PubTransparentParser>,
127130
Single<RustcForceInlineParser>,
131+
Single<RustcLayoutScalarValidRangeEnd>,
132+
Single<RustcLayoutScalarValidRangeStart>,
128133
Single<SkipDuringMethodDispatchParser>,
129134
Single<TrackCallerParser>,
130135
Single<TransparencyParser>,
@@ -268,6 +273,16 @@ impl<'f, 'sess: 'f, S: Stage> AcceptContext<'f, 'sess, S> {
268273
})
269274
}
270275

276+
pub(crate) fn expected_integer_literal(&self, span: Span) -> ErrorGuaranteed {
277+
self.emit_err(AttributeParseError {
278+
span,
279+
attr_span: self.attr_span,
280+
template: self.template.clone(),
281+
attribute: self.attr_path.clone(),
282+
reason: AttributeParseErrorReason::ExpectedIntegerLiteral,
283+
})
284+
}
285+
271286
pub(crate) fn expected_list(&self, span: Span) -> ErrorGuaranteed {
272287
self.emit_err(AttributeParseError {
273288
span,

‎compiler/rustc_attr_parsing/src/session_diagnostics.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -496,6 +496,7 @@ pub(crate) struct NakedFunctionIncompatibleAttribute {
496496
pub(crate) enum AttributeParseErrorReason {
497497
ExpectedNoArgs,
498498
ExpectedStringLiteral { byte_string: Option<Span> },
499+
ExpectedIntegerLiteral,
499500
ExpectedAtLeastOneArgument,
500501
ExpectedSingleArgument,
501502
ExpectedList,
@@ -536,6 +537,9 @@ impl<'a, G: EmissionGuarantee> Diagnostic<'a, G> for AttributeParseError {
536537
diag.span_label(self.span, "expected a string literal here");
537538
}
538539
}
540+
AttributeParseErrorReason::ExpectedIntegerLiteral => {
541+
diag.span_label(self.span, "expected an integer literal here");
542+
}
539543
AttributeParseErrorReason::ExpectedSingleArgument => {
540544
diag.span_label(self.span, "expected a single argument here");
541545
diag.code(E0805);

‎compiler/rustc_middle/src/ty/context.rs

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ use std::{fmt, iter, mem};
1717

1818
use rustc_abi::{ExternAbi, FieldIdx, Layout, LayoutData, TargetDataLayout, VariantIdx};
1919
use rustc_ast as ast;
20+
use rustc_attr_data_structures::{AttributeKind, find_attr};
2021
use rustc_data_structures::defer;
2122
use rustc_data_structures::fingerprint::Fingerprint;
2223
use rustc_data_structures::fx::FxHashMap;
@@ -1649,32 +1650,9 @@ impl<'tcx> TyCtxt<'tcx> {
16491650
/// `rustc_layout_scalar_valid_range` attribute.
16501651
// FIXME(eddyb) this is an awkward spot for this method, maybe move it?
16511652
pub fn layout_scalar_valid_range(self, def_id: DefId) -> (Bound<u128>, Bound<u128>) {
1652-
let get = |name| {
1653-
let Some(attr) = self.get_attr(def_id, name) else {
1654-
return Bound::Unbounded;
1655-
};
1656-
debug!("layout_scalar_valid_range: attr={:?}", attr);
1657-
if let Some(
1658-
&[
1659-
ast::MetaItemInner::Lit(ast::MetaItemLit {
1660-
kind: ast::LitKind::Int(a, _), ..
1661-
}),
1662-
],
1663-
) = attr.meta_item_list().as_deref()
1664-
{
1665-
Bound::Included(a.get())
1666-
} else {
1667-
self.dcx().span_delayed_bug(
1668-
attr.span(),
1669-
"invalid rustc_layout_scalar_valid_range attribute",
1670-
);
1671-
Bound::Unbounded
1672-
}
1673-
};
1674-
(
1675-
get(sym::rustc_layout_scalar_valid_range_start),
1676-
get(sym::rustc_layout_scalar_valid_range_end),
1677-
)
1653+
let start = find_attr!(self.get_all_attrs(def_id), AttributeKind::RustcLayoutScalarValidRangeStart(n, _) => Bound::Included(**n)).unwrap_or(Bound::Unbounded);
1654+
let end = find_attr!(self.get_all_attrs(def_id), AttributeKind::RustcLayoutScalarValidRangeEnd(n, _) => Bound::Included(**n)).unwrap_or(Bound::Unbounded);
1655+
(start, end)
16781656
}
16791657

16801658
pub fn lift<T: Lift<TyCtxt<'tcx>>>(self, value: T) -> Option<T::Lifted> {

‎compiler/rustc_passes/messages.ftl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -613,9 +613,6 @@ passes_rustc_force_inline_coro =
613613
attribute cannot be applied to a `async`, `gen` or `async gen` function
614614
.label = `async`, `gen` or `async gen` function
615615
616-
passes_rustc_layout_scalar_valid_range_arg =
617-
expected exactly one integer literal argument
618-
619616
passes_rustc_layout_scalar_valid_range_not_struct =
620617
attribute should be applied to a struct
621618
.label = not a struct

‎compiler/rustc_passes/src/check_attr.rs

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use std::cell::Cell;
99
use std::collections::hash_map::Entry;
1010

1111
use rustc_abi::{Align, ExternAbi, Size};
12-
use rustc_ast::{AttrStyle, LitKind, MetaItemInner, MetaItemKind, MetaItemLit, ast};
12+
use rustc_ast::{AttrStyle, LitKind, MetaItemInner, MetaItemKind, ast};
1313
use rustc_attr_data_structures::{AttributeKind, InlineAttr, ReprAttr, find_attr};
1414
use rustc_data_structures::fx::FxHashMap;
1515
use rustc_errors::{Applicability, DiagCtxtHandle, IntoDiagArg, MultiSpan, StashKey};
@@ -178,6 +178,10 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
178178
Attribute::Parsed(AttributeKind::TrackCaller(attr_span)) => {
179179
self.check_track_caller(hir_id, *attr_span, attrs, span, target)
180180
}
181+
Attribute::Parsed(
182+
AttributeKind::RustcLayoutScalarValidRangeStart(_num, attr_span)
183+
| AttributeKind::RustcLayoutScalarValidRangeEnd(_num, attr_span),
184+
) => self.check_rustc_layout_scalar_valid_range(*attr_span, span, target),
181185
Attribute::Parsed(
182186
AttributeKind::BodyStability { .. }
183187
| AttributeKind::ConstStabilityIndirect
@@ -224,10 +228,6 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
224228
),
225229
[sym::no_link, ..] => self.check_no_link(hir_id, attr, span, target),
226230
[sym::export_name, ..] => self.check_export_name(hir_id, attr, span, target),
227-
[sym::rustc_layout_scalar_valid_range_start, ..]
228-
| [sym::rustc_layout_scalar_valid_range_end, ..] => {
229-
self.check_rustc_layout_scalar_valid_range(attr, span, target)
230-
}
231231
[sym::debugger_visualizer, ..] => self.check_debugger_visualizer(attr, target),
232232
[sym::rustc_std_internal_symbol, ..] => {
233233
self.check_rustc_std_internal_symbol(attr, span, target)
@@ -1670,24 +1670,11 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
16701670
}
16711671
}
16721672

1673-
fn check_rustc_layout_scalar_valid_range(&self, attr: &Attribute, span: Span, target: Target) {
1673+
fn check_rustc_layout_scalar_valid_range(&self, attr_span: Span, span: Span, target: Target) {
16741674
if target != Target::Struct {
1675-
self.dcx().emit_err(errors::RustcLayoutScalarValidRangeNotStruct {
1676-
attr_span: attr.span(),
1677-
span,
1678-
});
1675+
self.dcx().emit_err(errors::RustcLayoutScalarValidRangeNotStruct { attr_span, span });
16791676
return;
16801677
}
1681-
1682-
let Some(list) = attr.meta_item_list() else {
1683-
return;
1684-
};
1685-
1686-
if !matches!(&list[..], &[MetaItemInner::Lit(MetaItemLit { kind: LitKind::Int(..), .. })]) {
1687-
self.tcx
1688-
.dcx()
1689-
.emit_err(errors::RustcLayoutScalarValidRangeArg { attr_span: attr.span() });
1690-
}
16911678
}
16921679

16931680
/// Checks if `#[rustc_legacy_const_generics]` is applied to a function and has a valid argument.

‎compiler/rustc_passes/src/errors.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -523,13 +523,6 @@ pub(crate) struct RustcLayoutScalarValidRangeNotStruct {
523523
pub span: Span,
524524
}
525525

526-
#[derive(Diagnostic)]
527-
#[diag(passes_rustc_layout_scalar_valid_range_arg)]
528-
pub(crate) struct RustcLayoutScalarValidRangeArg {
529-
#[primary_span]
530-
pub attr_span: Span,
531-
}
532-
533526
#[derive(Diagnostic)]
534527
#[diag(passes_rustc_legacy_const_generics_only)]
535528
pub(crate) struct RustcLegacyConstGenericsOnly {

‎tests/ui/invalid/invalid_rustc_layout_scalar_valid_range.stderr

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,38 @@
1-
error: expected exactly one integer literal argument
1+
error[E0539]: malformed `rustc_layout_scalar_valid_range_start` attribute input
22
--> $DIR/invalid_rustc_layout_scalar_valid_range.rs:3:1
33
|
44
LL | #[rustc_layout_scalar_valid_range_start(u32::MAX)]
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^--------^^
6+
| | |
7+
| | expected an integer literal here
8+
| help: must be of the form: `#[rustc_layout_scalar_valid_range_start(start)]`
69

7-
error: expected exactly one integer literal argument
10+
error[E0805]: malformed `rustc_layout_scalar_valid_range_end` attribute input
811
--> $DIR/invalid_rustc_layout_scalar_valid_range.rs:6:1
912
|
1013
LL | #[rustc_layout_scalar_valid_range_end(1, 2)]
11-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
14+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^------^
15+
| | |
16+
| | expected a single argument here
17+
| help: must be of the form: `#[rustc_layout_scalar_valid_range_end(end)]`
1218

13-
error: expected exactly one integer literal argument
19+
error[E0539]: malformed `rustc_layout_scalar_valid_range_end` attribute input
1420
--> $DIR/invalid_rustc_layout_scalar_valid_range.rs:9:1
1521
|
1622
LL | #[rustc_layout_scalar_valid_range_end(a = "a")]
17-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
23+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-------^^
24+
| | |
25+
| | expected an integer literal here
26+
| help: must be of the form: `#[rustc_layout_scalar_valid_range_end(end)]`
27+
28+
error[E0539]: malformed `rustc_layout_scalar_valid_range_start` attribute input
29+
--> $DIR/invalid_rustc_layout_scalar_valid_range.rs:18:1
30+
|
31+
LL | #[rustc_layout_scalar_valid_range_start(rustc_layout_scalar_valid_range_start)]
32+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-------------------------------------^^
33+
| | |
34+
| | expected an integer literal here
35+
| help: must be of the form: `#[rustc_layout_scalar_valid_range_start(start)]`
1836

1937
error: attribute should be applied to a struct
2038
--> $DIR/invalid_rustc_layout_scalar_valid_range.rs:12:1
@@ -27,11 +45,7 @@ LL | | Y = 14,
2745
LL | | }
2846
| |_- not a struct
2947

30-
error: expected exactly one integer literal argument
31-
--> $DIR/invalid_rustc_layout_scalar_valid_range.rs:18:1
32-
|
33-
LL | #[rustc_layout_scalar_valid_range_start(rustc_layout_scalar_valid_range_start)]
34-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
35-
3648
error: aborting due to 5 previous errors
3749

50+
Some errors have detailed explanations: E0539, E0805.
51+
For more information about an error, try `rustc --explain E0539`.

‎tests/ui/parser/bad-lit-suffixes.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,5 @@ extern "C" {}
4141

4242
#[rustc_layout_scalar_valid_range_start(0suffix)]
4343
//~^ ERROR invalid suffix `suffix` for number literal
44+
//~| ERROR malformed `rustc_layout_scalar_valid_range_start` attribute input
4445
struct S;

‎tests/ui/parser/bad-lit-suffixes.stderr

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,5 +150,15 @@ LL | 1.0e10suffix;
150150
|
151151
= help: valid suffixes are `f32` and `f64`
152152

153-
error: aborting due to 20 previous errors; 2 warnings emitted
153+
error[E0805]: malformed `rustc_layout_scalar_valid_range_start` attribute input
154+
--> $DIR/bad-lit-suffixes.rs:42:1
155+
|
156+
LL | #[rustc_layout_scalar_valid_range_start(0suffix)]
157+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---------^
158+
| | |
159+
| | expected a single argument here
160+
| help: must be of the form: `#[rustc_layout_scalar_valid_range_start(start)]`
161+
162+
error: aborting due to 21 previous errors; 2 warnings emitted
154163

164+
For more information about this error, try `rustc --explain E0805`.

0 commit comments

Comments
 (0)