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

Rollup of 3 pull requests #118966

Merged
merged 17 commits into from
Dec 15, 2023
Merged

Rollup of 3 pull requests #118966

merged 17 commits into from
Dec 15, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

tbu- and others added 17 commits October 18, 2023 14:59
@tbu-
Add discussion that concurrent access to the environment is unsafe
8057586 
The bug report rust-lang#27970 has existed for 8 years, the actual bug dates back
to Rust pre-1.0. I documented it since it's in the interest of the user
to be aware of it. The note can be removed once rust-lang#27970 is fixed.
@compiler-errors
Uplift ClosureKind
b8ea6e6
@compiler-errors
Uplift TypeAndMut
9f0849f
@tbu-
Reformulate std::env::{set,remove}_env as safety note
2093d0c
@compiler-errors
Move special methods from ClosureKind back into rustc
742f193
@Zalathar
coverage: Assert that the instrumentor never sees promoted MIR
87cffb2
@Zalathar
coverage: Simplify parts of InstrumentCoverage::run_pass
315c0cf 
Changes in this patch:
  - Extract local variable `def_id`
  - Check `is_fn_like` without retrieving HIR
  - Inline some locals that are used once and aren't needed for clarity
@Zalathar
coverage: Extract is_eligible_for_coverage
3d5d5b7
@Zalathar
coverage: Don't bother storing the source file in Instrumentor
bf424c2 
We can just as easily look it up again from the source map and body span when
needed.
@Zalathar
coverage: Extract helper for getting HIR info for coverage
b9955fb
@Zalathar
coverage: Use LocalDefId in extract_hir_info
e2f449b
@Zalathar
coverage: Inline and simplify fn_sig_and_body
7de2156
@Zalathar
coverage: Compare span source files without involving Lrc<SourceFile>
3b610c7 
If we want to know whether two byte positions are in the same file, we don't
need to clone and compare `Lrc<SourceFile>`; we can just get their indices and
compare those instead.
@Zalathar
coverage: Check that the function signature span precedes the body
684b9ea 
This will normally be true, but in cases where it's not true we're better off
not making any assumptions about the signature.
@matthiaskrgr
Rollup merge of rust-lang#116888 - tbu-:pr_unsafe_env, r=Amanieu
44fd74a 
Add discussion that concurrent access to the environment is unsafe

The bug report rust-lang#27970 has existed for 8 years, the actual bug dates back to Rust pre-1.0. I documented it since it's in the interest of the user to be aware of it. The note can be removed once rust-lang#27970 is fixed.
@matthiaskrgr
Rollup merge of rust-lang#118888 - compiler-errors:uplift-more-things…
d5af762 
…, r=jackh726

Uplift `TypeAndMut` and `ClosureKind` to `rustc_type_ir`

Uplifts `TypeAndMut` and `ClosureKind`

I know I said I was just going to get rid of `TypeAndMut` (rust-lang/types-team#124) but I think this is much simpler, lol

r? `@jackh726` or `@lcnr`
@matthiaskrgr
Rollup merge of rust-lang#118929 - Zalathar:look-hir, r=cjgillot
6659b5e 
coverage: Tidy up early parts of the instrumentor pass

This is extracted from rust-lang#118237, which needed to be manually rebased anyway.

Unlike that PR, this one only affects the coverage instrumentor, and doesn't attempt to move any code into the MIR builder. That can be left to a future version of rust-lang#118305, which can still benefit from these improvements.

So this is now mostly a refactoring of some internal parts of the instrumentor.
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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. rollup A PR which is a rollup labels Dec 15, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=3

@bors
Copy link
Contributor

bors commented Dec 15, 2023

📌 Commit 6659b5e has been approved by matthiaskrgr

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 Dec 15, 2023
@bors
Copy link
Contributor

bors commented Dec 15, 2023

⌛ Testing commit 6659b5e with merge cca2bda...

@bors
Copy link
Contributor

bors commented Dec 15, 2023

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing cca2bda to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 15, 2023
@bors bors merged commit cca2bda into rust-lang:master Dec 15, 2023
12 checks passed
@rustbot rustbot added this to the 1.76.0 milestone Dec 15, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#116888 Add discussion that concurrent access to the environment is… 663d126393cb7ebea64c78a48b4e04411bf4c7a0 (link)
#118888 Uplift TypeAndMut and ClosureKind to rustc_type_ir f4c4098b695dd05ac04c0c72319b88dadbec317e (link)
#118929 coverage: Tidy up early parts of the instrumentor pass 83a528d9dafed3856c91bd5626823735525ac534 (link)

previous master: 1559dd2dbf

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (cca2bda): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 3.9% [3.6%, 4.2%] 2
Improvements ✅
(primary)		 -1.6% [-1.6%, -1.6%] 1
Improvements ✅
(secondary)		 -2.6% [-2.6%, -2.6%] 1
All ❌✅ (primary) -1.6% [-1.6%, -1.6%] 1

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 1.4% [1.4%, 1.4%] 1
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -0.6% [-0.6%, -0.6%] 2
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 0.1% [-0.6%, 1.4%] 3

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 671.548s -> 672.696s (0.17%)
Artifact size: 312.42 MiB -> 312.36 MiB (-0.02%)

@matthiaskrgr matthiaskrgr deleted the rollup-sdvjwy6 branch March 16, 2024 18:19
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
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup 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. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.76.0
Development

Successfully merging this pull request may close these issues.
7 participants
@matthiaskrgr @bors @rust-timer @rustbot @tbu- @compiler-errors @Zalathar