Permalink
Browse files

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: #15287
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information...
jBarz authored and MylesBorins committed Sep 8, 2017
1 parent f8b85e1 commit 4e1a50a079b5e0c6f5e7baeae7f1381a69cba1d0
Showing with 1 addition and 1 deletion.
  1. +1 −1 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());

0 comments on commit 4e1a50a

Please sign in to comment.