Skip to content

[beta] backports #42927

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

Jump to bottom
Merged
merged 18 commits into from
Jun 27, 2017
Merged

[beta] backports #42927

merged 18 commits into from
Jun 27, 2017

Conversation

Mark-Simulacrum
Copy link
Member

Mark-Simulacrum and others added 18 commits June 22, 2017 21:18
@Mark-Simulacrum @brson
Fixes bootstrapping with custom cargo/rustc.
d687176 
config.mk is now always read when parsing the configuration to prevent
this from reoccurring in the future, hopefully.
@arielb1 @brson
Backport fixes to LLVM 4.0 ARM codegen bugs
d9b47c3 
So ARM had quite a few codegen bugs on LLVM 4.0 which are fixed on LLVM
trunk. This backports 5 of them:
r297871 - ARM: avoid clobbering register in v6 jump-table expansion.
    - fixes rust-lang#42248
r294949 - [Thumb-1] TBB generation: spot redefinitions of index
r295816 - [ARM] Fix constant islands pass.
r300870 - [Thumb-1] Fix corner cases for compressed jump tables
r302650 - [IfConversion] Add missing check in
IfConversion/canFallThroughTo
    - unblocks rust-lang#39409
@arielb1 @brson
collector: apply param substs to closures cast to fn items
8551427 
Fixes rust-lang#42718.
@jseyfried @brson
resolve: fix perf bug.
433450a
@Mark-Simulacrum @brson
Use custom cargo/rustc paths when parsing flags.
d8fd8df
@nikomatsakis @brson
move implied_bounds into regionck
f6e76be
@nikomatsakis @brson
register the obligations from wf::implied_bounds
785e82c 
Fixes rust-lang#42552.
Fixes rust-lang#42545.
@Zoxc @brson
Change the for-loop desugar so the break does not affect type infer…
21b276f 
…ence. Fixes rust-lang#42618
@Zoxc @brson
Fix formatting and add a test for destruction order of unbound values
8d6d9d1
@Zoxc @brson
Fix test formatting
0b1469a
@Zoxc @brson
Added more tests
818fa6e
@nikomatsakis @brson
explain purpose of test
7ded8a9
@nikomatsakis @brson
document purpose of test
b568ab6
@nikomatsakis @brson
Create for-loop-unconstrained-element-type-i32-fallback.rs
202263d
@nikomatsakis @brson
remove trailing whitespace
cc273a5
@Zoxc @brson
Make the next variable mutable to allow for ref mut in for patterns.
f0a3296
@Zoxc @brson
Fix formatting
47ad9e1
@arthurprs @brson
Revert "Update jemalloc to 4.5.0"
fc87577 
This reverts commit 65d0be3.
@rust-highfive
Copy link
Contributor

r? @arielb1

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

@Mark-Simulacrum
Copy link
Member Author

@bors r=alexcrichton p=1

(The other PR was approved already)

@bors
Copy link
Collaborator

bors commented Jun 27, 2017

📌 Commit fc87577 has been approved by alexcrichton

@bors
Copy link
Collaborator

bors commented Jun 27, 2017

⌛ Testing commit fc87577 with merge 665f8dc28a83bad2c34641d14e637e8fc90cb661...

@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Jun 27, 2017
Closed
@bors
Copy link
Collaborator

bors commented Jun 27, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 665f8dc28a83bad2c34641d14e637e8fc90cb661 to beta...

@Mark-Simulacrum
Copy link
Member Author

@bors force clean retry

@Mark-Simulacrum
Copy link
Member Author

@bors r-
@bors r+
@bors retry

@bors
Copy link
Collaborator

bors commented Jun 27, 2017

💡 This pull request was already approved, no need to approve it again.

@bors
Copy link
Collaborator

bors commented Jun 27, 2017

📌 Commit fc87577 has been approved by Mark-Simulacrum

@Mark-Simulacrum
Copy link
Member Author

Actually, I think I remember now -- we disabled force(?) pushes to the beta branch, which is why this is having problems I think. I'll r- for now, we should do that and then r+ this. @alexcrichton -- can you do that? Also pinged on IRC.

@bors r-

@Mark-Simulacrum
Copy link
Member Author

@bors r=alexcrichton p=1

@bors
Copy link
Collaborator

bors commented Jun 27, 2017

📌 Commit fc87577 has been approved by alexcrichton

@bors
Copy link
Collaborator

bors commented Jun 27, 2017

⌛ Testing commit fc87577 with merge 9987ed4...

bors added a commit that referenced this pull request Jun 27, 2017
@bors
Auto merge of #42927 - brson:beta-next, r=alexcrichton
9987ed4 
[beta] backports

Reopening #42841 as a new PR due to bors flakiness.

- #42785
- #42740
- #42735
- #42728
- #42695
- #42659
- #42634
- #42566

I just unilaterally accepted all the non-accepted nominations. Everything picked cleanly.
@bors
Copy link
Collaborator

bors commented Jun 27, 2017

💔 Test failed - status-travis

@Mark-Simulacrum
Copy link
Member Author

Hm, that's the sanitizer leak failure again. I'm suspicious, but still think that it's spurious. Let's try one more time.

@bors retry

@bors
Copy link
Collaborator

bors commented Jun 27, 2017

⌛ Testing commit fc87577 with merge 2abccac...

bors added a commit that referenced this pull request Jun 27, 2017
@bors
Auto merge of #42927 - brson:beta-next, r=alexcrichton
2abccac 
[beta] backports

Reopening #42841 as a new PR due to bors flakiness.

- #42785
- #42740
- #42735
- #42728
- #42695
- #42659
- #42634
- #42566

I just unilaterally accepted all the non-accepted nominations. Everything picked cleanly.
@arielb1 arielb1 added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 27, 2017
@bors bors mentioned this pull request Jun 27, 2017
Merged
@bors
Copy link
Collaborator

bors commented Jun 27, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 2abccac to beta...

@bors bors merged commit fc87577 into rust-lang:beta Jun 27, 2017
@arielb1 arielb1 mentioned this pull request Jun 28, 2017
Merged
@nikomatsakis nikomatsakis mentioned this pull request Jun 29, 2017
Closed
bors added a commit that referenced this pull request Jun 30, 2017
@bors
Auto merge of #42948 - arielb1:beta-arm, r=alexcrichton
3cbe8f9 
[beta] rebase LLVM on top of 4.0.1

This backports fixes several codegen bugs, including #42893.

This also un-commits the introduction of #42750 (the StackColoring improvement) to beta. That seemed to have occurred by accident in #42927, but I'm not comfortable with sneaking a subtle codegen change like this to beta.

r? @alexcrichton
@nikomatsakis nikomatsakis mentioned this pull request Jul 7, 2017
Closed
@brson brson mentioned this pull request Jul 7, 2017
Merged
bors added a commit that referenced this pull request Jul 7, 2017
@bors
Auto merge of #43113 - brson:beta-bump, r=Mark-Simulacrum
4b6f4f3 
[beta] Bump prerelease version

There are some more backports left to do, but I figure it's best to get this bump in so we can release [this massive set of backports](#42927).

r? @Mark-Simulacrum

p=1 maybe
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@arielb1 arielb1

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@Mark-Simulacrum @rust-highfive @bors @arielb1 @jseyfried @nikomatsakis @Zoxc @arthurprs