Skip to content

Commit 4e1a50a

Browse files
jBarzMylesBorins
authored andcommitted
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 <[email protected]> PR-URL: #15287 Reviewed-By: Franziska Hinkelmann <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent f8b85e1 commit 4e1a50a

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
@@ -1131,7 +1131,7 @@ RegExpEngine::CompilationResult RegExpCompiler::Assemble(
11311131
Handle<HeapObject> code = macro_assembler_->GetCode(pattern);
11321132
heap->IncreaseTotalRegexpCodeGenerated(code->Size());
11331133
work_list_ = NULL;
1134-
#ifdef ENABLE_DISASSEMBLER
1134+
#if defined(ENABLE_DISASSEMBLER) && !defined(V8_INTERPRETED_REGEXP)
11351135
if (FLAG_print_code) {
11361136
CodeTracer::Scope trace_scope(heap->isolate()->GetCodeTracer());
11371137
OFStream os(trace_scope.file());

0 commit comments

Comments
 (0)