Skip to content

Commit 6a01918

Browse files
targosMylesBorins
authored andcommitted
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 <[email protected]> Commit-Queue: Jaideep Bajwa <[email protected]> Cr-Commit-Position: refs/heads/master@{#47718} PR-URL: #15599 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent 25fd85d commit 6a01918

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

deps/v8/src/regexp/jsregexp.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1115,7 +1115,7 @@ RegExpEngine::CompilationResult RegExpCompiler::Assemble(
11151115
Handle<HeapObject> code = macro_assembler_->GetCode(pattern);
11161116
isolate->IncreaseTotalRegexpCodeGenerated(code->Size());
11171117
work_list_ = NULL;
1118-
#ifdef ENABLE_DISASSEMBLER
1118+
#if defined(ENABLE_DISASSEMBLER) && !defined(V8_INTERPRETED_REGEXP)
11191119
if (FLAG_print_code) {
11201120
CodeTracer::Scope trace_scope(isolate->GetCodeTracer());
11211121
OFStream os(trace_scope.file());

0 commit comments

Comments
 (0)