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

Update LLVM submodule #93081

Merged
merged 1 commit into from
Jan 27, 2022
Merged

Update LLVM submodule #93081

merged 1 commit into from
Jan 27, 2022

Conversation

nikic
Copy link
Contributor

@nikic nikic commented Jan 19, 2022

Update LLVM to fix #92786.

@rust-highfive
Copy link
Collaborator

r? @cuviper

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 19, 2022
@nikic
Copy link
Contributor Author

nikic commented Jan 19, 2022

It looks like this also restores a CodeView change that was accidentally dropped by an incorrect submodule change in #87648.

@cuviper
Copy link
Member

cuviper commented Jan 19, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Jan 19, 2022

📌 Commit 1f517440efd09fd9089a190a6d5ccac1955b8379 has been approved by cuviper

@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 Jan 19, 2022
@Mark-Simulacrum Mark-Simulacrum added beta-nominated Nominated for backporting to the compiler in the beta channel. stable-nominated Nominated for backporting to the compiler in the stable channel. labels Jan 21, 2022
@Mark-Simulacrum
Copy link
Member

Nominating for stable and beta backport, as this fixes a miscompilation (#92786) for tier-1 (aarch64-unknown-linux-gnu), which is a regression since 1.57.0.

@matthiaskrgr
Copy link
Member

@bors rollup=never (llvm changes)

@bors
Copy link
Contributor

bors commented Jan 25, 2022

⌛ Testing commit 1f517440efd09fd9089a190a6d5ccac1955b8379 with merge ad9bb43909417f7ddc673e09cb0afc26d37f8af5...

@bors
Copy link
Contributor

bors commented Jan 25, 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 Jan 25, 2022
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@nikic
Copy link
Contributor Author

nikic commented Jan 25, 2022

Hrm, looks like this patch must depend on something else that is not on release/13.x.

@nikic
Copy link
Contributor Author

nikic commented Jan 26, 2022

Next try with a different patch from rust-lang/llvm-project#128.

@bors r=cuviper

@bors
Copy link
Contributor

bors commented Jan 26, 2022

📌 Commit 48a625d has been approved by cuviper

@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 Jan 26, 2022
@bors
Copy link
Contributor

bors commented Jan 26, 2022

⌛ Testing commit 48a625d with merge 32a371cc9c3b82342a1fa434f43a37034e2c7eae...

@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) 
.......... (50/58)
........   (58/58)


/checkout/src/test/rustdoc-gui/impl-default-expansion.goml An exception occured: Failed to launch the browser process!
Inconsistency detected by ld.so: dl-tls.c: 493: _dl_allocate_tls_init: Assertion `listp->slotinfo[cnt].gen <= GL(dl_tls_generation)' failed!


TROUBLESHOOTING: https://github.com/puppeteer/puppeteer/blob/master/docs/troubleshooting.md
== STACKTRACE ==
Error
Error
    at innerRunTestCode (/node-v14.4.0-linux-x64/lib/node_modules/browser-ui-test/src/index.js:457:16)
    at runMicrotasks (<anonymous>)
    at processTicksAndRejections (internal/process/task_queues.js:97:5)


command did not execute successfully: "/node-v14.4.0-linux-x64/bin/node" "/checkout/src/tools/rustdoc-gui/tester.js" "--jobs" "16" "--doc-folder" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc-gui/doc" "--tests-folder" "/checkout/src/test/rustdoc-gui"


Build completed unsuccessfully in 0:00:18

@bors
Copy link
Contributor

bors commented Jan 26, 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 Jan 26, 2022
@nikic
Copy link
Contributor Author

nikic commented Jan 26, 2022

2022-01-26T19:44:04.7859013Z /checkout/src/test/rustdoc-gui/impl-default-expansion.goml An exception occured: Failed to launch the browser process!
2022-01-26T19:44:04.7859890Z Inconsistency detected by ld.so: dl-tls.c: 493: _dl_allocate_tls_init: Assertion `listp->slotinfo[cnt].gen <= GL(dl_tls_generation)' failed!

Given that this is an AArch64 change and an X86 job failed, I'm going to assume that this is spurious...

@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 Jan 26, 2022
@bors
Copy link
Contributor

bors commented Jan 27, 2022

⌛ Testing commit 48a625d with merge 563250a...

@bors
Copy link
Contributor

bors commented Jan 27, 2022

☀️ Test successful - checks-actions
Approved by: cuviper
Pushing 563250a to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 27, 2022
@bors bors merged commit 563250a into rust-lang:master Jan 27, 2022
@rustbot rustbot added this to the 1.60.0 milestone Jan 27, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (563250a): comparison url.

Summary: This benchmark run did not return any relevant results.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

@apiraino apiraino added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jan 27, 2022
@cuviper cuviper mentioned this pull request Jan 28, 2022
Closed
@apiraino
Copy link
Contributor

apiraino commented Feb 1, 2022

Backport accepted both for beta and stable as per compiler team on Zulip

@rustbot label +beta-accepted +stable-accepted

@rustbot rustbot added beta-accepted Accepted for backporting to the compiler in the beta channel. stable-accepted Accepted for backporting to the compiler in the stable channel. labels Feb 1, 2022
@ehuss ehuss mentioned this pull request Feb 3, 2022
Closed
ehuss pushed a commit to ehuss/rust that referenced this pull request Feb 10, 2022
@bors @ehuss
Auto merge of rust-lang#93081 - nikic:aarch64-fix, r=cuviper
560b4f3 
Update LLVM submodule

Update LLVM to fix rust-lang#92786.
@ehuss ehuss mentioned this pull request Feb 10, 2022
Merged
@ehuss ehuss modified the milestones: 1.60.0, 1.59.0 Feb 10, 2022
@ehuss ehuss removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 10, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 11, 2022
@bors
Auto merge of rust-lang#93846 - ehuss:beta-backports, r=ehuss
f58f0df 
[beta] Backports

Backports of:

* rust-lang#92611 — Add links to the reference and rust by example for asm! docs and lints
* rust-lang#92983 — Update Linux runners to Ubuntu 20.04
* rust-lang#93081 — Update LLVM submodule
* rust-lang#93394 — Don't allow {} to refer to implicit captures in format_args.
* Cargo:
    * rust-lang/cargo#10377 — Remove strip = "off" (and undocumented strip = "n"/strip = "no")
@arlosi arlosi mentioned this pull request Mar 2, 2022
Closed
@Mark-Simulacrum Mark-Simulacrum removed stable-nominated Nominated for backporting to the compiler in the stable channel. stable-accepted Accepted for backporting to the compiler in the stable channel. labels Jul 15, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@cuviper cuviper

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. 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
Milestone
1.59.0
Development

Successfully merging this pull request may close these issues.

Miscompilation in unoptimized builds on aarch64 with 1.57.0