mozilla-central: changeset 315898:a878585ab51022ffd457d5b4e2a7686f0b72c3f7

author	h4writer <hv1989@gmail.com>
	Thu, 29 Sep 2016 22:33:22 +0200
changeset 315898	a878585ab51022ffd457d5b4e2a7686f0b72c3f7
parent 315897	7d6daefd4e7963157897ebfefc5d16d8304b752c
child 315899	3a11c6866c92cc85911e9baa951f7f7b4c762c23
push id	30757
push user	cbook@mozilla.com
push date	Fri, 30 Sep 2016 10:02:43 +0000
treeherder	mozilla-central@5ffed033557e [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	lth
bugs	1301400
milestone	52.0a1
first release with	nightly linux32 87cd291d2db6 / 52.0a1 / 20161001030430 / files nightly linux64 87cd291d2db6 / 52.0a1 / 20161001030430 / files nightly mac 87cd291d2db6 / 52.0a1 / 20161001030430 / files nightly win32 87cd291d2db6 / 52.0a1 / 20161001030430 / files nightly win64 87cd291d2db6 / 52.0a1 / 20161001030430 / files
last release without	nightly linux32 f7d5008ee2ab / 52.0a1 / 20160929030426 / files nightly linux64 f7d5008ee2ab / 52.0a1 / 20160929030426 / files nightly mac f7d5008ee2ab / 52.0a1 / 20160929030426 / files nightly win32 f7d5008ee2ab / 52.0a1 / 20160929030426 / files nightly win64 f7d5008ee2ab / 52.0a1 / 20160929030426 / files

--- a/js/src/asmjs/WasmBaselineCompile.cpp
+++ b/js/src/asmjs/WasmBaselineCompile.cpp
@@ -1399,17 +1399,18 @@ class BaseCompiler
           case Stk::ConstI64:
           case Stk::LocalI64:
             loadI64(r.reg, v);
             break;
           case Stk::MemI64:
 #ifdef JS_PUNBOX64
             masm.Pop(r.reg.reg);
 #else
-            MOZ_CRASH("BaseCompiler platform hook: popI64");
+            masm.Pop(r.reg.low);
+            masm.Pop(r.reg.high);
 #endif
             break;
           case Stk::RegisterI64:
             moveI64(v.i64reg(), r);
             break;
           case Stk::None:
             // See popI32()
             break;