Changeset 11923 in webkit for trunk/JavaScriptCore

Timestamp:

Jan 7, 2006, 2:32:25 AM (19 years ago)

Author:

andersca

Message:

2006-01-07 Anders Carlsson <​[email protected]>

Reviewed by Maciej.

• fix ​http://bugzilla.opendarwin.org/show_bug.cgi?id=6373 REGRESSION: JavaScript hang when comparing large array to null

• kjs/object.h: (KJS::JSObject::isEqualToNull): Add new function which returns true if an object should be treated as null when doing comparisons.

• kjs/operations.cpp: (KJS::equal): Use isEqualToNull.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (2 diffs)
• kjs/object.h (modified) (1 diff)
• kjs/operations.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2006-01-07  Anders Carlsson  <[email protected]>
+
+        Reviewed by Maciej.
+        
+        - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=6373
+        REGRESSION: JavaScript hang when comparing large array to null
+        
+        * kjs/object.h:
+        (KJS::JSObject::isEqualToNull):
+        Add new function which returns true if an object should be treated as null when
+        doing comparisons.
+        
+        * kjs/operations.cpp:
+        (KJS::equal):
+        Use isEqualToNull.
+
 2006-01-07  Alexey Proskuryakov  <[email protected]>
 
         Reviewed by Maciej.
 
-        - Fix WebCore development build
-        http://bugzilla.opendarwin.org/show_bug.cgi?id=6408
+            - Fix WebCore development build
+            http://bugzilla.opendarwin.org/show_bug.cgi?id=6408
 
         * kxmlcore/Assertions.h: Use __VA_ARGS__ in variadic macros.
@@ -17 +33 @@
         Changes mostly thanks to Maks Orlovich, tweaked a little by me.
 
-        * kjs/create_hash_table: Use the same hash as the one used buy Identifier.
+        * kjs/create_hash_table: Use the same hash as the one used by Identifier.
         * kjs/function.cpp:
         (KJS::FunctionImp::processParameters): Use the new List::copyFrom

trunk/JavaScriptCore/kjs/object.h

@@ -492 +492 @@
     UString toString(ExecState *exec) const;
     JSObject *toObject(ExecState *exec) const;
-
+    
     bool getPropertyAttributes(const Identifier& propertyName, int& attributes) const;
+    
+    // Returns whether the object should be treated as null when doing equality comparisons
+    virtual bool isEqualToNull(ExecState *) const { return false; }
     
     // This get function only looks at the property map.

trunk/JavaScriptCore/kjs/operations.cpp

@@ -130 +130 @@
             if ((t1 == StringType || t1 == NumberType) && t2 >= ObjectType)
                 return equal(exec, v1, v2->toPrimitive(exec));
-            if (t1 == NullType && t2 >= ObjectType)
-                return equal(exec, v1, v2->toPrimitive(exec, NullType));
+            if (t1 == NullType && t2 == ObjectType)
+                return static_cast<JSObject *>(v2)->isEqualToNull(exec);
             if (t1 >= ObjectType && (t2 == StringType || t2 == NumberType))
                 return equal(exec, v1->toPrimitive(exec), v2);
-            if (t1 >= ObjectType && t2 == NullType)
-                return equal(exec, v1->toPrimitive(exec, NullType), v2);
+            if (t1 == ObjectType && t2 == NullType)
+                return static_cast<JSObject *>(v1)->isEqualToNull(exec);
             if (t1 != t2)
                 return false;