Skip to content

Commit f07bf3a

Browse files
Mark-SimulacrumMark-Simulacrum
committed
Revert "Allow specifying alignment for functions"
This reverts commit 448d076.
1 parent f370346 commit f07bf3a

File tree

18 files changed

+83
-137
lines changed

18 files changed

+83
-137
lines changed

‎compiler/rustc_attr/src/builtin.rs

Lines changed: 36 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -862,6 +862,18 @@ pub fn find_repr_attrs(sess: &Session, attr: &Attribute) -> Vec<ReprAttr> {
862862
if let Some(items) = attr.meta_item_list() {
863863
sess.mark_attr_used(attr);
864864
for item in items {
865+
if !item.is_meta_item() {
866+
handle_errors(
867+
&sess.parse_sess,
868+
item.span(),
869+
AttrError::UnsupportedLiteral(
870+
"meta item in `repr` must be an identifier",
871+
false,
872+
),
873+
);
874+
continue;
875+
}
876+
865877
let mut recognised = false;
866878
if item.is_word() {
867879
let hint = match item.name_or_empty() {
@@ -878,6 +890,23 @@ pub fn find_repr_attrs(sess: &Session, attr: &Attribute) -> Vec<ReprAttr> {
878890
acc.push(h);
879891
}
880892
} else if let Some((name, value)) = item.name_value_literal() {
893+
let parse_alignment = |node: &ast::LitKind| -> Result<u32, &'static str> {
894+
if let ast::LitKind::Int(literal, ast::LitIntType::Unsuffixed) = node {
895+
if literal.is_power_of_two() {
896+
// rustc_middle::ty::layout::Align restricts align to <= 2^29
897+
if *literal <= 1 << 29 {
898+
Ok(*literal as u32)
899+
} else {
900+
Err("larger than 2^29")
901+
}
902+
} else {
903+
Err("not a power of two")
904+
}
905+
} else {
906+
Err("not an unsuffixed integer")
907+
}
908+
};
909+
881910
let mut literal_error = None;
882911
if name == sym::align {
883912
recognised = true;
@@ -937,7 +966,13 @@ pub fn find_repr_attrs(sess: &Session, attr: &Attribute) -> Vec<ReprAttr> {
937966
}
938967
if !recognised {
939968
// Not a word we recognize
940-
diagnostic.delay_span_bug(item.span(), "unrecognized representation hint");
969+
struct_span_err!(
970+
diagnostic,
971+
item.span(),
972+
E0552,
973+
"unrecognized representation hint"
974+
)
975+
.emit();
941976
}
942977
}
943978
}
@@ -1045,16 +1080,3 @@ fn allow_unstable<'a>(
10451080
name
10461081
})
10471082
}
1048-
1049-
pub fn parse_alignment(node: &ast::LitKind) -> Result<u32, &'static str> {
1050-
if let ast::LitKind::Int(literal, ast::LitIntType::Unsuffixed) = node {
1051-
if literal.is_power_of_two() {
1052-
// rustc_middle::ty::layout::Align restricts align to <= 2^29
1053-
if *literal <= 1 << 29 { Ok(*literal as u32) } else { Err("larger than 2^29") }
1054-
} else {
1055-
Err("not a power of two")
1056-
}
1057-
} else {
1058-
Err("not an unsuffixed integer")
1059-
}
1060-
}

‎compiler/rustc_codegen_llvm/src/attributes.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -279,9 +279,6 @@ pub fn from_fn_attrs(cx: &CodegenCx<'ll, 'tcx>, llfn: &'ll Value, instance: ty::
279279
if codegen_fn_attrs.flags.contains(CodegenFnAttrFlags::CMSE_NONSECURE_ENTRY) {
280280
llvm::AddFunctionAttrString(llfn, Function, cstr!("cmse_nonsecure_entry"));
281281
}
282-
if let Some(align) = codegen_fn_attrs.alignment {
283-
llvm::set_alignment(llfn, align as usize);
284-
}
285282
sanitize(cx, codegen_fn_attrs.no_sanitize, llfn);
286283

287284
// Always annotate functions with the target-cpu they are compiled for.

‎compiler/rustc_feature/src/active.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -626,9 +626,6 @@ declare_features! (
626626
/// Allows `extern "C-unwind" fn` to enable unwinding across ABI boundaries.
627627
(active, c_unwind, "1.52.0", Some(74990), None),
628628

629-
/// Allows using `#[repr(align(...))]` on function items
630-
(active, fn_align, "1.53.0", Some(82232), None),
631-
632629
/// Allows `extern "wasm" fn`
633630
(active, wasm_abi, "1.53.0", Some(83788), None),
634631

‎compiler/rustc_middle/src/middle/codegen_fn_attrs.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ pub struct CodegenFnAttrs {
3838
/// be generated against a specific instruction set. Only usable on architectures which allow
3939
/// switching between multiple instruction sets.
4040
pub instruction_set: Option<InstructionSetAttr>,
41-
/// The `#[repr(align(...))]` attribute. Indicates the value of which the function should be
42-
/// aligned to.
43-
pub alignment: Option<u32>,
4441
}
4542

4643
bitflags! {
@@ -110,7 +107,6 @@ impl CodegenFnAttrs {
110107
link_section: None,
111108
no_sanitize: SanitizerSet::empty(),
112109
instruction_set: None,
113-
alignment: None,
114110
}
115111
}
116112

‎compiler/rustc_passes/src/check_attr.rs

Lines changed: 6 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1193,41 +1193,17 @@ impl CheckAttrVisitor<'tcx> {
11931193
let mut is_transparent = false;
11941194

11951195
for hint in &hints {
1196-
if !hint.is_meta_item() {
1197-
struct_span_err!(
1198-
self.tcx.sess,
1199-
hint.span(),
1200-
E0565,
1201-
"meta item in `repr` must be an identifier"
1202-
)
1203-
.emit();
1204-
continue;
1205-
}
1206-
12071196
let (article, allowed_targets) = match hint.name_or_empty() {
1208-
sym::C => {
1209-
is_c = true;
1197+
_ if !matches!(target, Target::Struct | Target::Enum | Target::Union) => {
1198+
("a", "struct, enum, or union")
1199+
}
1200+
name @ sym::C | name @ sym::align => {
1201+
is_c |= name == sym::C;
12101202
match target {
12111203
Target::Struct | Target::Union | Target::Enum => continue,
12121204
_ => ("a", "struct, enum, or union"),
12131205
}
12141206
}
1215-
sym::align => {
1216-
if let (Target::Fn, true) = (target, !self.tcx.features().fn_align) {
1217-
feature_err(
1218-
&self.tcx.sess.parse_sess,
1219-
sym::fn_align,
1220-
hint.span(),
1221-
"`repr(align)` attributes on functions are unstable",
1222-
)
1223-
.emit();
1224-
}
1225-
1226-
match target {
1227-
Target::Struct | Target::Union | Target::Enum | Target::Fn => continue,
1228-
_ => ("a", "struct, enum, function, or union"),
1229-
}
1230-
}
12311207
sym::packed => {
12321208
if target != Target::Struct && target != Target::Union {
12331209
("a", "struct or union")
@@ -1284,17 +1260,7 @@ impl CheckAttrVisitor<'tcx> {
12841260
continue;
12851261
}
12861262
}
1287-
_ => {
1288-
struct_span_err!(
1289-
self.tcx.sess,
1290-
hint.span(),
1291-
E0552,
1292-
"unrecognized representation hint"
1293-
)
1294-
.emit();
1295-
1296-
continue;
1297-
}
1263+
_ => continue,
12981264
};
12991265

13001266
struct_span_err!(

‎compiler/rustc_span/src/symbol.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,6 @@ symbols! {
569569
fmt,
570570
fmt_internals,
571571
fmul_fast,
572-
fn_align,
573572
fn_must_use,
574573
fn_mut,
575574
fn_once,

‎compiler/rustc_typeck/src/collect.rs

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
//! At present, however, we do run collection across all items in the
1616
//! crate as a kind of pass. This should eventually be factored away.
1717
18-
// ignore-tidy-filelength
19-
2018
use crate::astconv::{AstConv, SizedByDefault};
2119
use crate::bounds::Bounds;
2220
use crate::check::intrinsic::intrinsic_operation_unsafety;
@@ -2922,36 +2920,6 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, id: DefId) -> CodegenFnAttrs {
29222920
None
29232921
}
29242922
};
2925-
} else if tcx.sess.check_name(attr, sym::repr) {
2926-
codegen_fn_attrs.alignment = match attr.meta_item_list() {
2927-
Some(items) => match items.as_slice() {
2928-
[item] => match item.name_value_literal() {
2929-
Some((sym::align, literal)) => {
2930-
let alignment = rustc_attr::parse_alignment(&literal.kind);
2931-
2932-
match alignment {
2933-
Ok(align) => Some(align),
2934-
Err(msg) => {
2935-
struct_span_err!(
2936-
tcx.sess.diagnostic(),
2937-
attr.span,
2938-
E0589,
2939-
"invalid `repr(align)` attribute: {}",
2940-
msg
2941-
)
2942-
.emit();
2943-
2944-
None
2945-
}
2946-
}
2947-
}
2948-
_ => None,
2949-
},
2950-
[] => None,
2951-
_ => None,
2952-
},
2953-
None => None,
2954-
};
29552923
}
29562924
}
29572925

‎src/test/codegen/align-fn.rs

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎src/test/ui/attributes/nonterminal-expansion.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
macro_rules! pass_nonterminal {
44
($n:expr) => {
55
#[repr(align($n))] //~ ERROR expected unsuffixed literal or identifier, found `n!()`
6+
//~| ERROR unrecognized representation hint
67
struct S;
78
};
89
}

‎src/test/ui/attributes/nonterminal-expansion.stderr

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,17 @@ LL | pass_nonterminal!(n!());
99
|
1010
= note: this error originates in the macro `pass_nonterminal` (in Nightly builds, run with -Z macro-backtrace for more info)
1111

12-
error: aborting due to previous error
12+
error[E0552]: unrecognized representation hint
13+
--> $DIR/nonterminal-expansion.rs:5:16
14+
|
15+
LL | #[repr(align($n))]
16+
| ^^^^^^^^^
17+
...
18+
LL | pass_nonterminal!(n!());
19+
| ------------------------ in this macro invocation
20+
|
21+
= note: this error originates in the macro `pass_nonterminal` (in Nightly builds, run with -Z macro-backtrace for more info)
22+
23+
error: aborting due to 2 previous errors
1324

25+
For more information about this error, try `rustc --explain E0552`.

‎src/test/ui/error-codes/E0565.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// repr currently doesn't support literals
22
#[repr("C")] //~ ERROR E0565
3-
struct A {}
3+
//~| ERROR E0565
4+
struct A { }
45

5-
fn main() {}
6+
fn main() { }

‎src/test/ui/error-codes/E0565.stderr

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ error[E0565]: meta item in `repr` must be an identifier
44
LL | #[repr("C")]
55
| ^^^
66

7-
error: aborting due to previous error
7+
error[E0565]: meta item in `repr` must be an identifier
8+
--> $DIR/E0565.rs:2:8
9+
|
10+
LL | #[repr("C")]
11+
| ^^^
12+
13+
error: aborting due to 2 previous errors
814

915
For more information about this error, try `rustc --explain E0565`.

‎src/test/ui/feature-gates/feature-gate-fn_align.rs

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎src/test/ui/feature-gates/feature-gate-fn_align.stderr

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎src/test/ui/issues/issue-43988.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ fn main() {
1313

1414
#[repr(nothing)]
1515
let _x = 0;
16-
//~^^ ERROR E0552
16+
//~^^ ERROR attribute should be applied to a struct, enum, or union
1717

1818
#[repr(something_not_real)]
1919
loop {
2020
()
2121
};
22-
//~^^^^ ERROR E0552
22+
//~^^^^ ERROR attribute should be applied to a struct, enum, or union
2323

2424
#[repr]
2525
let _y = "123";

‎src/test/ui/issues/issue-43988.stderr

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,23 @@ LL | #[inline(XYZ)]
2626
LL | let _b = 4;
2727
| ----------- not a function or closure
2828

29-
error[E0552]: unrecognized representation hint
29+
error[E0517]: attribute should be applied to a struct, enum, or union
3030
--> $DIR/issue-43988.rs:14:12
3131
|
3232
LL | #[repr(nothing)]
3333
| ^^^^^^^
34+
LL | let _x = 0;
35+
| ----------- not a struct, enum, or union
3436

35-
error[E0552]: unrecognized representation hint
37+
error[E0517]: attribute should be applied to a struct, enum, or union
3638
--> $DIR/issue-43988.rs:18:12
3739
|
38-
LL | #[repr(something_not_real)]
39-
| ^^^^^^^^^^^^^^^^^^
40+
LL | #[repr(something_not_real)]
41+
| ^^^^^^^^^^^^^^^^^^
42+
LL | / loop {
43+
LL | | ()
44+
LL | | };
45+
| |_____- not a struct, enum, or union
4046

4147
error[E0518]: attribute should be applied to function or closure
4248
--> $DIR/issue-43988.rs:30:5
@@ -48,5 +54,5 @@ LL | foo();
4854

4955
error: aborting due to 7 previous errors
5056

51-
Some errors have detailed explanations: E0518, E0552.
52-
For more information about an error, try `rustc --explain E0518`.
57+
Some errors have detailed explanations: E0517, E0518.
58+
For more information about an error, try `rustc --explain E0517`.

‎src/test/ui/repr/repr-disallow-on-variant.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ struct Test;
22

33
enum Foo {
44
#[repr(u8)]
5-
//~^ ERROR attribute should be applied to an enum
5+
//~^ ERROR attribute should be applied to a struct, enum, or union
66
Variant,
77
}
88

‎src/test/ui/repr/repr-disallow-on-variant.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
error[E0517]: attribute should be applied to an enum
1+
error[E0517]: attribute should be applied to a struct, enum, or union
22
--> $DIR/repr-disallow-on-variant.rs:4:12
33
|
44
LL | #[repr(u8)]
55
| ^^
66
LL |
77
LL | Variant,
8-
| ------- not an enum
8+
| ------- not a struct, enum, or union
99

1010
error: aborting due to previous error
1111

0 commit comments

Comments
 (0)