test `#[naked]` with `#[link_section = "..."]` on windows#154598

folkertdev · 2026-03-30T16:07:27Z

As a part of #147811 I ran into that we actually don't match (current) LLVM output.

folkertdev · 2026-03-30T16:07:54Z

compiler/rustc_codegen_ssa/src/mir/naked_asm.rs

-            let section = link_section.unwrap_or_else(|| format!(".text.{asm_name}"));
-            writeln!(begin, ".pushsection {},\"xr\"", section).unwrap();
-            writeln!(begin, ".balign {align_bytes}").unwrap();
-            write_linkage(&mut begin).unwrap();
            writeln!(begin, ".def {asm_name}").unwrap();
            writeln!(begin, ".scl 2").unwrap();
            writeln!(begin, ".type 32").unwrap();
            writeln!(begin, ".endef").unwrap();
+
+            let section = link_section.unwrap_or_else(|| format!(".text.{asm_name}"));
+            writeln!(begin, ".pushsection {},\"xr\"", section).unwrap();
+            write_linkage(&mut begin).unwrap();
+            writeln!(begin, ".balign {align_bytes}").unwrap();


This just got moved up so that .def comes before the .pushsection.

folkertdev · 2026-03-30T16:08:23Z

compiler/rustc_codegen_ssa/src/mir/naked_asm.rs

-            writeln!(end, ".Lfunc_end_{asm_name}:").unwrap();
-            writeln!(end, ".popsection").unwrap();


LLVM does not emit these, so then we should not need to either

folkertdev · 2026-03-30T16:08:41Z

compiler/rustc_codegen_ssa/src/mir/naked_asm.rs

+    // Pick a default alignment when the alignment is not explicitly specified.
+    let align_bytes = match attrs.alignment {
+        Some(align) => align.bytes(),
+        None => match asm_binary_format {
+            BinaryFormat::Coff => 16,
+            _ => 4,
+        },
+    };


I don't think this really matters but we may as well match LLVM

folkertdev · 2026-03-30T16:10:14Z

@bors try jobs=x86_64-mingw-1

test `#[naked]` with `#[link_section = "..."]` on windows try-job: x86_64-mingw-1

rust-bors · 2026-03-30T18:16:42Z

💔 Test for e60d030 failed: CI. Failed job:

try - x86_64-mingw-1 (web logs, enhanced plaintext logs)

folkertdev · 2026-03-30T20:11:26Z

@bors try jobs=x86_64-mingw-1

test `#[naked]` with `#[link_section = "..."]` on windows try-job: x86_64-mingw-1

rust-bors · 2026-03-30T23:17:00Z

☀️ Try build successful (CI)
Build commit: d4f9c71 (d4f9c7193a4577562f0c4bc2e76a5f1fbff95732, parent: cf7da0b7277cad05b79f91b60c290aa08a17a6f0)

mati865 · 2026-03-31T00:10:23Z

tests/codegen-llvm/naked-fn/naked-functions.rs

 // CHECK-LABEL: naked_empty:
 //
-// linux,macos,win: ret
+// linux,macos,win_x86,win_x86: ret


You probably meant i686 and x86 here.

(Not tested)

Suggested change

// linux,macos,win_x86,win_x86: ret

// linux,macos,win_x86,win_i686: ret

rustbot · 2026-04-06T12:59:09Z

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

folkertdev · 2026-04-07T14:12:52Z

@rustbot ready

mati865 · 2026-04-08T17:32:40Z

Thanks.

@bors r+

rust-bors · 2026-04-08T17:32:44Z

📌 Commit 72b6825 has been approved by mati865

It is now in the queue for this repository.

…uwer Rollup of 6 pull requests Successful merges: - #154912 (Remove `BuiltinLintDiag`) - #154598 (test `#[naked]` with `#[link_section = "..."]` on windows) - #154719 (Hexagon inline asm: add reg_pair, vreg, vreg_pair, and qreg register classes) - #154057 (Parenthesize block-like expressions in index base of pretty printer) - #154893 (make `expected_literal` positive) - #155002 (Clarify that `core::range` ranges do not have special syntax)

@mati865

Rollup merge of #154598 - folkertdev:windows-naked-link-section, r=mati865 test `#[naked]` with `#[link_section = "..."]` on windows As a part of #147811 I ran into that we actually don't match (current) LLVM output. r? @mati865

rustbot assigned mati865 Mar 30, 2026

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. labels Mar 30, 2026

folkertdev commented Mar 30, 2026

View reviewed changes

This comment has been minimized.

Sign in to view

rust-bors bot pushed a commit that referenced this pull request Mar 30, 2026

Auto merge of #154598 - folkertdev:windows-naked-link-section, r=<try>

e60d030

test `#[naked]` with `#[link_section = "..."]` on windows try-job: x86_64-mingw-1

This comment has been minimized.

Sign in to view

folkertdev force-pushed the windows-naked-link-section branch from f445a7c to b1287a8 Compare March 30, 2026 17:08

rust-bors bot 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 Mar 30, 2026

This comment has been minimized.

Sign in to view

folkertdev force-pushed the windows-naked-link-section branch from b1287a8 to 984fb02 Compare March 30, 2026 18:38

rust-bors bot pushed a commit that referenced this pull request Mar 30, 2026

Auto merge of #154598 - folkertdev:windows-naked-link-section, r=<try>

d4f9c71

test `#[naked]` with `#[link_section = "..."]` on windows try-job: x86_64-mingw-1

This comment has been minimized.

Sign in to view

mati865 reviewed Mar 31, 2026

View reviewed changes

test #[naked] with #[link_section = "..."] on windows

72b6825

folkertdev force-pushed the windows-naked-link-section branch from 984fb02 to 72b6825 Compare April 6, 2026 12:59

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 7, 2026

rust-bors bot 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 Apr 8, 2026

JonathanBrouwer mentioned this pull request Apr 8, 2026

Rollup of 6 pull requests #155011

Merged

rust-bors bot merged commit b040d54 into rust-lang:main Apr 9, 2026
11 checks passed

rustbot added this to the 1.96.0 milestone Apr 9, 2026

		writeln!(end, ".Lfunc_end_{asm_name}:").unwrap();
		writeln!(end, ".popsection").unwrap();

	// linux,macos,win_x86,win_x86: ret
	// linux,macos,win_x86,win_i686: ret

Uh oh!

Conversation

folkertdev commented Mar 30, 2026

Uh oh!

folkertdev Mar 30, 2026

Choose a reason for hiding this comment

Uh oh!

folkertdev Mar 30, 2026

Choose a reason for hiding this comment

Uh oh!

folkertdev Mar 30, 2026

Choose a reason for hiding this comment

Uh oh!

folkertdev commented Mar 30, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

rust-bors bot commented Mar 30, 2026

Uh oh!

This comment has been minimized.

folkertdev commented Mar 30, 2026

Uh oh!

This comment has been minimized.

rust-bors bot commented Mar 30, 2026

Uh oh!

mati865 Mar 31, 2026

Choose a reason for hiding this comment

Uh oh!

mati865 Apr 4, 2026

Choose a reason for hiding this comment

Uh oh!

rustbot commented Apr 6, 2026

Uh oh!

folkertdev commented Apr 7, 2026

Uh oh!

mati865 commented Apr 8, 2026

Uh oh!

rust-bors bot commented Apr 8, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants