Changeset 28110 in webkit for trunk/JavaScriptCore/kjs/function.cpp

Timestamp:

Nov 28, 2007, 5:12:03 AM (18 years ago)

Author:

[email protected]

Message:

Roll out r28106 and r28108. These introduced a frequent assertion failure on page load and broke all non-Mac builds.

File:

• trunk/JavaScriptCore/kjs/function.cpp (modified) (4 diffs)

trunk/JavaScriptCore/kjs/function.cpp

@@ -62 +62 @@
 }
 
-void FunctionImp::markChildren(MarkStack& stack)
-{
-    InternalFunctionImp::markChildren(stack);
-    _scope.markChildren(stack);
+void FunctionImp::mark()
+{
+    InternalFunctionImp::mark();
+    _scope.mark();
 }
 
@@ -332 +332 @@
 // ECMA 10.1.8
 Arguments::Arguments(ExecState* exec, FunctionImp* func, const List& args, ActivationImp* act)
-  : JSObject(exec->lexicalInterpreter()->builtinObjectPrototype()) 
-  , _activationObject(act)
-  , indexToNameMap(func, args)
+: JSObject(exec->lexicalInterpreter()->builtinObjectPrototype()), 
+_activationObject(act),
+indexToNameMap(func, args)
 {
   putDirect(exec->propertyNames().callee, func, DontEnum);
@@ -348 +348 @@
 }
 
-void Arguments::markChildren(MarkStack& stack) 
-{
-  JSObject::markChildren(stack);
-  stack.push(_activationObject);
+void Arguments::mark() 
+{
+  JSObject::mark();
+  if (_activationObject && !_activationObject->marked())
+    _activationObject->mark();
 }
 
@@ -484 +485 @@
 }
 
-void ActivationImp::markChildren(MarkStack& stack)
-{
-    JSObject::markChildren(stack);
+void ActivationImp::mark()
+{
+    JSObject::mark();
 
     size_t size = d->localStorage.size();
-    for (size_t i = 0; i < size; ++i)
-        stack.push(d->localStorage[i].value);
+    for (size_t i = 0; i < size; ++i) {
+        JSValue* value = d->localStorage[i].value;
+        if (!value->marked())
+            value->mark();
+    }
     
-    stack.push(d->function);
-    if (d->argumentsObject)
-      stack.push(d->argumentsObject);
+    ASSERT(d->function);
+    if (!d->function->marked())
+        d->function->mark();
+
+    if (d->argumentsObject && !d->argumentsObject->marked())
+        d->argumentsObject->mark();
 }