Changeset 64684 in webkit for trunk/JavaScriptGlue/JSValueWrapper.cpp

Timestamp:

Aug 4, 2010, 3:21:13 PM (15 years ago)

Author:

[email protected]

Message:

2010-08-04 Sheriff Bot <​[email protected]>

Unreviewed, rolling out r64655.
​http://trac.webkit.org/changeset/64655
​https://bugs.webkit.org/show_bug.cgi?id=43496

JavaScriptCore references patch seems to have caused
regressions in QT and GTK builds (Requested by nlawrence on
#webkit).

• bytecode/CodeBlock.cpp: (JSC::CodeBlock::markAggregate):
• runtime/Collector.cpp: (JSC::Heap::markConservatively):
• runtime/JSCell.h: (JSC::JSValue::asCell): (JSC::MarkStack::append):
• runtime/JSGlobalObject.cpp: (JSC::markIfNeeded):
• runtime/JSONObject.cpp: (JSC::Stringifier::Holder::object):
• runtime/JSObject.h: (JSC::JSObject::prototype):
• runtime/JSStaticScopeObject.cpp: (JSC::JSStaticScopeObject::markChildren):
• runtime/JSValue.h: (JSC::JSValue::): (JSC::JSValue::JSValue): (JSC::JSValue::asCell):
• runtime/MarkStack.h:
• runtime/NativeErrorConstructor.cpp:
• runtime/NativeErrorConstructor.h:
• runtime/Structure.h: (JSC::Structure::storedPrototype):

2010-08-04 Sheriff Bot <​[email protected]>

Unreviewed, rolling out r64655.
​http://trac.webkit.org/changeset/64655
​https://bugs.webkit.org/show_bug.cgi?id=43496

JavaScriptCore references patch seems to have caused
regressions in QT and GTK builds (Requested by nlawrence on
#webkit).

• JSValueWrapper.cpp: (JSValueWrapper::JSObjectMark):

File:

• trunk/JavaScriptGlue/JSValueWrapper.cpp (modified) (1 diff)

trunk/JavaScriptGlue/JSValueWrapper.cpp

@@ -193 +193 @@
 }
 
-void JSValueWrapper::JSObjectMark(void*)
-{
-    // The object doesn't need to be marked here because it is a protected
-    // object and should therefore be marked by
-    // JSC::Heap::markProtectedObjects.
-
-    // We are keeping the function around because the function is passed as a
-    // callback.
-}
+void JSValueWrapper::JSObjectMark(void *data)
+{
+    JSValueWrapper* ptr = (JSValueWrapper*)data;
+    if (ptr)
+    {
+        // This results in recursive marking but will be otherwise safe and correct.
+        // We claim the array vptr is 0 because we don't have access to it here, and
+        // claiming 0 is functionally harmless -- it merely means that we can't
+        // devirtualise marking of arrays when recursing from this point.
+        MarkStack markStack(0);
+        markStack.append(ptr->fValue.get());
+        markStack.drain();
+    }
+}