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

Fix caching features across backtracking #2484

Merged
merged 1 commit into from
Mar 17, 2016

Conversation

alexcrichton
Copy link
Member

In the local loop during resolution all variables need to be reset whenever we
backtrack up a frame, but currently the method and features set are
accidentally not reset whenever we backtrack. Calculate the method later and
cache features in each frame so we can properly backtrack.

Closes #2472

@alexcrichton
Copy link
Member Author

r? @brson

@rust-highfive
Copy link

r? @wycats

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

@rust-highfive rust-highfive assigned brson and unassigned wycats Mar 14, 2016
In the local loop during resolution all variables need to be reset whenever we
backtrack up a frame, but currently the `method` and `features` set are
accidentally not reset whenever we backtrack. Calculate the `method` later and
cache `features` in each frame so we can properly backtrack.

Closes rust-lang#2472
@brson
Copy link
Contributor

brson commented Mar 16, 2016

@bors r+

@bors
Copy link
Contributor

bors commented Mar 16, 2016

📌 Commit e3b7f2f has been approved by brson

@bors
Copy link
Contributor

bors commented Mar 17, 2016

⌛ Testing commit e3b7f2f with merge 0493b49...

bors added a commit that referenced this pull request Mar 17, 2016
Fix caching features across backtracking

In the local loop during resolution all variables need to be reset whenever we
backtrack up a frame, but currently the `method` and `features` set are
accidentally not reset whenever we backtrack. Calculate the `method` later and
cache `features` in each frame so we can properly backtrack.

Closes #2472
@bors
Copy link
Contributor

bors commented Mar 17, 2016

@bors bors merged commit e3b7f2f into rust-lang:master Mar 17, 2016
@alexcrichton alexcrichton deleted the fix-bad-backtrack branch March 28, 2016 05:52
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.

5 participants