[beta] backports by brson · Pull Request #42841 · rust-lang/rust

brson · 2017-06-22T21:31:07Z

I just unilaterally accepted all the non-accepted nominations. Everything picked cleanly.

Still testing locally.

cc @rust-lang/compiler

config.mk is now always read when parsing the configuration to prevent this from reoccurring in the future, hopefully.

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

Fixes rust-lang#42718.

Fixes rust-lang#42552. Fixes rust-lang#42545.

…ence. Fixes rust-lang#42618

This reverts commit 65d0be3.

alexcrichton · 2017-06-22T21:44:20Z

@bors: r+

bors · 2017-06-22T21:44:21Z

📌 Commit fc87577 has been approved by alexcrichton

bors · 2017-06-23T07:37:38Z

⌛ Testing commit fc87577 with merge 0a75a245af2952b94a33f1ca964b76c33a62365b...

bors · 2017-06-23T10:29:54Z

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

Mark-Simulacrum · 2017-06-25T00:51:28Z

....This appears to have passed CI, but bors didn't actually merge as far as I can tell. I guess

@bors r=alexcrichton

bors · 2017-06-25T00:51:28Z

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

This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.
There's another pull request that is currently being tested, blocking this pull request: Make wasm32 buildbot test LLVM backend #42784

bors · 2017-06-25T00:51:29Z

📌 Commit fc87577 has been approved by alexcrichton

Mark-Simulacrum · 2017-06-25T00:59:22Z

Ah, I guess:

@bors retry

bors · 2017-06-25T01:01:27Z

⌛ Testing commit fc87577 with merge cdb1b458470b2f73e5344c96ffa5dfe294614c48...

bors · 2017-06-25T06:42:14Z

💔 Test failed - status-travis

Mark-Simulacrum · 2017-06-25T11:42:01Z

@bors retry

Failure seems spurious:

[01:01:22] failures:
[01:01:22]
[01:01:22] ---- [run-make] run-make/sanitizer-leak stdout ----
[01:01:22]
[01:01:22] error: make failed
[01:01:22] status: exit code: 2
[01:01:22] command: "make"
[01:01:22] stdout:
[01:01:22] ------------------------------------------
[01:01:22] LD_LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/sanitizer-leak.stage2-x86_64-unknown-linux-gnu:/checkout/obj/build/x86_64-unknown-linux-gnu
[01:01:22] /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/sanitizer-leak.stage2-x86_64-unknown-linux-gnu/leak 2>&1 | grep -q 'detected memory leaks'
[01:01:22] Makefile:6: recipe for target 'all' failed
[01:01:22]
[01:01:22] ------------------------------------------
[01:01:22] stderr:
[01:01:22] ------------------------------------------
[01:01:22] make: *** [all] Error 1
[01:01:22]
[01:01:22] ------------------------------------------
[01:01:22]
[01:01:22] thread '[run-make] run-make/sanitizer-leak' panicked at 'explicit panic', /checkout/src/tools/compiletest/src/runtest.rs:2480
[01:01:22] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[01:01:22]
[01:01:22]
[01:01:22] failures:
[01:01:22]     [run-make] run-make/sanitizer-leak
[01:01:22]
[01:01:22] test result: FAILED. 148 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out

bors · 2017-06-25T13:48:51Z

⌛ Testing commit fc87577 with merge 5181b24...

@alexcrichton

[beta] backports - #42785 - #42740 - #42735 - #42728 - #42695 - #42659 - #42634 - #42566 I just unilaterally accepted all the non-accepted nominations. Everything picked cleanly. Still testing locally. cc @rust-lang/compiler r? @alexcrichton

bors · 2017-06-25T17:39:24Z

💔 Test failed - status-travis

Mark-Simulacrum · 2017-06-25T17:40:54Z

@bors retry

os x timeout

bors · 2017-06-25T21:29:10Z

⌛ Testing commit fc87577 with merge 046a91e...

@alexcrichton

[beta] backports - #42785 - #42740 - #42735 - #42728 - #42695 - #42659 - #42634 - #42566 I just unilaterally accepted all the non-accepted nominations. Everything picked cleanly. Still testing locally. cc @rust-lang/compiler r? @alexcrichton

bors · 2017-06-26T02:02:56Z

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

Mark-Simulacrum · 2017-06-26T16:39:59Z

@bors r=alexcrichton retry

bors · 2017-06-26T16:39:59Z

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

There's another pull request that is currently being tested, blocking this pull request: proc_macro: implement TokenTree, TokenKind, hygienic quote!, and other API #40939

bors · 2017-06-26T16:40:00Z

📌 Commit fc87577 has been approved by alexcrichton

alexcrichton · 2017-06-27T00:17:50Z

@bors: p=1

(beta backports)

bors · 2017-06-27T01:06:32Z

⌛ Testing commit fc87577 with merge b14aa411142251273c0a1ec3d4c07b5d4cff855b...

bors · 2017-06-27T02:10:12Z

💔 Test failed - status-travis

Mark-Simulacrum · 2017-06-27T04:05:15Z

Presuming spurious failure, @bors retry

[00:57:26] ---- [run-make] run-make/sanitizer-leak stdout ----
[00:57:26] 	
[00:57:26] error: make failed
[00:57:26] status: exit code: 2
[00:57:26] command: "make"
[00:57:26] stdout:
[00:57:26] ------------------------------------------
[00:57:26] LD_LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/sanitizer-leak.stage2-x86_64-unknown-linux-gnu:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib:" '/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc' --out-dir /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/sanitizer-leak.stage2-x86_64-unknown-linux-gnu -L /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/sanitizer-leak.stage2-x86_64-unknown-linux-gnu  -C opt-level=1 -g -Z sanitizer=leak -Z print-link-args leak.rs | grep -q librustc_lsan
[00:57:26] /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/sanitizer-leak.stage2-x86_64-unknown-linux-gnu/leak 2>&1 | grep -q 'detected memory leaks'
[00:57:26] Makefile:6: recipe for target 'all' failed
[00:57:26] 
[00:57:26] ------------------------------------------
[00:57:26] stderr:
[00:57:26] ------------------------------------------
[00:57:26] make: *** [all] Error 1
[00:57:26] 
[00:57:26] ------------------------------------------
[00:57:26] 
[00:57:26] thread '[run-make] run-make/sanitizer-leak' panicked at 'explicit panic', /checkout/src/tools/compiletest/src/runtest.rs:2480
[00:57:26] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[00:57:26] 
[00:57:26] 
[00:57:26] failures:
[00:57:26]     [run-make] run-make/sanitizer-leak
[00:57:26] 
[00:57:26] test result: �[31mFAILED�(B�[m. 148 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out

bors · 2017-06-27T07:29:49Z

⌛ Testing commit fc87577 with merge c87916d14bbc1dcd1b4f64bb4e076853408ca3ed...

bors · 2017-06-27T09:51:13Z

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

kennytm · 2017-06-27T10:03:28Z

Something's wrong with @bors, 10 minutes and the beta branch is still not updated. The queue's status is "error".

Mark-Simulacrum · 2017-06-27T11:18:51Z

I think @bors doesn't like this pull request. I'm going to try and reopen as a new PR I guess..

Mark-Simulacrum · 2017-06-27T11:21:25Z

I've reopened this as #42927 in the hopes that @bors like it more.

[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.

Mark-Simulacrum and others added 18 commits June 22, 2017 21:18

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.

collector: apply param substs to closures cast to fn items

8551427

Fixes rust-lang#42718.

resolve: fix perf bug.

433450a

Use custom cargo/rustc paths when parsing flags.

d8fd8df

move implied_bounds into regionck

f6e76be

register the obligations from wf::implied_bounds

785e82c

Fixes rust-lang#42552. Fixes rust-lang#42545.

Change the for-loop desugar so the break does not affect type infer…

21b276f

…ence. Fixes rust-lang#42618

Fix formatting and add a test for destruction order of unbound values

8d6d9d1

Fix test formatting

0b1469a

Added more tests

818fa6e

explain purpose of test

7ded8a9

document purpose of test

b568ab6

Create for-loop-unconstrained-element-type-i32-fallback.rs

202263d

remove trailing whitespace

cc273a5

Make the next variable mutable to allow for ref mut in for patterns.

f0a3296

Fix formatting

47ad9e1

Revert "Update jemalloc to 4.5.0"

fc87577

This reverts commit 65d0be3.

rust-highfive assigned alexcrichton Jun 22, 2017

shepmaster added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 23, 2017

Mark-Simulacrum closed this Jun 26, 2017

Mark-Simulacrum reopened this Jun 26, 2017

Mark-Simulacrum closed this Jun 27, 2017

Mark-Simulacrum mentioned this pull request Jun 27, 2017

[beta] backports #42927

Merged

Uh oh!

Conversation

brson commented Jun 22, 2017

Uh oh!

alexcrichton commented Jun 22, 2017

Uh oh!

bors commented Jun 22, 2017

Uh oh!

bors commented Jun 23, 2017

Uh oh!

bors commented Jun 23, 2017

Uh oh!

Mark-Simulacrum commented Jun 25, 2017

Uh oh!

bors commented Jun 25, 2017

Uh oh!

bors commented Jun 25, 2017

Uh oh!

Mark-Simulacrum commented Jun 25, 2017

Uh oh!

bors commented Jun 25, 2017

Uh oh!

bors commented Jun 25, 2017

Uh oh!

Mark-Simulacrum commented Jun 25, 2017

Uh oh!

bors commented Jun 25, 2017

Uh oh!

bors commented Jun 25, 2017

Uh oh!

Mark-Simulacrum commented Jun 25, 2017

Uh oh!

bors commented Jun 25, 2017

Uh oh!

bors commented Jun 26, 2017

Uh oh!

Mark-Simulacrum commented Jun 26, 2017

Uh oh!

bors commented Jun 26, 2017

Uh oh!

bors commented Jun 26, 2017

Uh oh!

alexcrichton commented Jun 27, 2017

Uh oh!

bors commented Jun 27, 2017

Uh oh!

bors commented Jun 27, 2017

Uh oh!

Mark-Simulacrum commented Jun 27, 2017

Uh oh!

bors commented Jun 27, 2017

Uh oh!

bors commented Jun 27, 2017

Uh oh!

kennytm commented Jun 27, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Mark-Simulacrum commented Jun 27, 2017

Uh oh!

Mark-Simulacrum commented Jun 27, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

kennytm commented Jun 27, 2017 •

edited

Loading