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

Merged
merged 1 commit into from
Jul 4, 2024
Merged

Update LLVM submodule #127190

merged 1 commit into from
Jul 4, 2024

Conversation

DianQK
Copy link
Member

@DianQK DianQK commented Jun 30, 2024

Fixes #112548 and unlock #125642.

r? @cuviper or @nikic

@rustbot
Copy link
Collaborator

rustbot commented Jun 30, 2024

⚠️ Warning ⚠️

  • These commits modify submodules.

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 30, 2024
@nikic
Copy link
Contributor

nikic commented Jul 1, 2024

@bors r+

@bors
Copy link
Contributor

bors commented Jul 1, 2024

📌 Commit da81d0d has been approved by nikic

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 Jul 1, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 2, 2024
@bors
Auto merge of rust-lang#127190 - DianQK:llvm-backport, r=nikic
847e087 
Update LLVM submodule

Fixes rust-lang#112548 and unlock rust-lang#125642.

r? `@cuviper` or `@nikic`
@bors
Copy link
Contributor

bors commented Jul 2, 2024

⌛ Testing commit da81d0d with merge 847e087...

@bors
Copy link
Contributor

bors commented Jul 2, 2024

💔 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 Jul 2, 2024
@compiler-errors
Copy link
Member

compiler-errors commented Jul 2, 2024 •
edited
Loading

@bors treeclosed=100

something seems messed up w the netbsd docker i think

https://rust-lang.zulipchat.com/#narrow/stream/242791-t-infra/topic/dist-x86_64-netbsd.20is.20borked

@compiler-errors
Copy link
Member

@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 Jul 2, 2024
@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) 
#14 0.848 
#14 0.848 gzip: stdin: not in gzip format
#14 0.848 tar: Child returned status 1
#14 0.848 tar: Error is not recoverable: exiting now
#14 ERROR: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
 > [6/8] RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh:
0.036 + mkdir netbsd

100   245  100   245    0     0    305      0 --:--:-- --:--:-- --:--:--   305
---
  11 | >>> RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh
  12 |     
  13 |     COPY scripts/sccache.sh /scripts/
--------------------
ERROR: failed to solve: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
#0 building with "cranky_liskov" instance using docker-container driver

#1 [internal] load build definition from Dockerfile
#1 transferring dockerfile: 988B done
---
#11 0.344 
#11 0.344 gzip: stdin: not in gzip format
#11 0.344 tar: Child returned status 1
#11 0.344 tar: Error is not recoverable: exiting now
#11 ERROR: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
 > [6/8] RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh:

100   245  100   245    0     0    808      0 --:--:-- --:--:-- --:--:--   808
0.344 
---
  11 | >>> RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh
  12 |     
  13 |     COPY scripts/sccache.sh /scripts/
--------------------
ERROR: failed to solve: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
#0 building with "cranky_liskov" instance using docker-container driver

#1 [internal] load build definition from Dockerfile
#1 transferring dockerfile: 988B done
---
#11 0.345 
#11 0.345 gzip: stdin: not in gzip format
#11 0.345 tar: Child returned status 1
#11 0.345 tar: Error is not recoverable: exiting now
#11 ERROR: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
 > [6/8] RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh:

100   245  100   245    0     0    811      0 --:--:-- --:--:-- --:--:--   813
0.345 
---
  11 | >>> RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh
  12 |     
  13 |     COPY scripts/sccache.sh /scripts/
--------------------
ERROR: failed to solve: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
#0 building with "cranky_liskov" instance using docker-container driver

#1 [internal] load build definition from Dockerfile
#1 transferring dockerfile: 988B done
---
#11 1.018 
#11 1.018 gzip: stdin: not in gzip format
#11 1.019 tar: Child returned status 1
#11 1.019 tar: Error is not recoverable: exiting now
#11 ERROR: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
 > [6/8] RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh:

100   245  100   245    0     0    250      0 --:--:-- --:--:-- --:--:--   250
1.018 
---
  11 | >>> RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh
  12 |     
  13 |     COPY scripts/sccache.sh /scripts/
--------------------
ERROR: failed to solve: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
#0 building with "cranky_liskov" instance using docker-container driver

#1 [internal] load build definition from Dockerfile
#1 transferring dockerfile: 988B done
---
#11 0.344 
#11 0.344 gzip: stdin: not in gzip format
#11 0.344 tar: Child returned status 1
#11 0.345 tar: Error is not recoverable: exiting now
#11 ERROR: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
 > [6/8] RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh:

100   245  100   245    0     0    809      0 --:--:-- --:--:-- --:--:--   811
0.344 
---
  11 | >>> RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh
  12 |     
  13 |     COPY scripts/sccache.sh /scripts/
--------------------
ERROR: failed to solve: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
##[error]Process completed with exit code 1.
Post job cleanup.

This was referenced Jul 2, 2024
Merged
Merged
Merged
Merged
Merged
Merged
Merged
Merged
Merged
Merged
Merged
Merged
This was referenced Jul 2, 2024
Merged
Merged
Merged
Merged
Merged
@Urgau
Copy link
Member

Urgau commented Jul 2, 2024

#127232 was merged, fixing the CI issue, let's re-open the tree

@bors treeclosed-

@matthiaskrgr matthiaskrgr mentioned this pull request Jul 3, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 3, 2024
@bors
Auto merge of rust-lang#127296 - matthiaskrgr:rollup-1t1isa7, r=matth…
b454012 
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#127092 (Change return-type-notation to use `(..)`)
 - rust-lang#127184 (More refactorings to rustc_interface)
 - rust-lang#127190 (Update LLVM submodule)
 - rust-lang#127253 (Fix incorrect suggestion for extra argument with a type error)
 - rust-lang#127280 (Disable rmake test rustdoc-io-error on riscv64gc-gnu)
 - rust-lang#127294 (Less magic number for corountine)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 77fa597 into rust-lang:master Jul 4, 2024
6 of 7 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jul 4, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jul 4, 2024
@rust-timer
Unrolled build for rust-lang#127190
72f22fa 
Rollup merge of rust-lang#127190 - DianQK:llvm-backport, r=nikic

Update LLVM submodule

Fixes rust-lang#112548 and unlock rust-lang#125642.

r? ``@cuviper`` or ``@nikic``
@DianQK DianQK deleted the llvm-backport branch July 4, 2024 01:48
@DianQK
Copy link
Member Author

DianQK commented Jul 4, 2024

I forgot to change the description to Fixes (after beta backport) #NNN. :)

The PR fixed a P-high miscompilation on aarch64-apple-darwin. It also includes a CMake change, but I think it's fine. IIUC, we haven't used zstd yet.

@rustbot label +beta-nominated

@rustbot rustbot added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 4, 2024
@DianQK
Copy link
Member Author

DianQK commented Jul 4, 2024

I forgot to change the description to Fixes (after beta backport) #NNN. :)

The PR fixed a P-high miscompilation on aarch64-apple-darwin. It also includes a CMake change, but I think it's fine. IIUC, we haven't used zstd yet.

@rustbot label +beta-nominated

@rustbot label +T-compiler

cc @apiraino

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jul 4, 2024
@apiraino
Copy link
Contributor

apiraino commented Jul 4, 2024

Beta backport accepted as per compiler team on Zulip. A backport PR will be authored by the release team at the end of the current development cycle.

@rustbot label +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jul 4, 2024
@cuviper cuviper mentioned this pull request Jul 5, 2024
Merged
@cuviper cuviper modified the milestones: 1.81.0, 1.80.0 Jul 5, 2024
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 5, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 6, 2024
@bors
Auto merge of rust-lang#127377 - cuviper:beta-next, r=cuviper
415b6eb 
[beta] backports

- Properly gate `safe` keyword in pre-expansion rust-lang#126757
- Switch back `non_local_definitions` lint to allow-by-default rust-lang#127015
- Stall computing instance for drop shim until it has no unsubstituted const params rust-lang#127068
- Update LLVM submodule rust-lang#127190

r? cuviper
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 6, 2024
@bors
Auto merge of rust-lang#127377 - cuviper:beta-next, r=cuviper
b06e1bb 
[beta] backports

- Properly gate `safe` keyword in pre-expansion rust-lang#126757
- Switch back `non_local_definitions` lint to allow-by-default rust-lang#127015
- Stall computing instance for drop shim until it has no unsubstituted const params rust-lang#127068
- Update LLVM submodule rust-lang#127190
-  Change to the NetBSD archive URL rather than the CDN rust-lang#127232

r? cuviper
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 6, 2024
@bors
Auto merge of rust-lang#127377 - cuviper:beta-next, r=cuviper
e280749 
[beta] backports

- Properly gate `safe` keyword in pre-expansion rust-lang#126757
- Switch back `non_local_definitions` lint to allow-by-default rust-lang#127015
- Stall computing instance for drop shim until it has no unsubstituted const params rust-lang#127068
- Update LLVM submodule rust-lang#127190
-  Change to the NetBSD archive URL rather than the CDN rust-lang#127232

r? cuviper
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 6, 2024
@bors
Auto merge of rust-lang#127377 - cuviper:beta-next, r=cuviper
e5da71f 
[beta] backports

- Properly gate `safe` keyword in pre-expansion rust-lang#126757
- Switch back `non_local_definitions` lint to allow-by-default rust-lang#127015
- Stall computing instance for drop shim until it has no unsubstituted const params rust-lang#127068
- Update LLVM submodule rust-lang#127190
-  Change to the NetBSD archive URL rather than the CDN rust-lang#127232

r? cuviper
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. 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.80.0
Development

Successfully merging this pull request may close these issues.

Miscompilation on aarch64-apple-darwin (likely a calling convention bug)
9 participants
@DianQK @rustbot @nikic @bors @compiler-errors @rust-log-analyzer @Urgau @apiraino @cuviper