Changeset 1821 in webkit for trunk/JavaScriptCore/kjs/array_object.cpp

Timestamp:

Aug 14, 2002, 5:59:18 PM (23 years ago)

Author:

mjs

Message:

Fix major JavaScript memory leak. run-plt says cvs-base improved
by 2% and cvs-js-performance improved by 7%. However, this was
within the possible noise level in each case.

The fix was to store ValueImp *'s in the array instead of Value
objects, since the Value wrapper will keep a ref and make the
object immortal.

• kjs/array_object.cpp: (ArrayInstanceImp::ArrayInstanceImp): (ArrayInstanceImp::get): (ArrayInstanceImp::put): (ArrayInstanceImp::hasProperty): (ArrayInstanceImp::deleteProperty): (ArrayInstanceImp::setLength): (ArrayInstanceImp::mark):
• kjs/array_object.h:

File:

• trunk/JavaScriptCore/kjs/array_object.cpp (modified) (12 diffs)

trunk/JavaScriptCore/kjs/array_object.cpp

@@ -44 +44 @@
   , length(initialLength)
   , capacity(length)
-  , storage(length ? new Undefined[length] : 0)
-{
+  , storage(length ? new (ValueImp *)[length] : 0)
+{
+  unsigned l = length;
+  for (unsigned i = 0; i < l; ++i) {
+    storage[i] = Undefined().imp();
+  }
 }
 
@@ -52 +56 @@
   , length(list.size())
   , capacity(length)
-  , storage(length ? new Undefined[length] : 0)
+  , storage(length ? new (ValueImp *)[length] : 0)
 {
   ListIterator it = list.begin();
   const unsigned l = length;
   for (unsigned i = 0; i < l; ++i) {
-    storage[i] = it++;
+    storage[i] = (it++).imp();
   }
 }
@@ -76 +80 @@
     if (index >= length)
       return Undefined();
-    return storage[index];
+    return Value(storage[index]);
   }
 
@@ -86 +90 @@
   if (index >= length)
     return Undefined();
-  return storage[index];
+  return Value(storage[index]);
 }
 
@@ -101 +105 @@
   if (ok) {
     setLength(index + 1);
-    storage[index] = value;
+    storage[index] = value.imp();
     return;
   }
@@ -111 +115 @@
 {
   setLength(index + 1);
-  storage[index] = value;
+  storage[index] = value.imp();
 }
 
@@ -124 +128 @@
     if (index >= length)
       return false;
-    return !storage[index].isA(UndefinedType);
+    return storage[index]->type() != UndefinedType;
   }
   
@@ -134 +138 @@
   if (index >= length)
     return false;
-  return !storage[index].isA(UndefinedType);
+  return storage[index]->type() != UndefinedType;
 }
 
@@ -147 +151 @@
     if (index >= length)
       return true;
-    storage[index] = Undefined();
+    storage[index] = Undefined().imp();
     return true;
   }
@@ -158 +162 @@
   if (index >= length)
     return true;
-  storage[index] = Undefined();
+  storage[index] = Undefined().imp();
   return true;
 }
@@ -167 +171 @@
     const unsigned l = length;
     for (unsigned i = newLength; i < l; ++i)
-      storage[i] = Undefined();
+      storage[i] = Undefined().imp();
   }
   if (newLength > capacity) {
     unsigned newCapacity = (newLength * 3 + 1) / 2;
-    Value *newStorage = new Undefined [newCapacity];
+    ValueImp **newStorage = new (ValueImp *)[newCapacity];
     const unsigned l = length;
     for (unsigned i = 0; i < l; ++i)
       newStorage[i] = storage[i];
+    for (unsigned i = l; i < newLength; i++)
+      newStorage[i] = Undefined().imp();
     delete [] storage;
     storage = newStorage;
@@ -187 +193 @@
   const unsigned l = length;
   for (unsigned i = 0; i < l; ++i) {
-    ValueImp *imp = storage[i].imp();
+    ValueImp *imp = storage[i];
     if (!imp->marked())
       imp->mark();