Regexp caching

src/objects-debug.cc

 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 641 matching lines @@
 
 void JSArray::JSArrayVerify() {
   JSObjectVerify();
   ASSERT(length()->IsNumber() || length()->IsUndefined());
   ASSERT(elements()->IsUndefined() || elements()->IsFixedArray());
 }
 
 
 void JSRegExp::JSRegExpVerify() {
   JSObjectVerify();
-  ASSERT(type()->IsSmi() || type()->IsUndefined());
-  if (type()->IsSmi()) {
-    switch (type_tag()) {
-      case JSRegExp::JSCRE:
-        ASSERT(data()->IsFixedArray());
-        break;
-      default:
-        ASSERT_EQ(JSRegExp::ATOM, type_tag());
-        ASSERT(data()->IsString());
-        break;
-    }
-  } else {
+  ASSERT(data()->IsUndefined() || data()->IsFixedArray());
+  switch (TypeTag()) {
+  case JSRegExp::ATOM: {

[Kasper Lund, 2008/10/24 06:42:50]

Indent switch cases by two spaces.

+    FixedArray* arr = FixedArray::cast(data());
+    ASSERT(arr->get(JSRegExp::kAtomPatternIndex)->IsString());
+    break;
+  }
+  case JSRegExp::JSCRE: {
+    FixedArray* arr = FixedArray::cast(data());
+    ASSERT(arr->get(JSRegExp::kJscreDataIndex)->IsFixedArray());
+    break;
+  }
+  default:
+    ASSERT_EQ(JSRegExp::NOT_COMPILED, TypeTag());
     ASSERT(data()->IsUndefined());
+    break;
   }
 }
 
 
 void Proxy::ProxyPrint() {
   PrintF("proxy to %p", proxy());
 }
 
 
 void Proxy::ProxyVerify() {
@@ skipping 359 matching lines @@
     }
     current = hash;
   }
   return true;
 }
 
 
 #endif  // DEBUG
 
 } }  // namespace v8::internal