Skip to content

create a "provisional cache" to restore performance in the case of cycles #61754

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.

Sign up for GitHub

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

Merged
merged 12 commits into from
Jun 16, 2019
Merged

create a "provisional cache" to restore performance in the case of cycles #61754

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
db1dfb2
rename `evaluate_obligation_recursively`
nikomatsakis Jun 4, 2019
e64a7bf
introduce a stack depth
nikomatsakis Jun 6, 2019
5486a86
propagate depth that was reached, not just whether there was a cycle
nikomatsakis Jun 10, 2019
35f5ef6
execute cycle check before we consider caching
nikomatsakis Jun 10, 2019
c86f948
introduce ProvisionalEvaluationCache
nikomatsakis Jun 10, 2019
a1a8a7b
add in a depth-first number for stack entries
nikomatsakis Jun 10, 2019
9639d8e
add the "provisional cache"
nikomatsakis Jun 11, 2019
6fdcc82
remove hacks that are no longer needed
nikomatsakis Jun 11, 2019
59f5045
add more debug logs
nikomatsakis Jun 12, 2019
cb8158d
correctly set the `reached_depth` field
nikomatsakis Jun 12, 2019
bb97fe0
revert change incorrectly identified as "hack"
pnkfelix Jun 13, 2019
0baa925
put back the workarounds for #60846
pnkfelix Jun 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/librustc/traits/query/evaluate_obligation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ impl<'cx, 'gcx, 'tcx> InferCtxt<'cx, 'gcx, 'tcx> {
Err(OverflowError) => {
let mut selcx =
SelectionContext::with_query_mode(&self, TraitQueryMode::Standard);
selcx.evaluate_obligation_recursively(obligation)
selcx.evaluate_root_obligation(obligation)
.unwrap_or_else(|r| {
span_bug!(
obligation.cause.span,
Expand Down
Loading