Resolve some cases of #132279 by using the right typing mode in the next solver by jdonszelmann · Pull Request #156141 · rust-lang/rust

…uwer Rollup of 7 pull requests Successful merges: - #146273 (lint ImproperCTypes: refactor linting architecture (part 2)) - #156173 (Fewer global node_id_to_def_id lookups) - #155961 (Deny warnings in the test for crates that are available on stable) - #156130 (Fold/visit tweaks) - #156131 (Metadata macro/query cleanups) - #156141 (Resolve some cases of #132279 by using the right typing mode in the next solver) - #156202 (llvm: Use correct type for splat mask)

JonathanBrouwer · 2026-05-06T17:26:14Z

@bors r-
#156238 (comment)

rust-bors · 2026-05-06T17:26:21Z

This pull request was unapproved.

This PR was contained in a rollup (#156238), which was unapproved.

View changes since this unapproval

rustbot · 2026-05-08T12:40:33Z

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.

lcnr · 2026-05-08T15:31:18Z

@bors r+ rollup

rust-bors · 2026-05-08T15:31:22Z

📌 Commit 0d65aa2 has been approved by lcnr

It is now in the queue for this repository.

Rollup of 5 pull requests Successful merges: - #156141 (Resolve some cases of #132279 by using the right typing mode in the next solver) - #156244 (fix incorrect suggestions in private import diagnostic) - #156306 (Move tests consts) - #156333 (Avoid invalid spans in dotdotdot rest pattern suggestions) - #156337 (rustc-dev-guide subtree update)

@lcnr

Rollup merge of #156141 - jdonszelmann:use-right-typingmode, r=lcnr Resolve some cases of #132279 by using the right typing mode in the next solver r? @lcnr Convert 3 FIXMEs of #132279 to using the right typing mode when we can (`tcx.use_typing_mode_borrowck()`) Also resolves #155093, which I closed

Rollup of 5 pull requests Successful merges: - rust-lang/rust#156141 (Resolve some cases of rust-lang/rust#132279 by using the right typing mode in the next solver) - rust-lang/rust#156244 (fix incorrect suggestions in private import diagnostic) - rust-lang/rust#156306 (Move tests consts) - rust-lang/rust#156333 (Avoid invalid spans in dotdotdot rest pattern suggestions) - rust-lang/rust#156337 (rustc-dev-guide subtree update)

lqd · 2026-05-29T13:38:05Z

While trying to expand new solver testing in CI to keep it working, I've noticed that not only had we regressed building the stdlib (we knew that and now have CI to prevent that from happening before stabilization), we also regressed bootstrapping with the new solver enabled. That issue is still present on the main branch.

Building a stage 2 compiler with a stage 1 w/ new solver compiler, or RUSTFLAGS, will ICE very strangely while building regex_syntax (and I can't easily reproduce building that crate by itself...):

error: internal compiler error: compiler/rustc_ty_utils/src/sig_types.rs:114:13: Ctor(Variant, Fn) has not seen any uses of `walk_types` yet, ping oli-obk if you'd like any help
    --> ~/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/regex-syntax-0.8.8/src/ast/mod.rs:1134:5
     |
1134 |     Item(ClassSetItem),
     |     ^^^^


thread 'rustc' (1986053) panicked at compiler/rustc_ty_utils/src/sig_types.rs:114:13:

(e.g. with RUSTFLAGS_NOT_BOOTSTRAP="-Znext-solver=globally" ./x build library --stage 2. Fun: I can reproduce the ICE locally on different machines, but not on CI. what.)

I don't really know what's going on, but it looks like weirdness w/ opaque types, during codegen. I've bisected that to 68f9143 from this PR so I wanted to let you and @lcnr know in case you hadn't noticed.

lcnr · 2026-06-01T13:59:50Z

cc @oli-obk :3

@lqd

Codegen ctors in Runtime mir phase https://github.com/rust-lang/rust/pull/156141/changes#diff-f18405dedc545b19aa3ee04cd08b17e1e0fa1b5876e46c6b445eaaa7e54618eaR421 (part of rust-lang#156141) The mir of constructors used to be generated in MirPhase::Built, but are only used during codegen. That means they'd have a weird MirPhase, since all other items have MirPhase::Runtime during codegen. This PR still generates ctor mir in MirPhase::Built, but then immediately does a phase change to Runtime after running no passes. Fixes rust-lang#158037 <summary> Old description of another, worse way to solve this <details> starts using `TypingMode::PostTypeckUntilBorrowck` during mir building with the next solver. This is the right typing mode, and the typing mode contains a list of opaque types. However, previously, we instead just used `TypingMode::Typeck` with an empty list of opaques. That is the wrong typing mode, but it also meant we collected opaque types of slightly fewer things. Now that we do collect their opaque types, we're doing so for items that we've never gathered opaque types for before and get an ICE. There are no tests associated with this change. @lqd tried to reproduce it, but it seems surprisingly hard except by bootstrapping rustc itself. This change makes `RUSTFLAGS_NOT_BOOTSTRAP=-Znext-solver x build compiler --stage 2` work, which I verified locally. See [#t-infra/announcements > Next solver / polonius alpha pre-stabilization CI job](https://rust-lang.zulipchat.com/#narrow/channel/533458-t-infra.2Fannouncements/topic/Next.20solver.20.2F.20polonius.20alpha.20pre-stabilization.20CI.20job/with/602503884) for work towards making bootstraps with the next solver a CI job. </details> </summary> r? @oli-obk

@lqd

Rollup merge of #158040 - jdonszelmann:fix-crash, r=oli-obk Codegen ctors in Runtime mir phase https://github.com/rust-lang/rust/pull/156141/changes#diff-f18405dedc545b19aa3ee04cd08b17e1e0fa1b5876e46c6b445eaaa7e54618eaR421 (part of #156141) The mir of constructors used to be generated in MirPhase::Built, but are only used during codegen. That means they'd have a weird MirPhase, since all other items have MirPhase::Runtime during codegen. This PR still generates ctor mir in MirPhase::Built, but then immediately does a phase change to Runtime after running no passes. Fixes #158037 <summary> Old description of another, worse way to solve this <details> starts using `TypingMode::PostTypeckUntilBorrowck` during mir building with the next solver. This is the right typing mode, and the typing mode contains a list of opaque types. However, previously, we instead just used `TypingMode::Typeck` with an empty list of opaques. That is the wrong typing mode, but it also meant we collected opaque types of slightly fewer things. Now that we do collect their opaque types, we're doing so for items that we've never gathered opaque types for before and get an ICE. There are no tests associated with this change. @lqd tried to reproduce it, but it seems surprisingly hard except by bootstrapping rustc itself. This change makes `RUSTFLAGS_NOT_BOOTSTRAP=-Znext-solver x build compiler --stage 2` work, which I verified locally. See [#t-infra/announcements > Next solver / polonius alpha pre-stabilization CI job](https://rust-lang.zulipchat.com/#narrow/channel/533458-t-infra.2Fannouncements/topic/Next.20solver.20.2F.20polonius.20alpha.20pre-stabilization.20CI.20job/with/602503884) for work towards making bootstraps with the next solver a CI job. </details> </summary> r? @oli-obk

rustbot assigned lcnr May 4, 2026

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 May 4, 2026

jdonszelmann mentioned this pull request May 4, 2026

use typing mode postanalysis in qualif in the next solver #155093

Closed

jdonszelmann force-pushed the use-right-typingmode branch 4 times, most recently from bac5eb5 to 7d76533 Compare May 4, 2026 13:28

jdonszelmann marked this pull request as ready for review May 4, 2026 13:28

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 May 4, 2026

lcnr reviewed May 4, 2026

View reviewed changes

Comment thread compiler/rustc_const_eval/src/check_consts/qualifs.rs Outdated

Comment thread compiler/rustc_middle/src/mir/mod.rs Outdated

Comment thread compiler/rustc_infer/src/infer/mod.rs Outdated

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 May 4, 2026

jdonszelmann force-pushed the use-right-typingmode branch from 7d76533 to a59bc36 Compare May 5, 2026 11:46

This comment has been minimized.

Sign in to view

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 May 5, 2026

This comment has been minimized.

Sign in to view

lcnr reviewed May 5, 2026

View reviewed changes

Comment thread compiler/rustc_infer/src/infer/mod.rs

jdonszelmann force-pushed the use-right-typingmode branch from a59bc36 to da70164 Compare May 6, 2026 08:10

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 May 6, 2026

JonathanBrouwer mentioned this pull request May 6, 2026

Rollup of 7 pull requests #156238

Closed

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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 6, 2026

jdonszelmann force-pushed the use-right-typingmode branch from da70164 to ef8be30 Compare May 7, 2026 05:06

This comment has been minimized.

Sign in to view

jdonszelmann added 4 commits May 8, 2026 14:07

remove param_env from HasTypingEnv

22d2826

use the right typing mode for each mir phase

68f9143

use the right typing mode in lints

0aefbd1

move drop bomb from OpaqueTypeStorage into InferCtxt's Drop

0d65aa2

jdonszelmann force-pushed the use-right-typingmode branch from ef8be30 to 0d65aa2 Compare May 8, 2026 12:40

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 8, 2026

matthiaskrgr mentioned this pull request May 8, 2026

Rollup of 5 pull requests #156341

Merged

rust-bors Bot merged commit dbc4f62 into rust-lang:main May 8, 2026
11 checks passed

rustbot added this to the 1.97.0 milestone May 8, 2026

This was referenced Jun 17, 2026

rustc doesn't compile with the new solver #158037

Closed

Codegen ctors in Runtime mir phase #158040

Merged

Uh oh!

Conversation

jdonszelmann commented May 4, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented May 4, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

lcnr commented May 4, 2026

Uh oh!

rustbot commented May 4, 2026

Uh oh!

This comment has been minimized.

jdonszelmann commented May 5, 2026

Uh oh!

This comment has been minimized.

Uh oh!

jdonszelmann commented May 6, 2026

Uh oh!

rust-bors Bot commented May 6, 2026

Uh oh!

jdonszelmann commented May 6, 2026

Uh oh!

JonathanBrouwer commented May 6, 2026

Uh oh!

rust-bors Bot commented May 6, 2026

Uh oh!

This comment has been minimized.

rustbot commented May 8, 2026

Uh oh!

lcnr commented May 8, 2026

Uh oh!

rust-bors Bot commented May 8, 2026

Uh oh!

Uh oh!

lqd commented May 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lcnr commented Jun 1, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

jdonszelmann commented May 4, 2026 •

edited by rustbot

Loading

lqd commented May 29, 2026 •

edited

Loading