Skip to content

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented Sep 26, 2025

fixes rust-lang/trait-system-refactor-initiative#232

annoyingly subtle, imagine the following proof tree

  • A (no cycle head usages, final result Y)
    • ignored B (depends on A with provisional result X)
      • A (cycle, provisional result X)
  • B (using the cache entry here incorrectly assumes A has final result X)

r? @BoxyUwU

@rustbot 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Sep 26, 2025
@lcnr lcnr requested a review from Copilot September 26, 2025 11:49
Copilot

This comment was marked as outdated.

@lcnr lcnr force-pushed the provisional-cache-woops branch 2 times, most recently from 19c2f98 to a09eb21 Compare September 26, 2025 11:54

let Some(new_highest_head_index) = heads.opt_highest_cycle_head_index() else {
return false;
};
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

moved earlier for potential perf gains. no need to do anything more involved if we need to pop anyways

@lcnr
Copy link
Contributor Author

lcnr commented Sep 26, 2025

@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@rust-bors

This comment has been minimized.

rust-bors bot added a commit that referenced this pull request Sep 26, 2025
fix rebasing cycle heads when not reaching a fixpoint
@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Sep 26, 2025
@lcnr lcnr force-pushed the provisional-cache-woops branch from a09eb21 to 4162c32 Compare September 26, 2025 11:58
@rustbot
Copy link
Collaborator

rustbot commented Sep 26, 2025

This PR was rebased onto a different master 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 lcnr force-pushed the provisional-cache-woops branch from 4162c32 to 1b9c2aa Compare September 26, 2025 12:13
@lcnr
Copy link
Contributor Author

lcnr commented Sep 26, 2025

@bors cancel

@bors try

@rust-bors

This comment has been minimized.

rust-bors bot added a commit that referenced this pull request Sep 26, 2025
fix rebasing cycle heads when not reaching a fixpoint
@lcnr lcnr force-pushed the provisional-cache-woops branch 3 times, most recently from fc530f5 to 0c9a691 Compare September 26, 2025 12:48
@rust-log-analyzer

This comment has been minimized.

@lcnr lcnr force-pushed the provisional-cache-woops branch from 82a3ee6 to ae34c8d Compare September 26, 2025 13:19
@BoxyUwU
Copy link
Member

BoxyUwU commented Sep 26, 2025

r=me if ci and perf good

@BoxyUwU BoxyUwU 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 Sep 26, 2025
@rust-log-analyzer

This comment has been minimized.

@lcnr lcnr force-pushed the provisional-cache-woops branch from ae34c8d to 4e44d58 Compare September 26, 2025 13:29
@rust-bors
Copy link

rust-bors bot commented Sep 26, 2025

☀️ Try build successful (CI)
Build commit: a7a478b (a7a478bb1c36795d5c8eb82ffec98b5b4200479d, parent: 5b9007bfc358817cf066ee27c6b440440727d3a7)

@rust-timer
Copy link
Collaborator

Queued a7a478b with parent 5b9007b, future comparison URL.
There are currently 0 preceding artifacts in the queue.
It will probably take at least ~1.1 hours until the benchmark run finishes.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. S-waiting-on-perf Status: Waiting on a perf run to be completed. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

"Type mismatch resolving..." only on new trait solver
5 participants