diff options
| author | jBarz <jbarboza@ca.ibm.com> | 2017-09-08 06:31:41 -0400 |
|---|---|---|
| committer | Myles Borins <mylesborins@google.com> | 2017-09-19 10:02:16 -0400 |
| commit | 4e1a50a079b5e0c6f5e7baeae7f1381a69cba1d0 (patch) | |
| tree | df246f32435eaee2f48e255e8792e79f2e092c4f /deps | |
| parent | f8b85e16cdb90cee350ce122dcb9ac93485c1ad0 (diff) | |
| download | node-new-4e1a50a079b5e0c6f5e7baeae7f1381a69cba1d0.tar.gz | |
deps: backport 0353a1e from V8 upstream
Original commit message:
Avoid disassembling Interpreted Regexp code
I found that v8 will crash when --print-code is turned on while Regexp
is interpreted. It crashes when trying to print Relocation info during
Disassembly. It should probably avoid printing out disassembly when the
Code object is a bytecode regexp.
Bug:
Change-Id: I35b531cb03996a303248652871452266c78fee38
Reviewed-on: https://chromium-review.googlesource.com/642127
Reviewed-by: Yang Guo <yangguo@chromium.org>
PR-URL: https://github.com/nodejs/node/pull/15287
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/v8/src/regexp/jsregexp.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/deps/v8/src/regexp/jsregexp.cc b/deps/v8/src/regexp/jsregexp.cc index bbbfbeb799..4cfeab0d4f 100644 --- a/deps/v8/src/regexp/jsregexp.cc +++ b/deps/v8/src/regexp/jsregexp.cc @@ -1131,7 +1131,7 @@ RegExpEngine::CompilationResult RegExpCompiler::Assemble( Handle<HeapObject> code = macro_assembler_->GetCode(pattern); heap->IncreaseTotalRegexpCodeGenerated(code->Size()); work_list_ = NULL; -#ifdef ENABLE_DISASSEMBLER +#if defined(ENABLE_DISASSEMBLER) && !defined(V8_INTERPRETED_REGEXP) if (FLAG_print_code) { CodeTracer::Scope trace_scope(heap->isolate()->GetCodeTracer()); OFStream os(trace_scope.file()); |