From 9b50c5642362b94c72aec419db2cb88700af0edc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Mon, 25 Sep 2017 08:16:02 +0200 Subject: [PATCH] deps: cherry-pick 0353a1e from upstream V8 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 Commit-Queue: Jaideep Bajwa Cr-Commit-Position: refs/heads/master@{#47718} PR-URL: https://github.com/nodejs/node/pull/15599 Reviewed-By: Ben Noordhuis Reviewed-By: Colin Ihrig Reviewed-By: James M Snell --- deps/v8/src/regexp/jsregexp.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/v8/src/regexp/jsregexp.cc b/deps/v8/src/regexp/jsregexp.cc index dc4727c38a..5b21cb82bc 100644 --- a/deps/v8/src/regexp/jsregexp.cc +++ b/deps/v8/src/regexp/jsregexp.cc @@ -1115,7 +1115,7 @@ RegExpEngine::CompilationResult RegExpCompiler::Assemble( Handle code = macro_assembler_->GetCode(pattern); isolate->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(isolate->GetCodeTracer()); OFStream os(trace_scope.file());