Reviewers: Erik Corry, Message: Quick bugfix.
Description: Validation of flattened regexps on ARM now doesn't expect a native code. Please review this at http://codereview.chromium.org/39007 Affected files: M src/objects-debug.cc Index: src/objects-debug.cc diff --git a/src/objects-debug.cc b/src/objects-debug.cc index f8350ed3e9461eeca5ba8723d1799904f74523de..a41c0aba4635218f448a1e640731b109265ee89b 100644 --- a/src/objects-debug.cc +++ b/src/objects-debug.cc @@ -696,17 +696,18 @@ void JSRegExp::JSRegExpVerify() { break; } case JSRegExp::IRREGEXP: { + bool is_native = FLAG_regexp_native; +#ifdef ARM + // No native regexp on arm yet. + is_native = false; +#endif FixedArray* arr = FixedArray::cast(data()); Object* ascii_data = arr->get(JSRegExp::kIrregexpASCIICodeIndex); ASSERT(ascii_data->IsTheHole() - || (FLAG_regexp_native ? - ascii_data->IsCode() - : ascii_data->IsByteArray())); + || (is_native ? ascii_data->IsCode() : ascii_data->IsByteArray())); Object* uc16_data = arr->get(JSRegExp::kIrregexpUC16CodeIndex); ASSERT(uc16_data->IsTheHole() - || (FLAG_regexp_native ? - uc16_data->IsCode() - : uc16_data->IsByteArray())); + || (is_native ? uc16_data->IsCode() : uc16_data->IsByteArray())); ASSERT(arr->get(JSRegExp::kIrregexpCaptureCountIndex)->IsSmi()); ASSERT(arr->get(JSRegExp::kIrregexpMaxRegisterCountIndex)->IsSmi()); break; --~--~---------~--~----~------------~-------~--~----~ v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev -~----------~----~----~----~------~----~------~--~---
