Bug 1204404 - Odin: move assert to avoid assertion failure. r=lth
authorLuke Wagner <luke@mozilla.com>
Mon, 14 Sep 2015 07:04:00 +0200
changeset 262501 c817e82939c6eb3c2bc5700b28fc3c1ed5ef7916
parent 262500 d5eaaf9ba224e6856ec3386a3e2ec2537b34889d
child 262502 2ee63977ebaaa5455371c9fee18b93c7b91bf7a4
push id65048
push usercbook@mozilla.com
push dateTue, 15 Sep 2015 06:40:26 +0000
treeherdermozilla-inbound@7c530c7851cb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerslth
bugs1204404
milestone43.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 1204404 - Odin: move assert to avoid assertion failure. r=lth
js/src/asmjs/AsmJSValidate.cpp
--- a/js/src/asmjs/AsmJSValidate.cpp
+++ b/js/src/asmjs/AsmJSValidate.cpp
@@ -12371,22 +12371,22 @@ CheckModule(ExclusiveContext* cx, AsmJSP
         return false;
 
     if (!CheckModuleProcessingDirectives(m))
         return false;
 
     if (!CheckModuleGlobals(m))
         return false;
 
+    m.startFunctionBodies();
+
 #if !defined(ENABLE_SHARED_ARRAY_BUFFER)
     MOZ_ASSERT(!m.module().hasArrayView() || !m.module().isSharedView());
 #endif
 
-    m.startFunctionBodies();
-
     ScopedJSDeletePtr<ModuleCompileResults> mcd;
     if (!CheckFunctions(m, &mcd))
         return false;
 
     if (!m.finishFunctionBodies(&mcd))
         return false;
 
     if (!CheckFuncPtrTables(m))