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

BUG fuzzing found a bug in the resolver, we need a complete set of conflicts to do backjumping #5988

Merged
merged 22 commits into from
Sep 17, 2018
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
this oddly worked
  • Loading branch information
Eh2406 committed Sep 12, 2018
commit 69e00e838328c09fca2a003cfd7e038a35e044a5
9 changes: 5 additions & 4 deletions src/cargo/core/resolver/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -523,12 +523,13 @@ fn activate_deps_loop(
}
};

// If we're only here for the error messages then we know
// one of our candidate deps will fail, meaning we will
// fail and that none of the backtrack frames will find a
// If we're only here for the error messages
// and we did not use backtracking to explore our deps
// then we know one of our candidate deps will fail,
// meaning we will fail and that none of the backtrack frames will find a
// candidate that will help. Consequently let's clean up the
// no longer needed backtrack frames.
if activate_for_error_message {
if !backtracked && activate_for_error_message {
backtrack_stack.clear();
}

Expand Down