Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migrate run-make/issue-46239 to rmake #125222

Merged
merged 1 commit into from
May 23, 2024
Merged

Migrate run-make/issue-46239 to rmake #125222

merged 1 commit into from
May 23, 2024

Conversation

Oneirical
Copy link
Contributor

Part of #121876 and the associated Google Summer of Code project.

@rustbot
Copy link
Collaborator

rustbot commented May 17, 2024

r? @jieyouxu

rustbot has assigned @jieyouxu.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels May 17, 2024
@rustbot
Copy link
Collaborator

rustbot commented May 17, 2024

Some changes occurred in run-make tests.

cc @jieyouxu

@rustbot
Copy link
Collaborator

rustbot commented May 17, 2024

The run-make-support library was changed

cc @jieyouxu

jieyouxu
jieyouxu reviewed May 17, 2024
View reviewed changes
tests/run-make/no-mark-noalias/rmake.rs Outdated
@@ -0,0 +1,14 @@
// In the rustc_trans crate, references returned by a Frozen pointer type
Copy link
Contributor

Choose a reason for hiding this comment

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

This comment is outdated, we don't have a rustc_trans crate anymore do we?

tests/run-make/no-mark-noalias/rmake.rs Outdated
@@ -0,0 +1,14 @@
// In the rustc_trans crate, references returned by a Frozen pointer type
// could mark them as "noalias", which caused miscompilation errors.
Copy link
Contributor

Choose a reason for hiding this comment

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

I feel this should be a codegen test if we're trying to check for noalias metadata?

@jieyouxu
Copy link
Contributor

I'll revisit this, this seems like it should be a codegen test

@jieyouxu jieyouxu mentioned this pull request May 20, 2024
Open
@jieyouxu
Copy link
Contributor

See codegen tests for more references, please do ask me if you are stuck or have any questions.

@rustbot author

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 21, 2024
@Oneirical
Copy link
Contributor Author

I have attempted the conversion to a codegen test, more so we can discuss it than claim "it's done". Seeing the other tests putting their flags on library functions and not main() makes me a little worried (I took inspiration from other noalias-related codegen tests such as noalias-box.rs.)

@rustbot review

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 22, 2024
jieyouxu
jieyouxu reviewed May 23, 2024
View reviewed changes
tests/codegen/noalias-freeze.rs Outdated
Comment on lines 13 to 21
// CHECK-NOT: noalias
fn main() {
let f = (dummy as fn(),);
(*project(&f))();
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggestion: I think this test could be written as

//@ compile-flags: -Copt-level=1

#![crate_type = "lib"]

fn project<T>(x: &(T,)) -> &T { &x.0 }

fn dummy() {}

// CHECK-LABEL: @foo(
// CHECK-NOT: noalias
#[no_mangle]
pub fn foo() {
    let f = (dummy as fn(),);
    (*project(&f))();
}

This way the noalias check must happen after the foo label occurs.

@jieyouxu
Copy link
Contributor

@rustbot author

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 23, 2024
@Oneirical
Copy link
Contributor Author

@rustbot review

Thanks for the suggestion! I'm just now learning how the codegen tests work, and I see how you made it more similar to the other codegen tests, and prevented the name foo from being altered by compilation with no-mangle.

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 23, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jieyouxu
Copy link
Contributor

Thanks, r=me after squashing commits into one.
@bors delegate+

@bors
Copy link
Contributor

bors commented May 23, 2024

✌️ @Oneirical, you can now approve this pull request!

If @jieyouxu told you to "r=me" after making some further change, please make that change, then do @bors r=@jieyouxu

@Oneirical
Copy link
Contributor Author

@bors r=@jieyouxu

@bors
Copy link
Contributor

bors commented May 23, 2024

📌 Commit ddb81ce has been approved by jieyouxu

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 May 23, 2024
@matthiaskrgr matthiaskrgr mentioned this pull request May 23, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 23, 2024
@bors
Auto merge of rust-lang#125436 - matthiaskrgr:rollup-uijo2ga, r=matth…
39d2f2a 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#122665 (Add some tests for public-private dependencies.)
 - rust-lang#123623 (Fix OutsideLoop's error suggestion: adding label `'block` for `if` block.)
 - rust-lang#125054 (Handle `ReVar` in `note_and_explain_region`)
 - rust-lang#125156 (Expand `for_loops_over_fallibles` lint to lint on fallibles behind references.)
 - rust-lang#125222 (Migrate `run-make/issue-46239` to `rmake`)
 - rust-lang#125316 (Tweak `Spacing` use)
 - rust-lang#125392 (Wrap Context.ext in AssertUnwindSafe)
 - rust-lang#125417 (self-contained linker: retry linking without `-fuse-ld=lld` on CCs that don't support it)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit f131ee6 into rust-lang:master May 23, 2024
6 checks passed
@rustbot rustbot added this to the 1.80.0 milestone May 23, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request May 23, 2024
@rust-timer
Unrolled build for rust-lang#125222
5f65461 
Rollup merge of rust-lang#125222 - Oneirical:fifth, r=jieyouxu

Migrate `run-make/issue-46239` to `rmake`

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).
@Oneirical Oneirical deleted the fifth branch May 23, 2024 13:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jieyouxu jieyouxu jieyouxu left review comments

Assignees

@jieyouxu jieyouxu

Labels
A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Milestone
1.80.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@Oneirical @rustbot @jieyouxu @rust-log-analyzer @bors