Allow rust staticlib to work with MSVC's /WHOLEARCHIVE by ChrisDenton · Pull Request #129257 · rust-lang/rust

ChrisDenton · 2024-08-18T23:16:06Z

This fixes #129020 by renaming the __NULL_IMPORT_DESCRIPTOR to prevent conflicts.

try-job: dist-i686-msvc

ChrisDenton · 2024-08-18T23:17:37Z

…r=<try> Allow rust staticlib to work with MSVC's /WHOLEARCHIVE This renames the `__NULL_IMPORT_DESCRIPTOR` to prevent conflicts. try-job: x86_64-msvc try-job: i686-msvc r? ghost

bors · 2024-08-18T23:18:47Z

⌛ Trying commit f64ecf1 with merge 04f2fce...

bors · 2024-08-19T01:11:02Z

☀️ Try build successful - checks-actions
Build commit: 04f2fce (04f2fcee5f890f2ff221d91b27754fb2fb2ba779)

ChrisDenton · 2024-08-19T17:36:32Z

The ar_archive_writer crate has been update so this should be ready for review. Hopefully the rmake test is at least a bit nicer now,

r? jieyouxu

rustbot · 2024-08-19T17:52:58Z

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

This PR modifies tests/run-make/. If this PR is trying to port a Makefile
run-make test to use rmake.rs, please update the
run-make port tracking issue
so we can track our progress. You can either modify the tracking issue
directly, or you can comment on the tracking issue and link this PR.

cc @jieyouxu

jieyouxu

Thanks, this LGTM, feel free to r=me with or without addressing the nit.

compiler/rustc_codegen_ssa/src/back/archive.rs

tests/run-make/msvc-wholearchive/rmake.rs

jieyouxu · 2024-08-19T18:21:05Z

@bors rollup=iffy (funny linker things)

ChrisDenton · 2024-08-19T18:47:01Z

Since the changes are cosmetic and check passed...

@bors r=jieyouxu

bors · 2024-08-19T18:47:04Z

📌 Commit d4a14b1 has been approved by jieyouxu

It is now in the queue for this repository.

mati865 · 2024-08-19T22:03:21Z

tests/run-make/msvc-wholearchive/rmake.rs

+//! It ensures we can use `/WHOLEARCHIVE` to link a rust staticlib into DLL
+//! using the MSVC linker
+
+//@ only-msvc


Would be nice (but not required) to also cover windows-gnullvm that has the same issue.

I've not tried gnullvm specifically but the llvm linker has another issue which I think needs solving on their end first (which is why even the msvc test skips lld-link).

.idata$4 should not refer to special section 0

LLVM seems to not properly recognise .idata$4 and .idata$5 as special unless they're specifically in short import libraries. incidentally this also makes it break on MSVC long import libraries. Though since they haven't been in use since the 90's I guess there's not been much pressure to support it.

We probably should open a new issue to track this case?

Maybe? How do we usually track upstream issues?

We have a special label for waiting on LLVM: S-waiting-for-llvm for describing the dragon is eepy (and better if it links to a llvm upstream issue)

Though since they haven't been in use since the 90's I guess there's not been much pressure to support it.

ld.bfd used by windows-gnu still uses them as it still cannot output short import libraries 😉

…, r=jieyouxu Allow rust staticlib to work with MSVC's /WHOLEARCHIVE This fixes rust-lang#129020 by renaming the `__NULL_IMPORT_DESCRIPTOR` to prevent conflicts.

Rollup of 6 pull requests Successful merges: - rust-lang#127623 (fix: fs::remove_dir_all: treat internal ENOENT as success) - rust-lang#128627 (Special case DUMMY_SP to emit line 0/column 0 locations on DWARF platforms.) - rust-lang#129187 (bootstrap: fix clean's remove_dir_all implementation) - rust-lang#129190 (Added f16 and f128 to tests/ui/consts/const-float-bits-conv.rs) - rust-lang#129231 (improve submodule updates) - rust-lang#129257 (Allow rust staticlib to work with MSVC's /WHOLEARCHIVE) r? `@ghost` `@rustbot` modify labels: rollup

jieyouxu · 2024-08-20T10:42:47Z

I'm suspecting this PR caused the failure in #129300 (comment):

Caused by:
  process didn't exit successfully: `C:\a\rust\rust\build\i686-pc-windows-msvc\stage1-rustc\release\build\crossbeam-utils-7d693aa43cb4fd79\build-script-build` (exit code: 0xc0000135, STATUS_DLL_NOT_FOUND)
[RUSTC-TIMING] smallvec test:false 0.460
error: failed to run custom build command for `proc-macro2 v1.0.86`

Caused by:
Caused by:
  process didn't exit successfully: `C:\a\rust\rust\build\i686-pc-windows-msvc\stage1-rustc\release\build\proc-macro2-6de43c34e6077ea1\build-script-build` (exit code: 0xc0000135, STATUS_DLL_NOT_FOUND)

Temporarily kicking this out of the queue to check if it's this or another bootstrap PR.

@bors r-

bors · 2024-08-21T17:17:00Z

💔 Test failed - checks-actions

ChrisDenton · 2024-08-21T17:17:48Z

@bors retry spurious "failed to remove file" on x86_64-msvc-ext again

jieyouxu · 2024-08-21T17:28:59Z

pinging back #127883

bors · 2024-08-22T01:40:32Z

⌛ Testing commit 40af214 with merge 5dbffc5...

…r=jieyouxu Allow rust staticlib to work with MSVC's /WHOLEARCHIVE This fixes rust-lang#129020 by renaming the `__NULL_IMPORT_DESCRIPTOR` to prevent conflicts. try-job: dist-i686-msvc

rust-log-analyzer · 2024-08-22T03:17:07Z

The job x86_64-msvc-ext failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

[RUSTC-TIMING] miri test:false 4.390
error: failed to remove file `C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-tools\x86_64-pc-windows-msvc\release\miri.exe`

Caused by:
  Access is denied. (os error 5)
Command has failed. Rerun with -v to see more details.
  local time: Thu, Aug 22, 2024  3:16:53 AM
  network time: Thu, 22 Aug 2024 03:16:54 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

bors · 2024-08-22T03:17:46Z

💔 Test failed - checks-actions

jieyouxu · 2024-08-22T03:21:33Z

@bors retry (#127883 windows ci failure 2: electric boogaloo)

…, r=jieyouxu Allow rust staticlib to work with MSVC's /WHOLEARCHIVE This fixes rust-lang#129020 by renaming the `__NULL_IMPORT_DESCRIPTOR` to prevent conflicts. try-job: dist-i686-msvc

Rollup of 7 pull requests Successful merges: - rust-lang#126985 (Implement `-Z embed-source` (DWARFv5 source code embedding extension)) - rust-lang#128349 (Enable `f16` on x86 and x86-64) - rust-lang#128876 (Ship MinGW-w64 runtime DLLs along with `rust-lld.exe` for `-pc-windows-gnu` targets) - rust-lang#129190 (Add f16 and f128 to tests/ui/consts/const-float-bits-conv.rs) - rust-lang#129257 (Allow rust staticlib to work with MSVC's /WHOLEARCHIVE) - rust-lang#129386 (Use a LocalDefId in ResolvedArg.) - rust-lang#129400 (Update `compiler_builtins` to `0.1.120`) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2024-08-22T15:53:05Z

⌛ Testing commit 40af214 with merge 5ad98b4...

bors · 2024-08-22T18:18:10Z

☀️ Test successful - checks-actions
Approved by: jieyouxu
Pushing 5ad98b4 to master...

rust-timer · 2024-08-22T19:34:31Z

Finished benchmarking commit (5ad98b4): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.7%	[-1.7%, -1.7%]	1
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (primary 2.7%)

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)	2.7%	[2.7%, 2.7%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.7%	[2.7%, 2.7%]	1

Cycles

Results (secondary 9.6%)

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)	9.6%	[9.6%, 9.6%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Binary size

Results (secondary -0.0%)

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)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.0%	[-0.0%, -0.0%]	1
All ❌✅ (primary)	-	-	0

Bootstrap: 749.851s -> 749.145s (-0.09%)
Artifact size: 338.94 MiB -> 338.93 MiB (-0.00%)

ChrisDenton mentioned this pull request Aug 18, 2024

Remove COMDAT support in the next release rust-lang/ar_archive_writer#22

Closed

ChrisDenton mentioned this pull request Aug 19, 2024

Make the null import descriptor name unique to the import library rust-lang/ar_archive_writer#23

Merged

ChrisDenton force-pushed the rename-null-descriptor branch from f64ecf1 to 50a28af Compare August 19, 2024 17:33

rustbot assigned jieyouxu Aug 19, 2024

ChrisDenton marked this pull request as ready for review August 19, 2024 17:52

jieyouxu approved these changes Aug 19, 2024

View reviewed changes

compiler/rustc_codegen_ssa/src/back/archive.rs Show resolved Hide resolved

tests/run-make/msvc-wholearchive/rmake.rs Outdated Show resolved Hide resolved

tests/run-make/msvc-wholearchive/rmake.rs Outdated Show resolved Hide resolved

Test wholearchive on rust staticlib

76fbf0a

ChrisDenton force-pushed the rename-null-descriptor branch from 50a28af to d4a14b1 Compare August 19, 2024 18:27

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

mati865 reviewed Aug 19, 2024

View reviewed changes

jieyouxu mentioned this pull request Aug 20, 2024

Rollup of 6 pull requests #129300

Closed

bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 20, 2024

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

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

jieyouxu mentioned this pull request Aug 22, 2024

Rollup of 11 pull requests #129391

Closed

tgross35 mentioned this pull request Aug 22, 2024

Rollup of 7 pull requests #129407

Closed

bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 22, 2024

bors merged commit 5ad98b4 into rust-lang:master Aug 22, 2024

rustbot added this to the 1.82.0 milestone Aug 22, 2024

ChrisDenton deleted the rename-null-descriptor branch August 22, 2024 18:18

kleisauke mentioned this pull request Sep 30, 2024

librsvg problem in clang msys2/MINGW-packages#21017

Closed

7 tasks

jieyouxu added the CI-spurious-fail-msvc CI spurious failure: target env msvc label Oct 15, 2024

Uh oh!

Conversation

ChrisDenton commented Aug 18, 2024 • edited by jieyouxu Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ChrisDenton commented Aug 18, 2024

Uh oh!

bors commented Aug 18, 2024

Uh oh!

bors commented Aug 19, 2024

Uh oh!

ChrisDenton commented Aug 19, 2024

Uh oh!

rustbot commented Aug 19, 2024

Uh oh!

jieyouxu left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jieyouxu commented Aug 19, 2024

Uh oh!

ChrisDenton commented Aug 19, 2024

Uh oh!

bors commented Aug 19, 2024

Uh oh!

mati865 Aug 19, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jieyouxu Aug 20, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jieyouxu commented Aug 20, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bors commented Aug 21, 2024

Uh oh!

ChrisDenton commented Aug 21, 2024

Uh oh!

jieyouxu commented Aug 21, 2024

Uh oh!

bors commented Aug 22, 2024

Uh oh!

rust-log-analyzer commented Aug 22, 2024

Uh oh!

bors commented Aug 22, 2024

Uh oh!

jieyouxu commented Aug 22, 2024

Uh oh!

bors commented Aug 22, 2024

Uh oh!

bors commented Aug 22, 2024

Uh oh!

rust-timer commented Aug 22, 2024

Overall result: ✅ improvements - no action needed

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

ChrisDenton commented Aug 18, 2024 •

edited by jieyouxu

Loading

jieyouxu left a comment •

edited

Loading

mati865 Aug 19, 2024 •

edited

Loading

jieyouxu Aug 20, 2024 •

edited

Loading

jieyouxu commented Aug 20, 2024 •

edited

Loading