Skip to content

Rollup of 4 pull requests - #130439

Merged
bors merged 8 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-1lkzo74
Sep 16, 2024
Merged

Rollup of 4 pull requests#130439
bors merged 8 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-1lkzo74

Conversation

@matthiaskrgr

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

amysparkand others added 8 commits September 8, 2024 11:40
…nd-mingw-import-libraries, r=petrochenkov
linker: Allow MSVC to use import libraries following the Meson/MinGW convention
Hi all,
This PR implements support for `MsvcLinker` to use import libraries following Meson and the MinGW toolchain's naming convention. Meson [follows the `libfoo.dll.a` naming convention](https://mesonbuild.com/FAQ.html#why-does-building-my-project-with-msvc-output-static-libraries-called-libfooa) to disambiguate between static and import libraries.
This support already existed for static libraries (see rust-lang#100101), but not for dynamic libraries. The latter case was added by duplicating the logic in `native_libs::find_native_static_library`, but a separate case was added in `link_dylib_by_name` for the Windows CRT libraries which must be handled by the linker itself.
See for prerequisites rust-lang#129366, rust-lang#126094, and rust-lang#128370.
All feedback is appreciated!
Fixesrust-lang#122455
cc `@sdroege` `@nirbheek`
… r=jieyouxu
Don't ICE when generating `Fn` shim for async closure with borrowck error
Turn an assumption that I had originally written as an assert into a delayed bug, because this shim code is reachable even if we have borrowck errors via the MIR inliner.
Fixesrust-lang#129262.
…, r=jieyouxu
Don't ICE when RPITIT captures more method args than trait definition
Make sure we don't ICE when an RPITIT captures more method args than the trait definition, which is not allowed. This was because we were using the wrong def id for error reporting.
Due to the default lifetime capture rules of RPITITs (capturing everything in scope), this is only doable if we use precise capturing, which isn't currently allowed for RPITITs anyways but we still end up reaching the relevant codepaths.
Fixesrust-lang#129850
…dered_test, r=RalfJung
Ignore reduce-fadd-unordered on SGX platform
rust-lang#130325 added the `tests/assembly/simd/reduce-fadd-unordered.rs` test. Unfortunately, the use of `CHECK: ret` makes that this test is not compatible with LVI mitigations applied for the SGX target. This PR makes sure this test is ignored for the SGX target, until a nicer solution is available.
@rustbotrustbot 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. rollup A PR which is a rollup labels Sep 16, 2024
@matthiaskrgr

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=4

@bors

bors commented Sep 16, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit 1807fda has been approved by matthiaskrgr

It is now in the queue for this repository.

@borsbors 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 Sep 16, 2024
@bors

bors commented Sep 16, 2024

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 1807fda with merge fd2c811...

@bors

bors commented Sep 16, 2024

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Sep 16, 2024
@bors
bors merged commit fd2c811 into rust-lang:masterSep 16, 2024
@rustbotrustbot added this to the 1.83.0 milestone Sep 16, 2024
@rust-timer

Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR#MessagePerf Build Sha
#123436linker: Allow MSVC to use import libraries following the Me…b221d03012484f36ece182a515f4c7e5e3a5196f (link)
#130410Don't ICE when generating Fn shim for async closure with …f3b74b9157f1080abf7e2160b064e391bbdbdff8 (link)
#130412Don't ICE when RPITIT captures more method args than trait …245221033e24c38e44d56dcf5d16753484dde3d0 (link)
#130436Ignore reduce-fadd-unordered on SGX platform6272193c729d236314e01ed99163527df13357e5 (link)

previous master: 3a22be33db

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
Copy Markdown
Collaborator

Finished benchmarking commit (fd2c811): 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 (primary -4.2%, secondary -3.5%)

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.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-4.2%[-4.2%, -4.2%]1
Improvements ✅
(secondary)
-3.5%[-3.5%, -3.5%]1
All ❌✅ (primary)-4.2%[-4.2%, -4.2%]1

Cycles

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

Binary size

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

Bootstrap: 758.941s -> 759.275s (0.04%)
Artifact size: 341.31 MiB -> 341.29 MiB (-0.01%)

@matthiaskrgr
matthiaskrgr deleted the rollup-1lkzo74 branch January 25, 2025 09:13
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants

@matthiaskrgr@bors@rust-timer@rustbot@amyspark@raoulstrackx@compiler-errors