]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #48583 - dotdash:jt_assume, r=alexcrichton
authorbors <bors@rust-lang.org>
Sat, 3 Mar 2018 14:09:56 +0000 (14:09 +0000)
committerbors <bors@rust-lang.org>
Sat, 3 Mar 2018 14:09:56 +0000 (14:09 +0000)
Backport LLVM fixes for a JumpThreading / assume intrinsic bug

This fixes the original cause of #48116 and restores the assume intrinsic that was removed as a workaround.

r? @alexcrichton

1  2 
src/libcore/slice/mod.rs

Simple merge