Author: [email protected]
Date: Tue Mar  3 01:11:09 2009
New Revision: 1401

Modified:
    branches/bleeding_edge/src/objects-debug.cc

Log:
Validation of flattened regexps on ARM now doesn't expect a native code.


Modified: branches/bleeding_edge/src/objects-debug.cc
==============================================================================
--- branches/bleeding_edge/src/objects-debug.cc (original)
+++ branches/bleeding_edge/src/objects-debug.cc Tue Mar  3 01:11:09 2009
@@ -696,17 +696,18 @@
        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
-~----------~----~----~----~------~----~------~--~---

Reply via email to