Rollup merge of rust-lang#46401 - alexcrichton:wasm-tests, r=arielb1

wasm: Update LLVM to fix a test This commit updates LLVM with some tweaks to the integer <-> floating point conversion instructions to ensure that `as` in Rust doesn't trap. Closes rust-lang#46298
kennytm · Dec 1, 2017 · bd5a4af · bd5a4af
2 parents b86a47f + 666bb90
commit bd5a4af
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/llvm b/src/llvm
diff --git a/src/test/run-pass/saturating-float-casts.rs b/src/test/run-pass/saturating-float-casts.rs
@@ -10,7 +10,6 @@
 
 // Tests saturating float->int casts. See u128-as-f32.rs for the opposite direction.
 // compile-flags: -Z saturating-float-casts
-// ignore-wasm32-bare FIXME(#46298) needs upstream llvm fixes
 
 #![feature(test, i128, i128_type, stmt_expr_attributes)]
 #![deny(overflowing_literals)]
+7 −2		lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCCodeEmitter.cpp
+4 −0		lib/Target/WebAssembly/WebAssembly.td
+155 −0		lib/Target/WebAssembly/WebAssemblyISelLowering.cpp
+3 −0		lib/Target/WebAssembly/WebAssemblyISelLowering.h
+72 −16		lib/Target/WebAssembly/WebAssemblyInstrConv.td
+8 −0		lib/Target/WebAssembly/WebAssemblyInstrInfo.td
+7 −0		lib/Target/WebAssembly/WebAssemblyLowerBrUnless.cpp
+2 −1		lib/Target/WebAssembly/WebAssemblySubtarget.cpp
+2 −0		lib/Target/WebAssembly/WebAssemblySubtarget.h
+167 −0		test/CodeGen/WebAssembly/conv-trap.ll
+12 −8		test/CodeGen/WebAssembly/conv.ll