Bug 1319203: Also rename "entry trampoline" to "slow entry trampoline" in wasm tests; r=me
authorBenjamin Bouvier <benj@benj.me>
Thu, 09 Nov 2017 13:47:07 +0100
changeset 444213 37a03f25e750e71f1006aa56fd67b049a0e72057
parent 444212 0422da76e0f6506e8d50d39c445a4eb25e4b7807
child 444214 486620c2345ab558d0507c14a19e49f631b8347f
push id1618
push userCallek@gmail.com
push dateThu, 11 Jan 2018 17:45:48 +0000
treeherdermozilla-release@882ca853e05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1319203
milestone58.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 1319203: Also rename "entry trampoline" to "slow entry trampoline" in wasm tests; r=me
js/src/jit-test/tests/asm.js/testProfiling.js
js/src/jit-test/tests/wasm/profiling.js
--- a/js/src/jit-test/tests/asm.js/testProfiling.js
+++ b/js/src/jit-test/tests/asm.js/testProfiling.js
@@ -35,17 +35,17 @@ function assertStackContainsSeq(got, exp
             continue;
         var parts = got[i].split(',');
         for (var j = 0; j < parts.length; j++) {
             var frame = parts[j];
             frame = frame.replace(/ \([^\)]*\)/g, "");
             frame = frame.replace(/fast FFI trampoline to native/g, "N");
             frame = frame.replace(/^call to( asm.js)? native .*\(in wasm\)$/g, "N");
             frame = frame.replace(/(fast|slow) FFI trampoline/g, "<");
-            frame = frame.replace(/entry trampoline/g, ">");
+            frame = frame.replace(/slow entry trampoline/g, ">");
             frame = frame.replace(/(\/[^\/,<]+)*\/testProfiling.js/g, "");
             frame = frame.replace(/testBuiltinD2D/g, "");
             frame = frame.replace(/testBuiltinF2F/g, "");
             frame = frame.replace(/testBuiltinDD2D/g, "");
             frame = frame.replace(/assertThrowsInstanceOf/g, "");
             frame = frame.replace(/^ffi[12]?/g, "");
             normalized.push(frame);
         }
--- a/js/src/jit-test/tests/wasm/profiling.js
+++ b/js/src/jit-test/tests/wasm/profiling.js
@@ -8,17 +8,17 @@ try {
 
 const Module = WebAssembly.Module;
 const Instance = WebAssembly.Instance;
 const Table = WebAssembly.Table;
 
 function normalize(stack)
 {
     var wasmFrameTypes = [
-        {re:/^entry trampoline \(in wasm\)$/,                        sub:">"},
+        {re:/^slow entry trampoline \(in wasm\)$/,                   sub:">"},
         {re:/^wasm-function\[(\d+)\] \(.*\)$/,                       sub:"$1"},
         {re:/^(fast|slow) FFI trampoline (to native )?\(in wasm\)$/, sub:"<"},
         {re:/^call to[ asm.js]? native (.*) \(in wasm\)$/,           sub:"$1"},
         {re:/ \(in wasm\)$/,                                         sub:""}
     ];
 
     var framesIn = stack.split(',');
     var framesOut = [];