Query panic!() to useful diagnostic #119086

RossSmyth · 2023-12-18T16:43:18Z

Changes some more ICEs from bare panic!()s

Adds an expect_job() helper method as that is a moral equivalent of what was happening at the uses.

re:#118955

rustbot · 2023-12-18T16:43:27Z

r? @davidtwco

(rustbot has picked a reviewer for you, use r? to override)

compiler/rustc_query_system/src/query/plumbing.rs

RossSmyth · 2023-12-18T20:44:12Z

In the same vein as #118955 FatalError.raise() is very similar to a non-descriptive panic. So if we want these to have nicer messages then FatalError.raise() will probably need the same treatment as panic!(). The main difference in handling is that there are a couple instances where panics are caught, and they have some special handling. I mainly converted these over to normalize them when I was able to.

rust/compiler/rustc_query_system/src/dep_graph/mod.rs

Lines 63 to 65 in 2a76340

    
           if !value.is::<rustc_errors::FatalErrorMarker>() { 
        
               print_markframe_trace(self.dep_graph(), frame); 
        
           }

RossSmyth · 2023-12-19T01:35:06Z

I see, so there are well defined errors that occur that will lead to a query being poisoned, then when checked they will be QueryResult::Poisoned, so then it leads to the panic message and stacktrace, which FatalError does not have.

So as I have it right now it is useful for compiler bugs, but not useful for user-facing errors like those testing as it may be more confusing.

I don't know enough about the query system to say if those are actually mutually exclusive. Maybe there's a way to signal there's a graceful error? Maybe a new QueryResult variant, and setting it in the JobOwner drop on some condition?

compiler/rustc_query_system/src/query/plumbing.rs

davidtwco · 2024-01-03T13:28:05Z

@bors r+ rollup

bors · 2024-01-03T13:28:08Z

📌 Commit abe9c14 has been approved by davidtwco

It is now in the queue for this repository.

bors · 2024-01-03T13:28:09Z

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

Query panic!() to useful diagnostic Changes some more ICEs from bare panic!()s Adds an `expect_job()` helper method as that is a moral equivalent of what was happening at the uses. re:rust-lang#118955

fmease · 2024-01-03T14:41:12Z

10 commits for a +21/-11 diff is quite a lot. I've already rolled it up but I think that this should've been squashed 🙈

compiler-errors · 2024-01-03T14:42:24Z

Wait yes, please squash this

@bors r-

RossSmyth · 2024-01-03T14:56:52Z

Okie dokie, forgot about this

compiler-errors · 2024-01-03T14:58:23Z

@bors r+

bors · 2024-01-03T14:58:25Z

📌 Commit 0d421c5 has been approved by compiler-errors

It is now in the queue for this repository.

bors · 2024-01-03T14:58:26Z

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

Rollup of 21 pull requests Successful merges: - rust-lang#119086 (Query panic!() to useful diagnostic) - rust-lang#119239 (Remove unnecessary arm in `check_expr_yield`) - rust-lang#119298 (suppress change-tracker warnings in CI containers) - rust-lang#119319 (Document that File does not buffer reads/writes) - rust-lang#119434 (rc: Take *const T in is_dangling) - rust-lang#119444 (Rename `TyCtxt::is_closure` to `TyCtxt::is_closure_or_coroutine`) - rust-lang#119474 (Update tracking issue of naked_functions) - rust-lang#119476 (Pretty-print always-const trait predicates correctly) - rust-lang#119477 (rustdoc ui: adjust tooltip z-index to be above sidebar) - rust-lang#119479 (Remove two unused feature gates from rustc_query_impl) - rust-lang#119487 (Minor improvements in comment on `freshen.rs`) - rust-lang#119492 (Update books) - rust-lang#119494 (Deny defaults for higher-ranked generic parameters) - rust-lang#119498 (Update deadlinks of `strict_provenance` lints) - rust-lang#119505 (Don't synthesize host effect params for trait associated functions marked const) - rust-lang#119510 (Report I/O errors from rmeta encoding with emit_fatal) - rust-lang#119512 (Mark myself as back from leave) - rust-lang#119514 (coverage: Avoid a query stability hazard in `function_coverage_map`) - rust-lang#119523 (llvm: Allow `noundef` in codegen tests) - rust-lang#119534 (Update `thread_local` examples to use `local_key_cell_methods`) - rust-lang#119544 (Fix: Properly set vendor in i686-win7-windows-msvc target) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#119086 - RossSmyth:query_panics, r=compiler-errors Query panic!() to useful diagnostic Changes some more ICEs from bare panic!()s Adds an `expect_job()` helper method as that is a moral equivalent of what was happening at the uses. re:rust-lang#118955

Zoxc · 2024-01-10T00:39:11Z

compiler/rustc_query_system/src/query/plumbing.rs

-                        // The query we waited on panicked. Continue unwinding here.
-                        Some(QueryResult::Poisoned) => FatalError.raise(),
+                        Some(QueryResult::Poisoned) => {
+                            panic!("query '{}' not cached due to poisoning", query.name())


This branch now introduces a panic, which is not correct.

Don't panic when waiting on poisoned queries This fixes a bug introduced in rust-lang#119086.

Rollup merge of rust-lang#121913 - Zoxc:query-fix, r=compiler-errors Don't panic when waiting on poisoned queries This fixes a bug introduced in rust-lang#119086.

rustbot assigned davidtwco Dec 18, 2023

RossSmyth changed the title ~~Query panic!()~~ Query panic!() to FatalError Dec 18, 2023

compiler-errors requested changes Dec 18, 2023

View reviewed changes

compiler/rustc_query_system/src/query/plumbing.rs Outdated Show resolved Hide resolved

compiler/rustc_query_system/src/query/plumbing.rs Outdated Show resolved Hide resolved

compiler/rustc_query_system/src/query/plumbing.rs Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

RossSmyth changed the title ~~Query panic!() to FatalError~~ Query panic!() to useful diagnostic Dec 18, 2023

RossSmyth requested a review from compiler-errors December 19, 2023 00:57

This comment has been minimized.

Sign in to view

RossSmyth commented Dec 19, 2023

View reviewed changes

compiler/rustc_query_system/src/query/plumbing.rs Outdated Show resolved Hide resolved

compiler-errors requested changes Dec 19, 2023

View reviewed changes

This comment has been minimized.

Sign in to view

RossSmyth requested a review from compiler-errors December 21, 2023 15:54

davidtwco approved these changes Jan 3, 2024

View reviewed changes

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 Jan 3, 2024

fmease mentioned this pull request Jan 3, 2024

Rollup of 21 pull requests #119547

Closed

bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 3, 2024

bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jan 3, 2024

Add useful panic messages if queries fail to start

0d421c5

RossSmyth force-pushed the query_panics branch from abe9c14 to 0d421c5 Compare January 3, 2024 14:56

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

fmease mentioned this pull request Jan 3, 2024

Rollup of 21 pull requests #119549

Merged

bors merged commit 093bd08 into rust-lang:master Jan 3, 2024
11 checks passed

rustbot added this to the 1.77.0 milestone Jan 3, 2024

RossSmyth deleted the query_panics branch January 3, 2024 20:35

matthiaskrgr mentioned this pull request Jan 9, 2024

ICE: query 'typeck' not cached due to poisoning #119784

Open

Zoxc reviewed Jan 10, 2024

View reviewed changes

Zoxc mentioned this pull request Mar 2, 2024

Don't panic when waiting on poisoned queries #121913

Merged

jhpratt added a commit to jhpratt/rust that referenced this pull request Mar 5, 2024

Rollup merge of rust-lang#121913 - Zoxc:query-fix, r=compiler-errors

0a6b60b

Don't panic when waiting on poisoned queries This fixes a bug introduced in rust-lang#119086.

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 5, 2024

Rollup merge of rust-lang#121913 - Zoxc:query-fix, r=compiler-errors

c8798c0

Don't panic when waiting on poisoned queries This fixes a bug introduced in rust-lang#119086.

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 5, 2024

Rollup merge of rust-lang#121913 - Zoxc:query-fix, r=compiler-errors

c483e63

Don't panic when waiting on poisoned queries This fixes a bug introduced in rust-lang#119086.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Query panic!() to useful diagnostic #119086

Query panic!() to useful diagnostic #119086

RossSmyth commented Dec 18, 2023 •

edited

Loading

rustbot commented Dec 18, 2023

RossSmyth commented Dec 18, 2023 •

edited

Loading

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

RossSmyth commented Dec 19, 2023 •

edited

Loading

This comment has been minimized.

davidtwco commented Jan 3, 2024

bors commented Jan 3, 2024

bors commented Jan 3, 2024

fmease commented Jan 3, 2024

compiler-errors commented Jan 3, 2024

RossSmyth commented Jan 3, 2024

compiler-errors commented Jan 3, 2024

bors commented Jan 3, 2024

bors commented Jan 3, 2024

Zoxc Jan 10, 2024

Query panic!() to useful diagnostic #119086

Query panic!() to useful diagnostic #119086

Conversation

RossSmyth commented Dec 18, 2023 • edited Loading

rustbot commented Dec 18, 2023

RossSmyth commented Dec 18, 2023 • edited Loading

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

RossSmyth commented Dec 19, 2023 • edited Loading

This comment has been minimized.

davidtwco commented Jan 3, 2024

bors commented Jan 3, 2024

bors commented Jan 3, 2024

fmease commented Jan 3, 2024

compiler-errors commented Jan 3, 2024

RossSmyth commented Jan 3, 2024

compiler-errors commented Jan 3, 2024

bors commented Jan 3, 2024

bors commented Jan 3, 2024

Zoxc Jan 10, 2024

Choose a reason for hiding this comment

RossSmyth commented Dec 18, 2023 •

edited

Loading

RossSmyth commented Dec 18, 2023 •

edited

Loading

RossSmyth commented Dec 19, 2023 •

edited

Loading