allow repr(align = x) on inherent methods

This commit is contained in:
Deadbeef 2023-04-14 06:39:16 +00:00
parent d558796beb
commit b59ec166ad
4 changed files with 24 additions and 5 deletions

View File

@ -631,6 +631,10 @@ passes_attr_application_struct_enum_function_union =
attribute should be applied to a struct, enum, function, or union
.label = not a struct, enum, function, or union
passes_attr_application_struct_enum_function_inherent_method_union =
attribute should be applied to a struct, enum, function, inherent method, or union
.label = not a struct, enum, function, inherent method, or union
passes_transparent_incompatible =
transparent {$target} cannot have other repr hints

View File

@ -1728,7 +1728,9 @@ fn check_repr(
}
}
sym::align => {
if let (Target::Fn, false) = (target, self.tcx.features().fn_align) {
if let (Target::Fn | Target::Method(MethodKind::Inherent), false) =
(target, self.tcx.features().fn_align)
{
feature_err(
&self.tcx.sess.parse_sess,
sym::fn_align,
@ -1739,10 +1741,14 @@ fn check_repr(
}
match target {
Target::Struct | Target::Union | Target::Enum | Target::Fn => continue,
Target::Struct
| Target::Union
| Target::Enum
| Target::Fn
| Target::Method(MethodKind::Inherent) => continue,
_ => {
self.tcx.sess.emit_err(
errors::AttrApplication::StructEnumFunctionUnion {
errors::AttrApplication::StructEnumFunctionInherentMethodUnion {
hint_span: hint.span(),
span,
},

View File

@ -1355,8 +1355,8 @@ pub enum AttrApplication {
#[label]
span: Span,
},
#[diag(passes_attr_application_struct_enum_function_union, code = "E0517")]
StructEnumFunctionUnion {
#[diag(passes_attr_application_struct_enum_function_inherent_method_union, code = "E0517")]
StructEnumFunctionInherentMethodUnion {
#[primary_span]
hint_span: Span,
#[label]

View File

@ -7,3 +7,12 @@
#[no_mangle]
#[repr(align(16))]
pub fn fn_align() {}
pub struct A;
impl A {
// CHECK: align 16
#[no_mangle]
#[repr(align(16))]
pub fn method_align(self) {}
}