Skip to content

Conversation

fee1-dead
Copy link
Member

Discussion: #82232 (comment)

@rustbot
Copy link
Collaborator

rustbot commented Apr 14, 2023

r? @petrochenkov

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Apr 14, 2023
#[no_mangle]
#[repr(align(16))]
pub fn method_align(self) {}
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also add a check for trait methods and associated functions, just to be sure? i.e.

Suggested change
}
// CHECK: align 16
#[no_mangle]
#[repr(align(16))]
pub fn associated_fn() {}
}
trait T {
fn trait_fn() {}
fn trait_method(self) {}
}
impl T for A {
// CHECK: align 16
#[no_mangle]
#[repr(align(16))]
fn trait_fn() {}
// CHECK: align 16
#[no_mangle]
#[repr(align(16))]
fn trait_method(self) {}
}

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should those be allowed? The current change doesn't allow those, but I can change it to include trait impls as well.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think yes, they should? Don't really see a reason to not allow these (btw maybe a test for default bodies should be added too, although I'm not sure if it's easy to do...).

@WaffleLapkin
Copy link
Member

r? @WaffleLapkin

@rustbot rustbot assigned WaffleLapkin and unassigned petrochenkov Apr 14, 2023
@WaffleLapkin
Copy link
Member

Do we not have a test which shows the passes_attr_application_struct_enum_function_method_union error message?... @fee1-dead would you like to add a test for that?

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Apr 17, 2023

📌 Commit dda8994 has been approved by WaffleLapkin

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 17, 2023
@fee1-dead
Copy link
Member Author

@WaffleLapkin done.

@WaffleLapkin
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Apr 17, 2023

📌 Commit 84de041 has been approved by WaffleLapkin

It is now in the queue for this repository.

bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 17, 2023
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#104055 (Migrate diagnostics in `rustc_borrowck`)
 - rust-lang#110257 (fix false positives for `unused_parens` around unary and binary operations)
 - rust-lang#110313 (allow `repr(align = x)` on inherent methods)
 - rust-lang#110337 (Correct default value for default-linker-libraries)
 - rust-lang#110386 (Clean up traversal macros)
 - rust-lang#110394 (Various minor Idx-related tweaks)
 - rust-lang#110425 (Encode def span for `ConstParam`)
 - rust-lang#110434 (Check freeze with right param-env in `deduced_param_attrs`)
 - rust-lang#110455 (tests: adapt for LLVM change 5b386b8)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit eb05246 into rust-lang:master Apr 17, 2023
@rustbot rustbot added this to the 1.71.0 milestone Apr 17, 2023
@fee1-dead fee1-dead deleted the repr_align_method branch April 18, 2023 01:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants