Changeset 34496 in webkit for trunk/JavaScriptCore/kjs/array_instance.h

Timestamp:

Jun 11, 2008, 12:37:44 PM (17 years ago)

Author:

Darin Adler

Message:

2008-06-11 Darin Adler <Darin Adler>

Reviewed by Alexey.

• fix ​https://bugs.webkit.org/show_bug.cgi?id=19442 JavaScript array implementation doesn't maintain m_numValuesInVector when sorting

• kjs/array_instance.cpp: (KJS::ArrayInstance::checkConsistency): Added. Empty inline version for when consistency checks are turned off. (KJS::ArrayInstance::ArrayInstance): Check consistency after construction. (KJS::ArrayInstance::~ArrayInstance): Check consistency before destruction. (KJS::ArrayInstance::put): Check consistency before and after. (KJS::ArrayInstance::deleteProperty): Ditto. (KJS::ArrayInstance::setLength): Ditto. (KJS::compareByStringPairForQSort): Use typedef for clarity. (KJS::ArrayInstance::sort): Check consistency before and after. Also broke the loop to set up sorting into two separate passes. Added FIXMEs about various exception safety issues. Added code to set m_numValuesInVector after sorting. (KJS::ArrayInstance::compactForSorting): Ditto.

• kjs/array_instance.h: Added a definition of an enum for the types of consistency check and a declaration of the consistency checking function.

File:

• trunk/JavaScriptCore/kjs/array_instance.h (modified) (2 diffs)

trunk/JavaScriptCore/kjs/array_instance.h

@@ -2 +2 @@
 /*
  *  Copyright (C) 1999-2000 Harri Porten ([email protected])
- *  Copyright (C) 2003, 2007 Apple Inc. All rights reserved.
+ *  Copyright (C) 2003, 2007, 2008 Apple Inc. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or
@@ -65 +65 @@
     bool increaseVectorLength(unsigned newLength);
     
-    unsigned compactForSorting();    
+    unsigned compactForSorting();
+
+    enum ConsistencyCheckType { NormalConsistencyCheck, DestructorConsistencyCheck, SortConsistencyCheck };
+    void checkConsistency(ConsistencyCheckType = NormalConsistencyCheck);
 
     unsigned m_length;