Changeset 64684 in webkit for trunk/JavaScriptCore/runtime/JSGlobalObject.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/JavaScriptCore/runtime/JSGlobalObject.cpp (modified) (2 diffs)

trunk/JavaScriptCore/runtime/JSGlobalObject.cpp

@@ -81 +81 @@
 static const int preferredScriptCheckTimeInterval = 1000;
 
-template<typename T> static inline void markIfNeeded(MarkStack& markStack, T*& v)
+static inline void markIfNeeded(MarkStack& markStack, JSValue v)
 {
     if (v)
@@ -87 +87 @@
 }
 
-static inline void markIfNeeded(MarkStack& markStack, RefPtr<Structure>& s)
+static inline void markIfNeeded(MarkStack& markStack, const RefPtr<Structure>& s)
 {
     if (s)
-        markStack.append(s->storedPrototype());
+        markIfNeeded(markStack, s->storedPrototype());
 }