Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't give up on a location the first time compiling fails. #1567

Merged
merged 1 commit into from
Jan 27, 2025

Conversation

ltratt
Copy link
Contributor

@ltratt ltratt commented Jan 27, 2025

This comment in the code was partly wrong:

// FIXME: We will endless retry tracing this
// [HotLocation]. There should be a `Counting`
// state.

In fact, we wouldn't endlessly retry: the HotLocation would get stuck in the Compiling state. Still, the end effect was the same as the comment suggested!

This commit allows HotLocations to transition back to the Counting state so that we can retry. That requires allowing HotLocations to also be in the Counting state: in other words, we can "count" both with and without a HotLocation.

ykrt/src/mt.rs Outdated Show resolved Hide resolved
@vext01 vext01 added this pull request to the merge queue Jan 27, 2025
@ltratt ltratt removed this pull request from the merge queue due to a manual request Jan 27, 2025
@ltratt
Copy link
Contributor Author

ltratt commented Jan 27, 2025

OK to squash?

@vext01
Copy link
Contributor

vext01 commented Jan 27, 2025

Oh yeah, sorry. Please go ahead.

@ltratt ltratt force-pushed the dont_get_stuck_on_first_miscompile branch from 2a32832 to a587225 Compare January 27, 2025 11:02
@ltratt
Copy link
Contributor Author

ltratt commented Jan 27, 2025

Squashed.

@vext01 vext01 added this pull request to the merge queue Jan 27, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jan 27, 2025
This comment in the code was partly wrong:

```
// FIXME: We will endless retry tracing this
// [HotLocation]. There should be a `Counting`
// state.
```

In fact, we wouldn't endlessly retry: the `HotLocation` would get stuck
in the `Compiling` state. Still, the end effect was the same as the
comment suggested!

This commit allows `HotLocation`s to transition back to the `Counting`
state so that we can retry. That requires allowing `HotLocations` to
also be in the `Counting` state: in other words, we can "count" both
with and without a `HotLocation`.
@ltratt ltratt force-pushed the dont_get_stuck_on_first_miscompile branch from a587225 to 153ccbb Compare January 27, 2025 11:29
@ltratt
Copy link
Contributor Author

ltratt commented Jan 27, 2025

Force pushed Clippy fixes (oops).

@vext01 vext01 added this pull request to the merge queue Jan 27, 2025
Merged via the queue into ykjit:master with commit a631424 Jan 27, 2025
2 checks passed
@ltratt ltratt deleted the dont_get_stuck_on_first_miscompile branch January 28, 2025 09:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants