Skip to content

Rollup of 4 pull requests#125641

Closed
jieyouxu wants to merge 15 commits intorust-lang:masterfrom
jieyouxu:rollup-37vp5jj
Closed

Rollup of 4 pull requests#125641
jieyouxu wants to merge 15 commits intorust-lang:masterfrom
jieyouxu:rollup-37vp5jj

Conversation

@jieyouxu
Copy link
Member

@jieyouxu jieyouxu commented May 28, 2024

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

onur-ozkan and others added 15 commits May 23, 2024 11:53
@onur-ozkan
create libcxx-version tool for getting currently used libcxx version
3dc4fff 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
check host's libstdc++ version when using ci llvm
c5755fa 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
register libcxx-version in triagebot
52d9f85 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
skip src/tools/libcxx-version from tidy
480670e 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@diondokter
Always use the general case char count
05fa647
@ChrisDenton
Use rmake for windows- run-make tests
b3ee911
@ChrisDenton
Remove Makefiles from allowed_run_make_makefiles
57e68b6
@ChrisDenton
Add linker option to run-make-support
e081170
@ChrisDenton
Move run-make windows_subsystem tests to ui tests
ad5dce5
@compiler-errors
EvalCtxt::tcx() -> EvalCtxt::interner()
d5d7477
@compiler-errors
Make ProofTreeBuilder actually generic over interner
56e87df
@jieyouxu
Rollup merge of rust-lang#125411 - onur-ozkan:sanity-check-libstdc++,…
5e869be 
… r=Mark-Simulacrum

check host's libstdc++ version when using ci llvm

If the host's libstdc++ version is too old using ci-llvm may result in an ABI mismatch between the local libstdc++ and libLLVM.so. This PR adds a sanity check to immediately fail at the beginning of the bootstrap before starting the actual build. I am not sure if '8' is the best threshold, but it should be a good start and we can increase it anytime if needed.

Fixes rust-lang#123037
@jieyouxu
Rollup merge of rust-lang#125598 - compiler-errors:proof-tree-builder…
1f1f9e1 
…, r=lcnr

Make `ProofTreeBuilder` actually generic over `Interner`

Self-explanatory. Also renamed `ecx.tcx()` to `ecx.interner()`.

r? lcnr
@jieyouxu
Rollup merge of rust-lang#125609 - diondokter:opt-size-char-count, r=…
44e8d91 
…thomcc

Always use the general case char count with `optimize_for_size`

The faster algo is really expensive, over a kilobyte if the full algo is present in a binary.
With this PR the general case algo is picked always instead of only for small strings.

In a test of mine this change makes the total binary go from 3116 bytes to 2032 bytes in opt-level 3 and from 1652 bytes to 1428 bytes in opt-level z. I've seen it much worse in real application, so the savings (especially on 'z') will be higher in many cases.

This is the second pr of this kind after rust-lang#125606
@jieyouxu
Rollup merge of rust-lang#125613 - ChrisDenton:windows-recipie, r=jie…
69f00bd 
…youxu

Use `rmake` for `windows-` run-make tests

Convert some Makefile tests to recipes.

I renamed "issue-85441" to "windows-ws2_32" as I think it's slightly more descriptive. EDIT: `llvm-readobj` seems to work for reading DLL imports so I've used that instead of `objdump`.

cc rust-lang#121876
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels May 28, 2024
@jieyouxu
Copy link
Member Author

jieyouxu commented May 28, 2024

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented May 28, 2024

📌 Commit 69f00bd 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 28, 2024
@bors
Copy link
Collaborator

bors commented May 28, 2024

⌛ Testing commit 69f00bd with merge b4f1a13...

bors added a commit to rust-lang-ci/rust that referenced this pull request May 28, 2024
@bors
Auto merge of rust-lang#125641 - jieyouxu:rollup-37vp5jj, r=jieyouxu
b4f1a13 
Rollup of 4 pull requests

Successful merges:

 - rust-lang#125411 (check host's libstdc++ version when using ci llvm)
 - rust-lang#125598 (Make `ProofTreeBuilder` actually generic over `Interner`)
 - rust-lang#125609 (Always use the general case char count with `optimize_for_size`)
 - rust-lang#125613 (Use `rmake` for `windows-` run-make tests)

r? `@ghost`
`@rustbot` modify labels: rollup
@rust-log-analyzer
Copy link
Collaborator

rust-log-analyzer commented May 28, 2024

The job aarch64-apple failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
    Finished `dev` profile [unoptimized] target(s) in 24.49s
##[endgroup]
[TIMING] core::build_steps::tool::LibcxxVersionTool { target: aarch64-apple-darwin } -- 0.874

Your system is using libc++, which is incompatible with the `llvm.download-ci-llvm` option.
Disable `llvm.download-ci-llvm` or switch to libstdc++.
make: *** [prepare] Error 1
Command failed. Attempt 2/5:
##[group]Building bootstrap
    Finished `dev` profile [unoptimized] target(s) in 0.21s
    Finished `dev` profile [unoptimized] target(s) in 0.21s
##[endgroup]
[TIMING] core::build_steps::tool::LibcxxVersionTool { target: aarch64-apple-darwin } -- 0.440

Your system is using libc++, which is incompatible with the `llvm.download-ci-llvm` option.
Disable `llvm.download-ci-llvm` or switch to libstdc++.
make: *** [prepare] Error 1
Command failed. Attempt 3/5:
##[group]Building bootstrap
    Finished `dev` profile [unoptimized] target(s) in 0.14s
    Finished `dev` profile [unoptimized] target(s) in 0.14s
##[endgroup]
[TIMING] core::build_steps::tool::LibcxxVersionTool { target: aarch64-apple-darwin } -- 0.260

Your system is using libc++, which is incompatible with the `llvm.download-ci-llvm` option.
Disable `llvm.download-ci-llvm` or switch to libstdc++.
make: *** [prepare] Error 1
Command failed. Attempt 4/5:
##[group]Building bootstrap
    Finished `dev` profile [unoptimized] target(s) in 0.04s
    Finished `dev` profile [unoptimized] target(s) in 0.04s
##[endgroup]
[TIMING] core::build_steps::tool::LibcxxVersionTool { target: aarch64-apple-darwin } -- 0.372

Your system is using libc++, which is incompatible with the `llvm.download-ci-llvm` option.
Disable `llvm.download-ci-llvm` or switch to libstdc++.
make: *** [prepare] Error 1
Command failed. Attempt 5/5:
##[group]Building bootstrap
    Finished `dev` profile [unoptimized] target(s) in 0.09s
    Finished `dev` profile [unoptimized] target(s) in 0.09s
##[endgroup]
[TIMING] core::build_steps::tool::LibcxxVersionTool { target: aarch64-apple-darwin } -- 0.244

Your system is using libc++, which is incompatible with the `llvm.download-ci-llvm` option.
Disable `llvm.download-ci-llvm` or switch to libstdc++.
make: *** [prepare] Error 1
The command has failed after 5 attempts.
  local time: Tue May 28 02:40:59 UTC 2024
  network time: Tue, 28 May 2024 02:40:59 GMT

@bors
Copy link
Collaborator

bors commented May 28, 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 May 28, 2024
@jieyouxu
Copy link
Member Author

jieyouxu commented May 28, 2024

@bors r-

@bors bors 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 28, 2024
@jieyouxu jieyouxu closed this May 28, 2024
@jieyouxu jieyouxu deleted the rollup-37vp5jj branch May 28, 2024 02:50
@jieyouxu jieyouxu mentioned this pull request May 28, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-testsuite Area: The testsuite used to check the correctness of rustc rollup A PR which is a rollup S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@jieyouxu @bors @rust-log-analyzer @rustbot @onur-ozkan @diondokter @ChrisDenton @compiler-errors