Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 21:01:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1502106 - Add a configure option to disable assume_unreachable spew. r=iain

Browse Source
This commit is contained in:
Nicolas B. Pierron 2018-10-24 15:07:53 +02:00
parent 1204426751
commit cf794f4cfb
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/moz.configure
View File

@ -369,6 +369,18 @@ set_define('JS_JITSPEW',
set_config('JS_JITSPEW',
depends_if('--enable-jitspew')(lambda _: True))
# When enabled, masm will generate assumeUnreachable calls that act as
# assertions in the generated code. This option is worth disabling when you
# have to track mutated values through the generated code, to avoid constantly
# dumping registers on and off the stack.
js_option('--enable-masm-verbose',
default=depends(when=moz_debug)(lambda: True),
help='Enable MacroAssembler verbosity of generated code.')
set_define('JS_MASM_VERBOSE',
depends_if('--enable-masm-verbose')(lambda _: True))
set_config('JS_MASM_VERBOSE',
depends_if('--enable-masm-verbose')(lambda _: True))
js_option('--enable-more-deterministic', env='JS_MORE_DETERMINISTIC',
help='Enable changes that make the shell more deterministic')

12
js/src/jit/MacroAssembler.cpp
View File

@ -2074,7 +2074,7 @@ MacroAssembler::handleFailure()
jump(excTail);
}
#ifdef DEBUG
#ifdef JS_MASM_VERBOSE
static void
AssumeUnreachable_(const char* output) {
MOZ_ReportAssertionFailure(output, __FILE__, __LINE__);
@ -2084,7 +2084,7 @@ AssumeUnreachable_(const char* output) {
void
MacroAssembler::assumeUnreachable(const char* output)
{
#ifdef DEBUG
#ifdef JS_MASM_VERBOSE
if (!IsCompilingWasm()) {
AllocatableRegisterSet regs(RegisterSet::Volatile());
LiveRegisterSet save(regs.asLiveSet());
@ -2119,6 +2119,7 @@ MacroAssembler::assertTestInt32(Condition cond, const T& value, const char* outp
template void MacroAssembler::assertTestInt32(Condition, const Address&, const char*);
#ifdef JS_MASM_VERBOSE
static void
Printf0_(const char* output)
{
@ -2129,10 +2130,12 @@ Printf0_(const char* output)
// output, and it's always unbuffered.
fprintf(stderr, "%s", output);
}
#endif
void
MacroAssembler::printf(const char* output)
{
#ifdef JS_MASM_VERBOSE
AllocatableRegisterSet regs(RegisterSet::Volatile());
LiveRegisterSet save(regs.asLiveSet());
PushRegsInMask(save);
@ -2145,8 +2148,10 @@ MacroAssembler::printf(const char* output)
callWithABI(JS_FUNC_TO_DATA_PTR(void*, Printf0_));
PopRegsInMask(save);
#endif
}
#ifdef JS_MASM_VERBOSE
static void
Printf1_(const char* output, uintptr_t value)
{
@ -2158,10 +2163,12 @@ Printf1_(const char* output, uintptr_t value)
}
fprintf(stderr, "%s", line.get());
}
#endif
void
MacroAssembler::printf(const char* output, Register value)
{
#ifdef JS_MASM_VERBOSE
AllocatableRegisterSet regs(RegisterSet::Volatile());
LiveRegisterSet save(regs.asLiveSet());
PushRegsInMask(save);
@ -2177,6 +2184,7 @@ MacroAssembler::printf(const char* output, Register value)
callWithABI(JS_FUNC_TO_DATA_PTR(void*, Printf1_));
PopRegsInMask(save);
#endif
}
#ifdef JS_TRACE_LOGGING