Changeset 64684 in webkit for trunk/JavaScriptCore/runtime/JSValue.h

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/JSValue.h (modified) (6 diffs)

trunk/JavaScriptCore/runtime/JSValue.h

@@ -200 +200 @@
 
         bool isCell() const;
-        JSCell*& asCell();
-        JSCell* const& asCell() const;
+        JSCell* asCell() const;
         bool isValidCallee();
 
@@ -242 +241 @@
                 int32_t payload;
             } asBits;
-            struct {
-                int32_t tag;
-                JSCell* ptr;
-            } asPtr;
 #else
             struct {
@@ -251 +246 @@
                 int32_t tag;
             } asBits;
-            struct {
-                JSCell* ptr;
-                int32_t tag;
-            } asPtr;
 #endif
         } u;
@@ -501 +492 @@
         else
             u.asBits.tag = EmptyValueTag;
-        u.asPtr.ptr = ptr;
+        u.asBits.payload = reinterpret_cast<int32_t>(ptr);
 #if ENABLE(JSC_ZOMBIES)
         ASSERT(!isZombie());
@@ -513 +504 @@
         else
             u.asBits.tag = EmptyValueTag;
-        u.asPtr.ptr = const_cast<JSCell*>(ptr);
+        u.asBits.payload = reinterpret_cast<int32_t>(const_cast<JSCell*>(ptr));
 #if ENABLE(JSC_ZOMBIES)
         ASSERT(!isZombie());
@@ -608 +599 @@
     }
     
-    ALWAYS_INLINE JSCell* const& JSValue::asCell() const
+    ALWAYS_INLINE JSCell* JSValue::asCell() const
     {
         ASSERT(isCell());
-        return u.asPtr.ptr;
-    }
-
-    ALWAYS_INLINE JSCell*& JSValue::asCell()
-    {
-        ASSERT(isCell());
-        return u.asPtr.ptr;
+        return reinterpret_cast<JSCell*>(u.asBits.payload);
     }