Auto merge of #115198 - Zoxc:query-panic-wait, r=cjgillot · RalfJung/miri@1661b58 · GitHub

Commit

Auto merge of #115198 - Zoxc:query-panic-wait, r=cjgillot

Browse files

Fix waiting on a query that panicked

This fixes waiting on a query that panicked. The code now looks for `QueryResult::Poisoned` in the query state in addition to the query cache. This fixes rust-lang/rust#111528.

r? `@cjgillot`

Loading branch information

bors committed Aug 26, 2023

2 parents 2b1be4c + 5a9ce7f commit 1661b58