Skip to content

Revert ObligationForest on beta branch - #31851

Merged
brson merged 1 commit into
rust-lang:betafrom
nikomatsakis:backport-pr-31349
Feb 25, 2016
Merged

brson merged 1 commit into
rust-lang:betafrom
nikomatsakis:backport-pr-31349

Conversation

@nikomatsakis

Copy link
Copy Markdown
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
Copy Markdown
Contributor

r? @arielb1

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

@rust-highfive

Copy link
Copy Markdown
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
Copy Markdown
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

brson commented Feb 24, 2016

Copy link
Copy Markdown
Contributor

I'm testing locally.

@nikomatsakis

Copy link
Copy Markdown
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

brson commented Feb 24, 2016

Copy link
Copy Markdown
Contributor

I don't see the crash locally.

@nikomatsakis

Copy link
Copy Markdown
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