Bug 1254131: Fix non-unified wasm build. r=luke
authorBenjamin Bouvier <benj@benj.me>
Mon, 07 Mar 2016 16:06:26 +0100
changeset 324969 8b653b2c71f53c25e84ed10f1117a46f12280b19
parent 324968 8807d361cda3b85c40a7faadb1f3dcee7711bae4
child 324970 05cef11d91beeb0a2f270497ec1a4ee409972db1
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersluke
bugs1254131
milestone47.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 1254131: Fix non-unified wasm build. r=luke MozReview-Commit-ID: 3TO17DGdk1K
js/src/asmjs/WasmGenerator.cpp
--- a/js/src/asmjs/WasmGenerator.cpp
+++ b/js/src/asmjs/WasmGenerator.cpp
@@ -328,17 +328,17 @@ ModuleGenerator::finishTask(IonCompileTa
         uint32_t n = func.index() - funcIndexToCodeRange_.length() + 1;
         if (!funcIndexToCodeRange_.appendN(BadCodeRange, n))
             return false;
     }
     MOZ_ASSERT(!funcIsDefined(func.index()));
     funcIndexToCodeRange_[func.index()] = funcCodeRangeIndex;
 
     // Merge the compiled results into the whole-module masm.
-    DebugOnly<size_t> sizeBefore = masm_.size();
+    mozilla::DebugOnly<size_t> sizeBefore = masm_.size();
     if (!masm_.asmMergeWith(results.masm()))
         return false;
     MOZ_ASSERT(masm_.size() == offsetInWhole + results.masm().size());
 
     // Keep a record of slow functions for printing in the final console message.
     unsigned totalTime = func.generateTime() + results.compileTime();
     if (totalTime >= SlowFunction::msThreshold) {
         if (!slowFuncs_.emplaceBack(func.index(), totalTime, func.lineOrBytecode()))