Skip to content

Use cg_llvm's target_config in miri - #149323

Merged
bors merged 3 commits into
rust-lang:mainfrom
bjorn3:miri_llvm_target_config
Nov 28, 2025
Merged

Use cg_llvm's target_config in miri#149323
bors merged 3 commits into
rust-lang:mainfrom
bjorn3:miri_llvm_target_config

Conversation

@bjorn3

@bjorn3 bjorn3 commented Nov 25, 2025 •
edited
Loading

Copy link
Copy Markdown
Member

Fixes #149314

r? @RalfJung

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Nov 25, 2025
@bjorn3 bjorn3 mentioned this pull request Nov 25, 2025
Closed
@rust-log-analyzer

This comment has been minimized.

Sign in to view
RalfJung
RalfJung reviewed Nov 25, 2025
View reviewed changes
Comment thread src/tools/miri/src/bin/miri.rs Outdated
@RalfJung

RalfJung commented Nov 25, 2025

Copy link
Copy Markdown
Member

That's a fun trick! I am slightly worried about this turning into crazy spaghetti, but it's at least worth trying this approach.

@bjorn3
bjorn3 force-pushed the miri_llvm_target_config branch from 7fe991e to 1058705 Compare November 26, 2025 09:19
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bjorn3
bjorn3 force-pushed the miri_llvm_target_config branch 3 times, most recently from 4bbdf53 to 5623801 Compare November 27, 2025 11:35
@bjorn3
bjorn3 marked this pull request as ready for review November 27, 2025 11:37
@rustbot

rustbot commented Nov 27, 2025

Copy link
Copy Markdown
Collaborator

The Miri subtree was changed

cc @rust-lang/miri

@bjorn3

bjorn3 commented Nov 27, 2025

Copy link
Copy Markdown
Member Author

Added a test.

@rustbot ready

@rustbot 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 Nov 27, 2025
RalfJung
RalfJung reviewed Nov 27, 2025
View reviewed changes
Comment thread src/tools/miri/src/bin/miri.rs Outdated
RalfJung
RalfJung reviewed Nov 27, 2025
View reviewed changes
Comment thread src/tools/miri/src/bin/miri.rs Outdated
RalfJung
RalfJung reviewed Nov 27, 2025
View reviewed changes
Comment thread src/tools/miri/src/bin/miri.rs Outdated
@RalfJung

RalfJung commented Nov 27, 2025

Copy link
Copy Markdown
Member

Thanks! I left some comments.
@rustbot author

@rustbot rustbot 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 Nov 27, 2025
RalfJung
RalfJung reviewed Nov 27, 2025
View reviewed changes
Comment thread src/tools/miri/src/bin/miri.rs
Comment thread src/tools/miri/src/bin/miri.rs Outdated
@bjorn3
bjorn3 force-pushed the miri_llvm_target_config branch from b17cbd3 to db247e0 Compare November 27, 2025 18:25
@bjorn3

bjorn3 commented Nov 27, 2025

Copy link
Copy Markdown
Member Author

@rustbot ready

Let me know if you want me to squash.

@rustbot 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 Nov 27, 2025
@RalfJung
RalfJung force-pushed the miri_llvm_target_config branch from 8c4b728 to 63a3d9a Compare November 27, 2025 19:06
@RalfJung

RalfJung commented Nov 27, 2025

Copy link
Copy Markdown
Member

I have squashed. r=me when CI is green.

RalfJung
RalfJung reviewed Nov 27, 2025
View reviewed changes
Comment thread src/tools/miri/tests/pass/target-cpu-implies-target-feature.rs
@bjorn3
bjorn3 force-pushed the miri_llvm_target_config branch from 63a3d9a to d3901cd Compare November 27, 2025 19:12
RalfJung
RalfJung reviewed Nov 27, 2025
View reviewed changes
Comment thread src/tools/miri/tests/pass/target-cpu-implies-target-feature.rs
@RalfJung

RalfJung commented Nov 27, 2025

Copy link
Copy Markdown
Member

Thanks! Now really r=me when CI is green. :)

@bjorn3

bjorn3 commented Nov 27, 2025

Copy link
Copy Markdown
Member Author

@bors r=RalfJung

@bors

bors commented Nov 27, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit 57b57b8 has been approved by RalfJung

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 Nov 27, 2025
@Zalathar Zalathar mentioned this pull request Nov 28, 2025
Merged
bors added a commit that referenced this pull request Nov 28, 2025
@bors
Auto merge of #149410 - Zalathar:rollup-wke6axp, r=Zalathar
88bd39b 
Rollup of 5 pull requests

Successful merges:

 - #149087 (Stabilize `unchecked_neg` and `unchecked_shifts`)
 - #149107 (rustc_borrowck: Don't suggest changing closure param type not under user control)
 - #149323 (Use cg_llvm's target_config in miri)
 - #149380 (Run `eval_config_entry` on all branches so we always emit lints)
 - #149394 (add regression test for guard patterns liveness ICE)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit b8b7041 into rust-lang:main Nov 28, 2025
11 checks passed
@rustbot rustbot added this to the 1.93.0 milestone Nov 28, 2025
rust-timer added a commit that referenced this pull request Nov 28, 2025
@rust-timer
Unrolled build for #149323
11f1486 
Rollup merge of #149323 - bjorn3:miri_llvm_target_config, r=RalfJung

Use cg_llvm's target_config in miri

Fixes #149314

r? `@RalfJung`
@bjorn3
bjorn3 deleted the miri_llvm_target_config branch November 28, 2025 08:55
RalfJung pushed a commit to RalfJung/miri that referenced this pull request Nov 28, 2025
@bors
Auto merge of #149410 - Zalathar:rollup-wke6axp, r=Zalathar
7c1fca9 
Rollup of 5 pull requests

Successful merges:

 - rust-lang/rust#149087 (Stabilize `unchecked_neg` and `unchecked_shifts`)
 - rust-lang/rust#149107 (rustc_borrowck: Don't suggest changing closure param type not under user control)
 - rust-lang/rust#149323 (Use cg_llvm's target_config in miri)
 - rust-lang/rust#149380 (Run `eval_config_entry` on all branches so we always emit lints)
 - rust-lang/rust#149394 (add regression test for guard patterns liveness ICE)

r? `@ghost`
`@rustbot` modify labels: rollup
github-actions Bot pushed a commit to rust-lang/rust-analyzer that referenced this pull request Dec 1, 2025
@bors
Auto merge of #149410 - Zalathar:rollup-wke6axp, r=Zalathar
033c234 
Rollup of 5 pull requests

Successful merges:

 - rust-lang/rust#149087 (Stabilize `unchecked_neg` and `unchecked_shifts`)
 - rust-lang/rust#149107 (rustc_borrowck: Don't suggest changing closure param type not under user control)
 - rust-lang/rust#149323 (Use cg_llvm's target_config in miri)
 - rust-lang/rust#149380 (Run `eval_config_entry` on all branches so we always emit lints)
 - rust-lang/rust#149394 (add regression test for guard patterns liveness ICE)

r? `@ghost`
`@rustbot` modify labels: rollup
Kobzol pushed a commit to Kobzol/rustc_codegen_gcc that referenced this pull request Dec 21, 2025
@bors
Auto merge of #149410 - Zalathar:rollup-wke6axp, r=Zalathar
45d860e 
Rollup of 5 pull requests

Successful merges:

 - rust-lang/rust#149087 (Stabilize `unchecked_neg` and `unchecked_shifts`)
 - rust-lang/rust#149107 (rustc_borrowck: Don't suggest changing closure param type not under user control)
 - rust-lang/rust#149323 (Use cg_llvm's target_config in miri)
 - rust-lang/rust#149380 (Run `eval_config_entry` on all branches so we always emit lints)
 - rust-lang/rust#149394 (add regression test for guard patterns liveness ICE)

r? `@ghost`
`@rustbot` modify labels: rollup
ghaaj pushed a commit to ghaaj/polygrammar that referenced this pull request Aug 7, 2026
@bors
Auto merge of #149410 - Zalathar:rollup-wke6axp, r=Zalathar
a44db4d 
Rollup of 5 pull requests

Successful merges:

 - rust-lang/rust#149087 (Stabilize `unchecked_neg` and `unchecked_shifts`)
 - rust-lang/rust#149107 (rustc_borrowck: Don't suggest changing closure param type not under user control)
 - rust-lang/rust#149323 (Use cg_llvm's target_config in miri)
 - rust-lang/rust#149380 (Run `eval_config_entry` on all branches so we always emit lints)
 - rust-lang/rust#149394 (add regression test for guard patterns liveness ICE)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@RalfJung RalfJung RalfJung left review comments

Assignees

@RalfJung RalfJung

Labels

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.

Projects

None yet

Milestone

1.93.0

Development

Successfully merging this pull request may close these issues.

miri ignores -Ctarget-cpu since nightly-2025-11-10

5 participants

@bjorn3 @rust-log-analyzer @RalfJung @rustbot @bors