Rollup of 8 pull requests #134431

jieyouxu · 2024-12-17T16:27:03Z

Successful merges:

Pass FnAbi to find_mir_or_eval_fn #133103 (Pass FnAbi to find_mir_or_eval_fn)
Add a range argument to vec.extract_if #133265 (Add a range argument to vec.extract_if)
Promote powerpc64le-unknown-linux-musl to tier 2 with host tools #133801 (Promote powerpc64le-unknown-linux-musl to tier 2 with host tools)
coverage: Dismantle map_data.rs by moving its responsibilities elsewhere #134323 (coverage: Dismantle map_data.rs by moving its responsibilities elsewhere)
An octuple of polonius fact generation cleanups #134378 (An octuple of polonius fact generation cleanups)
Regression test for RPIT inheriting lifetime from projection #134408 (Regression test for RPIT inheriting lifetime from projection)
bootstrap: use specific-purpose ui test path for test_valid self-test #134423 (bootstrap: use specific-purpose ui test path for test_valid self-test)
Fix typo in uint_macros.rs #134426 (Fix typo in uint_macros.rs)

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

MCP: rust-lang/compiler-team#803 Signed-off-by: Jens Reidel <[email protected]>

Signed-off-by: Jens Reidel <[email protected]>

…usl.md Co-authored-by: famfo <[email protected]>

Signed-off-by: Jens Reidel <[email protected]>

- remove dependency on `TypeChecker` - move to legacy fact generation module

- remove dependency on `TypeChecker` - move to legacy fact generation module - remove polonius module from liveness

- remove dependency on `TypeChecker` - move to legacy fact generation module - group facts emitted during typeck together

also remove a useless trace

- integrate it within existing fact generation instead of being called in typeck - simplify access fact extraction - also remove single use fact emit functions in root fact generation

- integrate into `emit_facts` and remove from typeck

- use a consistent name for `TypeChecker`, which is usually referred to as `typeck` - remove an incorrect doc comment - remove a single-use local

- fix names - fix ordering of arguments

since drain-on-drop behavior was removed those bounds no longer serve a purpose

The checks in `is_eligible_for_coverage` include `is_fn_like`, but will also exclude various function-like things that cannot possibly have coverage instrumentation.

This patch dismantles what was left of `FunctionCoverage` in `map_data.rs`, replaces `function_coverage_map` with a set, and overhauls how we prepare covfun records for unused functions.

I wanted to move some ui tests around, which broke `test_valid` since it was referencing a non-specific-purpose ui test.

Pass FnAbi to find_mir_or_eval_fn rust-lang/miri#4013 needs information from ``FnAbi``, hence it is passed to ``find_mir_or_eval_fn``. r? ``@RalfJung``

Add a range argument to vec.extract_if tracking issue: rust-lang#43244 This adds the range argument requested in rust-lang#43244 (comment)

…x-musl-tier-2, r=jieyouxu,Urgau,Kobzol Promote powerpc64le-unknown-linux-musl to tier 2 with host tools MCP: rust-lang/compiler-team#803 I'm using crosstool-ng for building a toolchain because GCC 9 from `musl-toolchain.sh` has float ABI issues (?) and can't compile LLVM, and writing a crosstool-ng config for a target feels less hacky than yet another target specific shell script. I also defined a kernel version, since there wasn't one specified before. If a lower version is desired, just let me know. I also tried to match the rust configure args with the loongarch64 musl tier 2 target. The resulting compiler works fine, built with `DEPLOY=1 ./src/ci/docker/run.sh dist-powerpc64le-linux` and tested on Alpine Linux in a VM and on a bare metal POWER8 machine: ``` qemu-ppc64le:/tmp/rust-nightly-powerpc64le-unknown-linux-musl$ ash install.sh install: creating uninstall script at /usr/local/lib/rustlib/uninstall.sh install: installing component 'rustc' install: installing component 'rust-std-powerpc64le-unknown-linux-musl' install: installing component 'cargo' install: installing component 'rustfmt-preview' install: installing component 'rls-preview' install: installing component 'rust-analyzer-preview' install: installing component 'llvm-tools-preview' install: installing component 'clippy-preview' install: installing component 'miri-preview' install: installing component 'rust-analysis-powerpc64le-unknown-linux-musl' install: installing component 'llvm-bitcode-linker-preview' install: WARNING: failed to run ldconfig. this may happen when not installing as root. run with --verbose to see the error rust installed. qemu-ppc64le:~$ echo 'fn main() { println!("hello world"); }' > test.rs qemu-ppc64le:~$ rustc test.rs qemu-ppc64le:~$ ./test hello world qemu-ppc64le:~$ file test test: ELF 64-bit LSB executable, 64-bit PowerPC or cisco 7500, OpenPOWER ELF V2 ABI, version 1 (SYSV), statically linked, BuildID[sha1]=596ee6abf9add487ebc54fb71c2076fb6faea013, with debug_info, not stripped ``` try-job: dist-powerpc64le-linux

…youxu coverage: Dismantle `map_data.rs` by moving its responsibilities elsewhere This is a series of incremental changes that combine to let us get rid of `coverageinfo/map_data.rs`, by moving all of its responsibilities into more appropriate places. Some of the notable consequences are: - We once again build the per-CGU file table on the fly while preparing individual covfun records, instead of building the whole table up-front. The up-front approach was introduced by rust-lang#117042 to work around various other problems in generating the covmap/covfun records, but subsequent cleanups have made that approach no longer necessary. - Expression conversion and mapping-region conversion are now performed directly in `mapgen::covfun`, which should make future changes easier. - We no longer insert unused function instances into the same map that is also used to track used function instances. This helps to decouple the handling of used vs unused functions. --- There should be no meaningful change to compiler output. The file table is no longer sorted, because reordering it would invalidate the file indices stored in individual covfun records, but the table order should still be deterministic (albeit arbitrary). There are some subsequent cleanups that I intend to investigate, but this is enough change for one PR.

…kh726 An octuple of polonius fact generation cleanups This PR is extracted from rust-lang#134268 for easier review and contains its first 8 commits. They have already been reviewed by ```@jackh726``` over there. r? ```@jackh726```

…=compiler-errors Regression test for RPIT inheriting lifetime from projection Regression test to close rust-lang#51525

…nur-ozkan bootstrap: use specific-purpose ui test path for `test_valid` self-test I wanted to move some ui tests around in rust-lang#134418, which broke `test_valid` since it was referencing two non-specific-purpose ui tests. This PR instead adds two dummy tests under `tests/ui/bootstrap/self-test/`, for that purpose specifically. r? bootstrap

Fix typo in uint_macros.rs

jieyouxu · 2024-12-17T16:27:10Z

@bors r+ rollup=never p=5

bors · 2024-12-17T16:27:14Z

📌 Commit 65bdba6 has been approved by jieyouxu

It is now in the queue for this repository.

bors · 2024-12-17T21:33:06Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout rollup-yu90upf (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self rollup-yu90upf --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging src/tools/miri/src/machine.rs
CONFLICT (content): Merge conflict in src/tools/miri/src/machine.rs
Auto-merging compiler/rustc_metadata/src/native_libs.rs
Removing compiler/rustc_codegen_llvm/src/coverageinfo/map_data.rs
Removing compiler/rustc_borrowck/src/type_check/liveness/polonius.rs
Automatic merge failed; fix conflicts and then commit the result.

bors · 2024-12-17T22:28:49Z

☔ The latest upstream changes (presumably #134381) made this pull request unmergeable. Please resolve the merge conflicts.

Gelbpunkt and others added 30 commits December 6, 2024 04:35

Promote powerpc64le-unknown-linux-musl to tier 2 with host tools

68ce659

MCP: rust-lang/compiler-team#803 Signed-off-by: Jens Reidel <[email protected]>

Fix markdown link

3e3ee4c

Signed-off-by: Jens Reidel <[email protected]>

Update src/doc/rustc/src/platform-support/powerpc64le-unknown-linux-m…

8bb0fd5

…usl.md Co-authored-by: famfo <[email protected]>

Move dist-powerpc64le-linux to job-linux-4c-largedisk

286de9f

Signed-off-by: Jens Reidel <[email protected]>

clean up emit_access_facts

2fd4438

- remove dependency on `TypeChecker` - move to legacy fact generation module

clean up emit_drop_facts

9d8f58a

- remove dependency on `TypeChecker` - move to legacy fact generation module - remove polonius module from liveness

clean up translate_outlives_facts

afbe101

- remove dependency on `TypeChecker` - move to legacy fact generation module - group facts emitted during typeck together

use let else more consistently in fact generation

5486857

also remove a useless trace

simplify emit_access_facts and fact generation

1740a5f

- integrate it within existing fact generation instead of being called in typeck - simplify access fact extraction - also remove single use fact emit functions in root fact generation

simplify emit_outlives_facts

2024c5d

- integrate into `emit_facts` and remove from typeck

refactor type_check module slightly

7ad1f5b

- use a consistent name for `TypeChecker`, which is usually referred to as `typeck` - remove an incorrect doc comment - remove a single-use local

improve consistency within fact gen

8562497

- fix names - fix ordering of arguments

Add a range argument to vec.extract_if

ab6ad1a

remove bounds from vec and linkedlist ExtractIf

03f1b73

since drain-on-drop behavior was removed those bounds no longer serve a purpose

update uses of extract_if in the compiler

fe52150

remove obsolete comment and pub(super) visibility

44790c4

coverage: Use is_eligible_for_coverage to filter unused functions

fe412af

The checks in `is_eligible_for_coverage` include `is_fn_like`, but will also exclude various function-like things that cannot possibly have coverage instrumentation.

coverage: Build the global file table on the fly

154fae1

coverage: Pull expression conversion out of map_data.rs

252276a

coverage: Pull region conversion out of map_data.rs

527f812

coverage: Pull function source hash out of map_data.rs

d34c365

coverage: Track used functions in a set instead of a map

541d4e8

This patch dismantles what was left of `FunctionCoverage` in `map_data.rs`, replaces `function_coverage_map` with a set, and overhauls how we prepare covfun records for unused functions.

Regression test for RPIT inheriting lifetime

a7f61ca

Pass FnAbi to find_mir_or_eval_fn

9c7593e

bootstrap: use specific-purpose ui test path

13e8313

I wanted to move some ui tests around, which broke `test_valid` since it was referencing a non-specific-purpose ui test.

Fix typo in uint_macros.rs

c482b31

Rollup merge of rust-lang#133103 - tiif:fnabi, r=RalfJung

d7f80f6

Pass FnAbi to find_mir_or_eval_fn rust-lang/miri#4013 needs information from ``FnAbi``, hence it is passed to ``find_mir_or_eval_fn``. r? ``@RalfJung``

Rollup merge of rust-lang#133265 - the8472:extract-if-ranges, r=cuviper

18989bc

Add a range argument to vec.extract_if tracking issue: rust-lang#43244 This adds the range argument requested in rust-lang#43244 (comment)

jieyouxu added 4 commits December 18, 2024 00:26

Rollup merge of rust-lang#134408 - rmehri01:rpit-inherits-lifetime, r…

a8139c7

…=compiler-errors Regression test for RPIT inheriting lifetime from projection Regression test to close rust-lang#51525

Rollup merge of rust-lang#134426 - hkBst:patch-3, r=lqd

65bdba6

Fix typo in uint_macros.rs

rustbot added the rollup A PR which is a rollup label Dec 17, 2024

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, 2024

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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 17, 2024

matthiaskrgr closed this Dec 17, 2024

jieyouxu deleted the rollup-yu90upf branch December 18, 2024 08:07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 8 pull requests #134431

Rollup of 8 pull requests #134431

jieyouxu commented Dec 17, 2024

jieyouxu commented Dec 17, 2024

bors commented Dec 17, 2024

bors commented Dec 17, 2024

bors commented Dec 17, 2024

Rollup of 8 pull requests #134431

Rollup of 8 pull requests #134431

Conversation

jieyouxu commented Dec 17, 2024

jieyouxu commented Dec 17, 2024

bors commented Dec 17, 2024

bors commented Dec 17, 2024

bors commented Dec 17, 2024