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

Timestamp:

Aug 4, 2010, 10:18:07 AM (15 years ago)

Author:

[email protected]

Message:

2010-08-04 Nathan Lawrence <​[email protected]>

Reviewed by Darin Adler.

Refactoring MarkStack::append to take a reference. This is in
preparation for movable objects when we will need to update pointers.
​http://bugs.webkit.org/show_bug.cgi?id=41177

Unless otherwise noted, all changes are to either return by reference
or pass a reference to MarkStack::append.

• bytecode/CodeBlock.cpp: (JSC::CodeBlock::markAggregate):
• runtime/Collector.cpp: (JSC::Heap::markConservatively):

Added a temporary variable to prevent marking from changing an
unknown value on the stack

• runtime/JSCell.h: (JSC::JSValue::asCell): (JSC::MarkStack::append): (JSC::MarkStack::appendInternal):
• 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::JSValue): (JSC::JSValue::asCell):
• runtime/MarkStack.h:
• runtime/NativeErrorConstructor.cpp: (JSC::NativeErrorConstructor::createStructure):

Changed the structure flags to include a custom markChildren.

(JSC::NativeErrorConstructor::markChildren):

Update the prototype of the stored structure.

• runtime/NativeErrorConstructor.h:

Added structure flags.

• runtime/Structure.h: (JSC::Structure::storedPrototype):

2010-08-04 Nathan Lawrence <​[email protected]>

Reviewed by Darin Adler.

Removed unneeded marking. We need to remove this marking in order to have
MarkStack::append take references for updating movable objects.

​https://bugs.webkit.org/show_bug.cgi?id=41177

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