Bug 1286517: Fix assertion in ARM's codegen; r=luke over irc;
☠☠ backed out by 86f32ce6a344 ☠ ☠
authorBenjamin Bouvier <benj@benj.me>
Wed, 20 Jul 2016 19:47:13 +0200
changeset 305928 f4f17f746d1013fc179b8eefa7360e9838e93a60
parent 305927 4d06c9ff66cf7ef8c1a563ba4860bb12ac89c85e
child 305929 903eba9d0ef1cdb6e19de89cc824738447262ab3
push id30474
push usercbook@mozilla.com
push dateThu, 21 Jul 2016 14:25:10 +0000
treeherdermozilla-central@6b180266ac16 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersluke
bugs1286517
milestone50.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1286517: Fix assertion in ARM's codegen; r=luke over irc; MozReview-Commit-ID: H2d8T3ZVqqy
js/src/jit/arm/CodeGenerator-arm.cpp
--- a/js/src/jit/arm/CodeGenerator-arm.cpp
+++ b/js/src/jit/arm/CodeGenerator-arm.cpp
@@ -2709,28 +2709,26 @@ CodeGeneratorARM::visitWasmLoadGlobalVar
         masm.ma_vldr(Address(GlobalReg, addr), ToFloatRegister(ins->output()));
     }
 }
 
 void
 CodeGeneratorARM::visitWasmStoreGlobalVar(LWasmStoreGlobalVar* ins)
 {
     const MWasmStoreGlobalVar* mir = ins->mir();
-
     MIRType type = mir->value()->type();
-    MOZ_ASSERT(IsNumberType(type));
 
     unsigned addr = mir->globalDataOffset() - AsmJSGlobalRegBias;
     if (type == MIRType::Int32) {
         masm.ma_dtr(IsStore, GlobalReg, Imm32(addr), ToRegister(ins->value()));
     } else if (type == MIRType::Float32) {
         VFPRegister vd(ToFloatRegister(ins->value()));
         masm.ma_vstr(vd.singleOverlay(), Address(GlobalReg, addr));
     } else {
-        MOZ_ASSERT(mir->type() == MIRType::Double);
+        MOZ_ASSERT(type == MIRType::Double);
         masm.ma_vstr(ToFloatRegister(ins->value()), Address(GlobalReg, addr));
     }
 }
 
 void
 CodeGeneratorARM::visitAsmJSLoadFuncPtr(LAsmJSLoadFuncPtr* ins)
 {
     const MAsmJSLoadFuncPtr* mir = ins->mir();