Validation of flattened regexps on ARM now doesn't expect a native code.
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@1401 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
parent
d6748c59ce
commit
55e57ec1b7
@ -696,17 +696,18 @@ void JSRegExp::JSRegExpVerify() {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case JSRegExp::IRREGEXP: {
|
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());
|
FixedArray* arr = FixedArray::cast(data());
|
||||||
Object* ascii_data = arr->get(JSRegExp::kIrregexpASCIICodeIndex);
|
Object* ascii_data = arr->get(JSRegExp::kIrregexpASCIICodeIndex);
|
||||||
ASSERT(ascii_data->IsTheHole()
|
ASSERT(ascii_data->IsTheHole()
|
||||||
|| (FLAG_regexp_native ?
|
|| (is_native ? ascii_data->IsCode() : ascii_data->IsByteArray()));
|
||||||
ascii_data->IsCode()
|
|
||||||
: ascii_data->IsByteArray()));
|
|
||||||
Object* uc16_data = arr->get(JSRegExp::kIrregexpUC16CodeIndex);
|
Object* uc16_data = arr->get(JSRegExp::kIrregexpUC16CodeIndex);
|
||||||
ASSERT(uc16_data->IsTheHole()
|
ASSERT(uc16_data->IsTheHole()
|
||||||
|| (FLAG_regexp_native ?
|
|| (is_native ? uc16_data->IsCode() : uc16_data->IsByteArray()));
|
||||||
uc16_data->IsCode()
|
|
||||||
: uc16_data->IsByteArray()));
|
|
||||||
ASSERT(arr->get(JSRegExp::kIrregexpCaptureCountIndex)->IsSmi());
|
ASSERT(arr->get(JSRegExp::kIrregexpCaptureCountIndex)->IsSmi());
|
||||||
ASSERT(arr->get(JSRegExp::kIrregexpMaxRegisterCountIndex)->IsSmi());
|
ASSERT(arr->get(JSRegExp::kIrregexpMaxRegisterCountIndex)->IsSmi());
|
||||||
break;
|
break;
|
||||||
|
Loading…
Reference in New Issue
Block a user