about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-06-19 01:31:31 +0000
committerbors <bors@rust-lang.org>2017-06-19 01:31:31 +0000
commit8e26c0eb38c72d628d70c0d4b0696b4a16ed04e8 (patch)
treef5ff66f1475073bed9879bb0fcf3311ba96c6563
parent30322efee2fd82140dc4b05c12eeb3bf624a7ea8 (diff)
parent207951b1699e426829296721adf668117294a580 (diff)
Auto merge of #42740 - arielb1:bad-arm-2, r=alexcrichton
Backport fixes to LLVM 4.0 ARM codegen bugs

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/rust#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/rust#39409

r? @alexcrichton
beta-nominating because this fixes regressions introduced by LLVM 4.0.
m---------src/llvm0
-rw-r--r--src/rustllvm/llvm-rebuild-trigger2
2 files changed, 1 insertions, 1 deletions
diff --git a/src/llvm b/src/llvm
-Subproject ee545e1d13e6f2191572aebcadb7d1640ce45c6
+Subproject 5415ff0264c134152cca65ae8f5d50b356d6116
diff --git a/src/rustllvm/llvm-rebuild-trigger b/src/rustllvm/llvm-rebuild-trigger
index b2746bb6e68..792b496f1db 100644
--- a/src/rustllvm/llvm-rebuild-trigger
+++ b/src/rustllvm/llvm-rebuild-trigger
@@ -1,4 +1,4 @@
 # If this file is modified, then llvm will be (optionally) cleaned and then rebuilt.
 # The actual contents of this file do not matter, but to trigger a change on the
 # build bots then the contents should be changed so git updates the mtime.
-2017-06-03
+2017-06-18