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.

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

Check AArch64 branch-protection earlier in the pipeline. #105421

Merged
merged 3 commits into from
Dec 17, 2022

Conversation

jacobbramley
Copy link
Contributor

As suggested in #93516.

r? @nagisa

The branch-protection codegen option has always been treated as an error
for non-AArch64 targets.
@rustbot rustbot added A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic 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 Dec 7, 2022
@rustbot
Copy link
Collaborator

rustbot commented Dec 7, 2022

rustc_error_messages was changed

cc @davidtwco, @compiler-errors, @JohnTitor, @estebank, @TaKO8Ki

Copy link
Member

@nagisa nagisa left a comment

Choose a reason for hiding this comment

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

Really nice. One nit inline, but otherwise r=me.

Comment on lines 278 to 279
if sess.target.arch == "aarch64" {
if let Some(BranchProtection { bti, pac_ret }) = sess.opts.unstable_opts.branch_protection {
Copy link
Member

Choose a reason for hiding this comment

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

Rather than making this a no-op, we should probably bug! this, so that any issues with checking in rustc_session don’t get silently ignored.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good point! Done in 73d374f.

@nagisa nagisa 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 Dec 11, 2022
@nagisa
Copy link
Member

nagisa commented Dec 14, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Dec 14, 2022

📌 Commit 73d374f has been approved by nagisa

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 14, 2022
@bors
Copy link
Contributor

bors commented Dec 16, 2022

⌛ Testing commit 73d374f with merge e2bf6962bd0d2bd9a3710dc9fb074eb049d2d957...

@bors
Copy link
Contributor

bors commented Dec 16, 2022

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 16, 2022
@jacobbramley
Copy link
Contributor Author

💔 Test failed - checks-actions

The test fails on an off-by-one error on some documentation layout. It doesn't appear at all relevant to this PR. Note, however, that I can reproduce the error reliably on my branch, but only when run as part of the full sequence. For example, I can't reproduce it by isolating the failing test as follows:

x test --stage 2 src/test/rustdoc-gui --test-args '--no-sandbox --jobs 1 --file scrape-examples-button-focus.goml'

Note that dropping --jobs 1 gets me different results, with intermittent failures on varying tests. However, the tests don't run that way in CI so that usage might not be expected to work anyway.

Attempting to work out what the failure actually was:

[Expected 248 for property scrollTop, found 249]

Manually rendering the test file in Firefox shows a scrollTop of 249 (before and after the navigation operation), so I suspect that the initialScrollTop seen in the test is the anomaly (or perhaps this is just browser variation).

At this point, I am somewhat at a loss. @willcrichton, it seems that you did some work on this test recently. Have you any ideas?

@rust-log-analyzer
Copy link
Collaborator

The job x86_64-gnu-tools failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
.......... (90/93)
...        (93/93)


/checkout/src/test/rustdoc-gui/scrape-examples-button-focus.goml scrape-examples-button-focus... FAILED
[ERROR] (line 12) Error: Evaluation failed: The following errors happened (for selector `.scraped-example-list > .scraped-example pre`): [Expected `248` for property `scrollTop`, found `249`]: for command `assert-property: (".scraped-example-list > .scraped-example pre", {
 "scrollTop": |initialScrollTop|

Build completed unsuccessfully in 0:02:28

@tmiasko
Copy link
Contributor

tmiasko commented Dec 16, 2022

@bors retry unrelated rustdoc-gui failure

@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 Dec 16, 2022
@willcrichton
Copy link
Contributor

I will check why this test is flaky. cc @GuillaumeGomez have you seen any issues like this w/ browser-UI-test before?

@bors
Copy link
Contributor

bors commented Dec 17, 2022

⌛ Testing commit 73d374f with merge 6ea11f0a9cc8b2b2792e1d101bddad3b4978b7b2...

@bors
Copy link
Contributor

bors commented Dec 17, 2022

💔 Test failed - checks-actions

@bors bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 17, 2022
@bors bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 17, 2022
@willcrichton
Copy link
Contributor

Oh no, a different GUI test failed... @GuillaumeGomez this looks like a broader flakiness problem.

@GuillaumeGomez
Copy link
Member

For the GUI failure, linked to #93784.

@GuillaumeGomez
Copy link
Member

Since it's not related to this PR, let's retry.

@bors retry

@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 Dec 17, 2022
@bors
Copy link
Contributor

bors commented Dec 17, 2022

⌛ Testing commit 73d374f with merge aef17b7...

@bors
Copy link
Contributor

bors commented Dec 17, 2022

☀️ Test successful - checks-actions
Approved by: nagisa
Pushing aef17b7 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 17, 2022
@bors bors merged commit aef17b7 into rust-lang:master Dec 17, 2022
@rustbot rustbot added this to the 1.68.0 milestone Dec 17, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (aef17b7): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.4% [-0.4%, -0.4%] 1
Improvements ✅
(secondary)
-0.4% [-0.4%, -0.4%] 1
All ❌✅ (primary) -0.4% [-0.4%, -0.4%] 1

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
3.1% [3.1%, 3.1%] 1
Regressions ❌
(secondary)
3.5% [3.5%, 3.5%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 3.1% [3.1%, 3.1%] 1

Cycles

This benchmark run did not return any relevant results for this metric.

@rust-log-analyzer
Copy link
Collaborator

The job x86_64-gnu-tools failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
.......... (90/93)
...        (93/93)


/checkout/src/test/rustdoc-gui/basic-code.goml basic-code... FAILED
[ERROR] (line 3) Error: Execution context was destroyed, most likely because of a navigation.: for command `assert-count: (".src-line-numbers", 1)`
Build completed unsuccessfully in 0:02:31

Aaron1011 pushed a commit to Aaron1011/rust that referenced this pull request Jan 6, 2023
…=nagisa

Check AArch64 branch-protection earlier in the pipeline.

As suggested in rust-lang#93516.

r? `@nagisa`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic merged-by-bors This PR was explicitly merged by bors. 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.

9 participants