diff options
| author | Michaël Zasso <targos@protonmail.com> | 2017-09-25 08:16:02 +0200 |
|---|---|---|
| committer | Michaël Zasso <targos@protonmail.com> | 2017-09-28 15:56:11 +0200 |
| commit | 2f2f1cfa870c2153c811a7047d74c4a0bb8e5f2c (patch) | |
| tree | ba32ecd23f5d040ed8a7fdd99cba31fd6b0b2063 /deps | |
| parent | 5f469446e1bbff48af029cf4e71de7940fe41b72 (diff) | |
| download | android-node-v8-2f2f1cfa870c2153c811a7047d74c4a0bb8e5f2c.tar.gz android-node-v8-2f2f1cfa870c2153c811a7047d74c4a0bb8e5f2c.tar.bz2 android-node-v8-2f2f1cfa870c2153c811a7047d74c4a0bb8e5f2c.zip | |
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 <yangguo@chromium.org>
Commit-Queue: Jaideep Bajwa <bjaideep@ca.ibm.com>
Cr-Commit-Position: refs/heads/master@{#47718}
PR-URL: https://github.com/nodejs/node/pull/15599
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@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 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<HeapObject> 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()); |