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

Revert ObligationForest on beta branch #31851

Merged
merged 1 commit into from
Feb 25, 2016

Conversation

nikomatsakis
Copy link
Contributor

The OF caused a regression in compiler performance and backporting the fix
to beta was deemed too risky and too challenging, since it is
non-trivial and builds on prior commits in various ways.

…, r=aturon"

This reverts commit c14b615, reversing
changes made to dda25f2.

This caused a regression in compiler performance and backporting the fix
to beta was deemed too risky and too challenging, since it is
non-trivial and builds on prior commits in various ways.

Conflicts:
	src/librustc/middle/traits/fulfill.rs
	src/librustc_data_structures/lib.rs
@rust-highfive
Copy link
Contributor

r? @arielb1

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

@rust-highfive
Copy link
Contributor

warning Warning warning

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@nikomatsakis
Copy link
Contributor Author

Hmm, local testing of this PR has encountered some odd failures (e.g., a segfault just now in the libcollections tests).

But I am sort of reluctant to blame it on this PR to be honest.

@brson
Copy link
Contributor

brson commented Feb 24, 2016

I'm testing locally.

@nikomatsakis
Copy link
Contributor Author

Actually, I see the same problem whether or not this commit is applied:

test str::test_into_bytes ... ok
test str::test_empty_match_indices ... ok
test str::test_find_str ... ok
Illegal instruction (core dumped)
make: *** [tmp/check-stage2-T-x86_64-unknown-linux-gnu-H-x86_64-unknown-linux-gnu-collectionstest.ok] Error 132

@brson
Copy link
Contributor

brson commented Feb 24, 2016

I don't see the crash locally.

@nikomatsakis
Copy link
Contributor Author

OK, I don't know what's happening locally, but I'm inclined to take this PR.

brson added a commit that referenced this pull request Feb 25, 2016
Revert ObligationForest on beta branch
@brson brson merged commit edf0d32 into rust-lang:beta Feb 25, 2016
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.

4 participants