Commit b04c87d8 authored by Yang Guo's avatar Yang Guo Committed by Commit Bot

[regexp] fix v8_interpreted_regexp build.

R=jgruber@chromium.org

Change-Id: I8328fdaf5d53850b87dd16867255d4325ab9cd9c
Reviewed-on: https://chromium-review.googlesource.com/936644Reviewed-by: 's avatarJakob Gruber <jgruber@chromium.org>
Commit-Queue: Yang Guo <yangguo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#51570}
parent 9ea4a95a
...@@ -519,6 +519,7 @@ static RegExpImpl::IrregexpResult RawMatch(Isolate* isolate, ...@@ -519,6 +519,7 @@ static RegExpImpl::IrregexpResult RawMatch(Isolate* isolate,
break; break;
} }
BYTECODE(CHECK_NOT_BACK_REF_NO_CASE_UNICODE) BYTECODE(CHECK_NOT_BACK_REF_NO_CASE_UNICODE)
V8_FALLTHROUGH;
BYTECODE(CHECK_NOT_BACK_REF_NO_CASE) { BYTECODE(CHECK_NOT_BACK_REF_NO_CASE) {
bool unicode = bool unicode =
(insn & BYTECODE_MASK) == BC_CHECK_NOT_BACK_REF_NO_CASE_UNICODE; (insn & BYTECODE_MASK) == BC_CHECK_NOT_BACK_REF_NO_CASE_UNICODE;
...@@ -537,6 +538,7 @@ static RegExpImpl::IrregexpResult RawMatch(Isolate* isolate, ...@@ -537,6 +538,7 @@ static RegExpImpl::IrregexpResult RawMatch(Isolate* isolate,
break; break;
} }
BYTECODE(CHECK_NOT_BACK_REF_NO_CASE_UNICODE_BACKWARD) BYTECODE(CHECK_NOT_BACK_REF_NO_CASE_UNICODE_BACKWARD)
V8_FALLTHROUGH;
BYTECODE(CHECK_NOT_BACK_REF_NO_CASE_BACKWARD) { BYTECODE(CHECK_NOT_BACK_REF_NO_CASE_BACKWARD) {
bool unicode = (insn & BYTECODE_MASK) == bool unicode = (insn & BYTECODE_MASK) ==
BC_CHECK_NOT_BACK_REF_NO_CASE_UNICODE_BACKWARD; BC_CHECK_NOT_BACK_REF_NO_CASE_UNICODE_BACKWARD;
......
...@@ -634,6 +634,8 @@ class TerminatorSleeperThread : public v8::base::Thread { ...@@ -634,6 +634,8 @@ class TerminatorSleeperThread : public v8::base::Thread {
}; };
TEST(TerminateRegExp) { TEST(TerminateRegExp) {
// regexp interpreter does not support preemption.
#ifndef V8_INTERPRETED_REGEXP
i::FLAG_allow_natives_syntax = true; i::FLAG_allow_natives_syntax = true;
v8::Isolate* isolate = CcTest::isolate(); v8::Isolate* isolate = CcTest::isolate();
ConsoleImpl console; ConsoleImpl console;
...@@ -653,4 +655,5 @@ TEST(TerminateRegExp) { ...@@ -653,4 +655,5 @@ TEST(TerminateRegExp) {
.IsEmpty()); .IsEmpty());
CHECK(try_catch.HasCaught()); CHECK(try_catch.HasCaught());
CHECK(!isolate->IsExecutionTerminating()); CHECK(!isolate->IsExecutionTerminating());
#endif // V8_INTERPRETED_REGEXP
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment