Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-02 22:37:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1319203: Fix asm.js profiler test; r=me

Browse Source
This commit is contained in:
Benjamin Bouvier 2018-02-09 14:47:10 +01:00
parent fbe7807ab1
commit 3d5c7891a5
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/src/wasm/WasmFrameIter.cpp
View File

@ -1167,6 +1167,7 @@ ProfilingFrameIterator::label() const
// Use the same string for both time inside and under so that the two // Use the same string for both time inside and under so that the two
// entries will be coalesced by the profiler. // entries will be coalesced by the profiler.
// Must be kept in sync with /tools/profiler/tests/test_asm.js
static const char* importJitDescription = "fast exit trampoline (in wasm)"; static const char* importJitDescription = "fast exit trampoline (in wasm)";
static const char* importInterpDescription = "slow exit trampoline (in wasm)"; static const char* importInterpDescription = "slow exit trampoline (in wasm)";
static const char* builtinNativeDescription = "fast exit trampoline to native (in wasm)"; static const char* builtinNativeDescription = "fast exit trampoline to native (in wasm)";

2
tools/profiler/tests/test_asm.js
View File

@ -65,7 +65,7 @@ function run_test() {
Assert.ok(i1 !== -1); Assert.ok(i1 !== -1);
var i2 = stack.indexOf("asmjs_function"); var i2 = stack.indexOf("asmjs_function");
Assert.ok(i2 !== -1); Assert.ok(i2 !== -1);
var i3 = stack.indexOf("FFI trampoline"); var i3 = stack.indexOf("exit trampoline");
Assert.ok(i3 !== -1); Assert.ok(i3 !== -1);
var i4 = stack.indexOf("ffi_function"); var i4 = stack.indexOf("ffi_function");
Assert.ok(i4 !== -1); Assert.ok(i4 !== -1);