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

Timestamp:

Nov 28, 2007, 5:12:03 AM (17 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/interpreter.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/interpreter.cpp

@@ -545 +545 @@
 }
 
-void Interpreter::markRoots(MarkStack& stack)
+void Interpreter::mark()
 {
     if (m_currentExec)
-        m_currentExec->markChildren(stack);
-
-    if (m_globalExec.exception())
-        stack.push(m_globalExec.exception());
-
-    if (m_globalObject)
-        stack.push(m_globalObject);
-
-    if (m_Object)
-       stack.push(m_Object);
-    if (m_Function)
-        stack.push(m_Function);
-    if (m_Array)
-        stack.push(m_Array);
-    if (m_Boolean)
-        stack.push(m_Boolean);
-    if (m_String)
-        stack.push(m_String);
-    if (m_Number)
-        stack.push(m_Number);
-    if (m_Date)
-        stack.push(m_Date);
-    if (m_RegExp)
-        stack.push(m_RegExp);
-    if (m_Error)
-        stack.push(m_Error);
-    
-    if (m_ObjectPrototype)
-        stack.push(m_ObjectPrototype);
-    if (m_FunctionPrototype)
-        stack.push(m_FunctionPrototype);
-    if (m_ArrayPrototype)
-        stack.push(m_ArrayPrototype);
-    if (m_BooleanPrototype)
-        stack.push(m_BooleanPrototype);
-    if (m_StringPrototype)
-        stack.push(m_StringPrototype);
-    if (m_NumberPrototype)
-        stack.push(m_NumberPrototype);
-    if (m_DatePrototype)
-        stack.push(m_DatePrototype);
-    if (m_RegExpPrototype)
-        stack.push(m_RegExpPrototype);
-    if (m_ErrorPrototype)
-        stack.push(m_ErrorPrototype);
-    
-    if (m_EvalError)
-        stack.push(m_EvalError);
-    if (m_RangeError)
-        stack.push(m_RangeError);
-    if (m_ReferenceError)
-        stack.push(m_ReferenceError);
-    if (m_SyntaxError)
-        stack.push(m_SyntaxError);
-    if (m_TypeError)
-        stack.push(m_TypeError);
-    if (m_UriError)
-        stack.push(m_UriError);
-    
-    if (m_EvalErrorPrototype)
-        stack.push(m_EvalErrorPrototype);
-    if (m_RangeErrorPrototype)
-        stack.push(m_RangeErrorPrototype);
-    if (m_ReferenceErrorPrototype)
-        stack.push(m_ReferenceErrorPrototype);
-    if (m_SyntaxErrorPrototype)
-        stack.push(m_SyntaxErrorPrototype);
-    if (m_TypeErrorPrototype)
-        stack.push(m_TypeErrorPrototype);
-    if (m_UriErrorPrototype)
-        stack.push(m_UriErrorPrototype);
+        m_currentExec->mark();
+
+    if (m_globalExec.exception() && !m_globalExec.exception()->marked())
+        m_globalExec.exception()->mark();
+
+    if (m_globalObject && !m_globalObject->marked())
+        m_globalObject->mark();
+
+    if (m_Object && !m_Object->marked())
+        m_Object->mark();
+    if (m_Function && !m_Function->marked())
+        m_Function->mark();
+    if (m_Array && !m_Array->marked())
+        m_Array->mark();
+    if (m_Boolean && !m_Boolean->marked())
+        m_Boolean->mark();
+    if (m_String && !m_String->marked())
+        m_String->mark();
+    if (m_Number && !m_Number->marked())
+        m_Number->mark();
+    if (m_Date && !m_Date->marked())
+        m_Date->mark();
+    if (m_RegExp && !m_RegExp->marked())
+        m_RegExp->mark();
+    if (m_Error && !m_Error->marked())
+        m_Error->mark();
+    
+    if (m_ObjectPrototype && !m_ObjectPrototype->marked())
+        m_ObjectPrototype->mark();
+    if (m_FunctionPrototype && !m_FunctionPrototype->marked())
+        m_FunctionPrototype->mark();
+    if (m_ArrayPrototype && !m_ArrayPrototype->marked())
+        m_ArrayPrototype->mark();
+    if (m_BooleanPrototype && !m_BooleanPrototype->marked())
+        m_BooleanPrototype->mark();
+    if (m_StringPrototype && !m_StringPrototype->marked())
+        m_StringPrototype->mark();
+    if (m_NumberPrototype && !m_NumberPrototype->marked())
+        m_NumberPrototype->mark();
+    if (m_DatePrototype && !m_DatePrototype->marked())
+        m_DatePrototype->mark();
+    if (m_RegExpPrototype && !m_RegExpPrototype->marked())
+        m_RegExpPrototype->mark();
+    if (m_ErrorPrototype && !m_ErrorPrototype->marked())
+        m_ErrorPrototype->mark();
+    
+    if (m_EvalError && !m_EvalError->marked())
+        m_EvalError->mark();
+    if (m_RangeError && !m_RangeError->marked())
+        m_RangeError->mark();
+    if (m_ReferenceError && !m_ReferenceError->marked())
+        m_ReferenceError->mark();
+    if (m_SyntaxError && !m_SyntaxError->marked())
+        m_SyntaxError->mark();
+    if (m_TypeError && !m_TypeError->marked())
+        m_TypeError->mark();
+    if (m_UriError && !m_UriError->marked())
+        m_UriError->mark();
+    
+    if (m_EvalErrorPrototype && !m_EvalErrorPrototype->marked())
+        m_EvalErrorPrototype->mark();
+    if (m_RangeErrorPrototype && !m_RangeErrorPrototype->marked())
+        m_RangeErrorPrototype->mark();
+    if (m_ReferenceErrorPrototype && !m_ReferenceErrorPrototype->marked())
+        m_ReferenceErrorPrototype->mark();
+    if (m_SyntaxErrorPrototype && !m_SyntaxErrorPrototype->marked())
+        m_SyntaxErrorPrototype->mark();
+    if (m_TypeErrorPrototype && !m_TypeErrorPrototype->marked())
+        m_TypeErrorPrototype->mark();
+    if (m_UriErrorPrototype && !m_UriErrorPrototype->marked())
+        m_UriErrorPrototype->mark();
 }