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 #90954

Merged
merged 1 commit into from
Nov 17, 2021
Merged

Update llvm submodule #90954

merged 1 commit into from
Nov 17, 2021

Conversation

Amanieu
Copy link
Member

@Amanieu Amanieu commented Nov 16, 2021

  • [DIArgList] Re-unique after changing operands to fix non-determinism
  • [AArch64][GlobalISel] Fix an crash in RBS due to a new regclass being added.

@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 Nov 16, 2021
@nikic
Copy link
Contributor

nikic commented Nov 16, 2021

@bors r+

@bors
Copy link
Contributor

bors commented Nov 16, 2021

📌 Commit 530cd5b has been approved by nikic

@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 Nov 16, 2021
@matthiaskrgr
Copy link
Member

@bors rollup=never

@bors
Copy link
Contributor

bors commented Nov 16, 2021

⌛ Testing commit 530cd5b with merge 3d7a084065d0e2008d211cf3162abb05e3a3caa4...

@bors
Copy link
Contributor

bors commented Nov 16, 2021

💔 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 Nov 16, 2021
@matthiaskrgr
Copy link
Member

@bors retry #90812

@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 Nov 16, 2021
@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot) 
   Compiling proc-macro-error v1.0.4
error: could not compile `build_helper`

Caused by:
  process didn't exit successfully: `/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/rustc --crate-name build_helper --edition=2021 src/build_helper/lib.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts --crate-type lib --emit=dep-info,metadata,link -C embed-bitcode=no -C debuginfo=0 -C metadata=dded4ef7a66d7fd2 -C extra-filename=-dded4ef7a66d7fd2 --out-dir /checkout/obj/build/bootstrap/debug/deps -C incremental=/checkout/obj/build/bootstrap/debug/incremental -L dependency=/checkout/obj/build/bootstrap/debug/deps -Wrust_2018_idioms -Wunused_lifetimes -Wsemicolon_in_expressions_from_macros -Dwarnings` (signal: 11, SIGSEGV: invalid memory reference)
error: build failed
failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
Build completed unsuccessfully in 0:01:03
make: *** [prepare] Error 1
---
   Compiling toml v0.5.7
error: could not compile `bootstrap`

Caused by:
  process didn't exit successfully: `/checkout/obj/build/tmp/distcheck/build/x86_64-unknown-linux-gnu/stage0/bin/rustc --crate-name sccache_plus_cl --edition=2021 src/bootstrap/bin/sccache-plus-cl.rs --error-format=json --json=diagnostic-rendered-ansi --crate-type bin --emit=dep-info,link -C embed-bitcode=no -C debuginfo=1 -C metadata=b0fd04192a514335 -C extra-filename=-b0fd04192a514335 --out-dir /checkout/obj/build/tmp/distcheck/build/bootstrap/debug/deps -C incremental=/checkout/obj/build/tmp/distcheck/build/bootstrap/debug/incremental -L dependency=/checkout/obj/build/tmp/distcheck/build/bootstrap/debug/deps --extern bootstrap=/checkout/obj/build/tmp/distcheck/build/bootstrap/debug/deps/libbootstrap-b49b759706b6c45d.rlib --extern build_helper=/checkout/obj/build/tmp/distcheck/build/bootstrap/debug/deps/libbuild_helper-dded4ef7a66d7fd2.rlib --extern cc=/checkout/obj/build/tmp/distcheck/build/bootstrap/debug/deps/libcc-9022b5d7a536baba.rlib --extern cmake=/checkout/obj/build/tmp/distcheck/build/bootstrap/debug/deps/libcmake-a1cd7916c7902e9e.rlib --extern filetime=/checkout/obj/build/tmp/distcheck/build/bootstrap/debug/deps/libfiletime-21f7d6d27914ba34.rlib --extern getopts=/checkout/obj/build/tmp/distcheck/build/bootstrap/debug/deps/libgetopts-3bc5fa5912184ba0.rlib --extern ignore=/checkout/obj/build/tmp/distcheck/build/bootstrap/debug/deps/libignore-6eab7523daa887b2.rlib --extern lazy_static=/checkout/obj/build/tmp/distcheck/build/bootstrap/debug/deps/liblazy_static-1f5d3923e02f6398.rlib --extern libc=/checkout/obj/build/tmp/distcheck/build/bootstrap/debug/deps/liblibc-214e4f81fa8cd553.rlib --extern merge=/checkout/obj/build/tmp/distcheck/build/bootstrap/debug/deps/libmerge-ba43cbd72628adcc.rlib --extern num_cpus=/checkout/obj/build/tmp/distcheck/build/bootstrap/debug/deps/libnum_cpus-18e3b0eb22fae47b.rlib --extern once_cell=/checkout/obj/build/tmp/distcheck/build/bootstrap/debug/deps/libonce_cell-5bf50caf48c031d7.rlib --extern opener=/checkout/obj/build/tmp/distcheck/build/bootstrap/debug/deps/libopener-204d18544f7127ea.rlib --extern serde=/checkout/obj/build/tmp/distcheck/build/bootstrap/debug/deps/libserde-e7ed636813468773.rlib --extern serde_json=/checkout/obj/build/tmp/distcheck/build/bootstrap/debug/deps/libserde_json-b69a92aa1055d696.rlib --extern time=/checkout/obj/build/tmp/distcheck/build/bootstrap/debug/deps/libtime-1b8611857d71d3f6.rlib --extern toml=/checkout/obj/build/tmp/distcheck/build/bootstrap/debug/deps/libtoml-477f7006fd660090.rlib -Wrust_2018_idioms -Wunused_lifetimes -Wsemicolon_in_expressions_from_macros -Dwarnings` (signal: 11, SIGSEGV: invalid memory reference)
error: build failed
failed to run: /checkout/obj/build/tmp/distcheck/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/obj/build/tmp/distcheck/src/bootstrap/Cargo.toml --locked --frozen
Build completed unsuccessfully in 0:00:49
Build completed unsuccessfully in 0:00:49
make: *** [check] Error 1
Makefile:42: recipe for target 'check' failed

command did not execute successfully: "make" "check"
expected success, got: exit status: 2

@bors
Copy link
Contributor

bors commented Nov 16, 2021

⌛ Testing commit 530cd5b with merge 04f7e7be52e9d3ee87cb0796d905bc58e2e36574...

@bors
Copy link
Contributor

bors commented Nov 17, 2021

💥 Test timed out

@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 Nov 17, 2021
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@Amanieu
Copy link
Member Author

Amanieu commented Nov 17, 2021

@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 Nov 17, 2021
@est31 est31 mentioned this pull request Nov 17, 2021
Closed
@est31
Copy link
Member

est31 commented Nov 17, 2021

This should be beta backported, right?

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 17, 2021
@bors
Copy link
Contributor

bors commented Nov 17, 2021

⌛ Testing commit 530cd5b with merge faea820...

@bors
Copy link
Contributor

bors commented Nov 17, 2021

☀️ Test successful - checks-actions
Approved by: nikic
Pushing faea820 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 17, 2021
@bors bors merged commit faea820 into rust-lang:master Nov 17, 2021
@rustbot rustbot added this to the 1.58.0 milestone Nov 17, 2021
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (faea820): comparison url.

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

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

@rustbot label: -perf-regression

@glandium
Copy link
Contributor

This should be beta backported, right?

It probably should, along #90301

@cuviper cuviper added beta-nominated Nominated for backporting to the compiler in the beta channel. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Nov 18, 2021
@cuviper
Copy link
Member

cuviper commented Nov 18, 2021

I've set the backport nomination, but please consider adding details for the compiler team's consideration.

@est31
Copy link
Member

est31 commented Nov 18, 2021

Backporting details: Due to the upgrade to LLVM 13.0, which is part of the 1.56.0 release, there has been a regression in which rustc create nondeterministic output: #90301 . The two commits that this PR backports fix this regression. Even though this might not warrant a point release 1.56.2, it does make sense to keep 1.57.0 from getting it.

@spastorino
Copy link
Member

Wouldn't also make sense to add stable-nominated?. My understanding is that if it's approved for stable backport, the release team will just consider a point release but won't necessarily do it. Also a point release may happen for other reasons and if this is backported will just be included. cc @Mark-Simulacrum

@est31
Copy link
Member

est31 commented Nov 18, 2021

@spastorino yeah it would, especially considering that 1.56.0 is likely going to be the MSRV for many projects like 1.31.0 was, due to the edition.

@Amanieu
Copy link
Member Author

Amanieu commented Nov 18, 2021

Just to be clear, only the first commit is related to non-determinism. The second one fixes a crash with inline assembly, so strictly speaking it doesn't need to be backported but it doesn't hurt either.

@spastorino spastorino added the stable-nominated Nominated for backporting to the compiler in the stable channel. label Nov 18, 2021
@apiraino
Copy link
Contributor

Beta backport approved as per compiler team on Zulip

Also stable backport approved as per @spastorino suggestion.
Should this PR be considered for a point release? cc: @rust-lang/release

@rustbot label +beta-accepted
@rustbot label +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. and removed beta-accepted Accepted for backporting to the compiler in the beta channel. labels Nov 18, 2021
@apiraino apiraino added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Nov 18, 2021
@est31
Copy link
Member

est31 commented Nov 18, 2021 •
edited
Loading

Good point about the other fix existing too. It's important to point out that this PR does not contain the only determinism fix for llvm, the commit "[RegAllocFast] Fix nondeterminism in debuginfo generation" is also important. I've seen that beta does not include that commit either, but it is included as parent of the commits that this pr updated llvm to. So care should be taken that the backports of this PR don't just apply the two commits this PR added, but also the prior ones. Just updating the submodule to the same commit that this PR updated should do it. This also adds a drive by fix "[WebAssembly] Fix fixBrTableIndex removing instruction without checking uses", which is okay I think.

@cuviper cuviper mentioned this pull request Nov 18, 2021
Merged
@cuviper cuviper modified the milestones: 1.58.0, 1.57.0 Nov 18, 2021
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 18, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 19, 2021
@bors
Auto merge of rust-lang#90938 - cuviper:beta-next, r=Mark-Simulacrum
7611e64 
[beta] backports

-  Fix assertion failures in OwnedHandle with windows_subsystem. rust-lang#88798
-  Ensure that pushing empty path works as before on verbatim paths rust-lang#89665
-  Feature gate + make must_not_suspend allow-by-default rust-lang#89826
-  Only use clone3 when needed for pidfd rust-lang#89930
-  Fix documentation header sizes rust-lang#90186
-  Fixes incorrect handling of ADT's drop requirements rust-lang#90218
-  Fix ICE when forgetting to Box a parameter to a Self::func call rust-lang#90221
-  Prevent duplicate caller bounds candidates by exposing default substs in Unevaluated rust-lang#90266
-  Update odht crate to 0.3.1 (big-endian bugfix) rust-lang#90403
-  rustdoc: Go back to loading all external crates unconditionally rust-lang#90489
-  Split doc_cfg and doc_auto_cfg features rust-lang#90502
-  Apply adjustments for field expression even if inaccessible rust-lang#90508
-  Warn for variables that are no longer captured rust-lang#90597
-  Properly register text_direction_codepoint_in_comment lint. rust-lang#90626
-  CI: Use ubuntu image to download openssl, curl sources, cacert.pem for x86 dist builds rust-lang#90457
-  Android is not GNU rust-lang#90834
-  Update llvm submodule rust-lang#90954

Additionally, this bumps the stage 0 compiler from beta to stable 1.56.1.

r? `@Mark-Simulacrum`
@Urgau Urgau mentioned this pull request Nov 24, 2021
Closed
@pietroalbini pietroalbini 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 Jan 17, 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.57.0
Development

Successfully merging this pull request may close these issues.