Changeset 11923 in webkit for trunk/JavaScriptCore/kjs/operations.cpp

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.

File:

• trunk/JavaScriptCore/kjs/operations.cpp (modified) (1 diff)

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;