Changeset 48067 in webkit for trunk/JavaScriptCore

Timestamp:

Sep 4, 2009, 11:53:02 AM (16 years ago)

Author:

Darin Adler

Message:

JavaScriptCore: DateInstance object collected on ARM JIT (JSValue: WTF_USE_JSVALUE32)
​https://bugs.webkit.org/show_bug.cgi?id=28909

Patch by Darin Adler <Darin Adler> on 2009-09-04
Reviewed by Geoff Garen.

Part one.

Make some improvements to garbage collection code:

1) Fix the two classes that had the default mark bit set but

should not.

2) Remove checks of the mark bit outside the MarkStack::append

function; they are redundant.

3) Make more callers use the checked asCell and asObject

casting functions rather than unchecked casts.

4) Removed some GC-related functions because these operations are

no longer things that code other than the core GC code needs
to do directly. Fixed callers that were calling them.

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::markAggregate): Removed unneeded check of the mark
bit before calling MarkStack::append.

• interpreter/Register.h: Removed unneeded marked and markChildren

functions.

• jit/JITStubs.cpp:

(op_eq): Removed unneeded assertions, instead using checked casting
functions such as asObject.

• runtime/ArgList.h: Added now-needed forward declaration of MarkStack.

• runtime/GetterSetter.cpp:

(JSC::GetterSetter::markChildren): Remmoved unneeded check of the mark bit.

• runtime/GlobalEvalFunction.h:

(JSC::GlobalEvalFunction::createStructure): Added. Fixes a bug where the
HasDefaultMark bit was set.

• runtime/JSCell.cpp:

(JSC::JSCell::getObject): Use asObject to avoid a direct static_cast.

• runtime/JSObject.h:

(JSC::asObject): Added an overload for JSCell* and changed the JSValue
version to call it.
(JSC::JSValue::get): Use asObject to avoid a direct static_cast.

• runtime/JSValue.h: Moved some stray includes that were outside the

header guard inside it. Not sure how that happened! Removed the
GC-related member functions markChildren, hasChildren, marked, and
markDirect.

• runtime/JSWrapperObject.h: Made markChildren private.

(JSC::JSWrapperObject::createStructure): Added. Fixes a bug where the
HasDefaultMark bit was set. Later we may want to optimize this for
wrapper types that never have cells in their internal values, but there
is no measured performance regression in SunSpider or V8 doing this
all the time.

• runtime/MarkStack.cpp: Tweaked formatting.

JavaScriptGlue: * JSValueWrapper.cpp:
(JSValueWrapper::JSObjectMark): Removed a check of the mark
bit. It's OK to do more work in this case, and there is no
longer a public function to access the mark bit.

Reviewed by Geoff Garen.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecode/CodeBlock.cpp (modified) (1 diff)
• interpreter/Register.h (modified) (2 diffs)
• jit/JITStubs.cpp (modified) (2 diffs)
• runtime/ArgList.h (modified) (3 diffs)
• runtime/GetterSetter.cpp (modified) (1 diff)
• runtime/GlobalEvalFunction.h (modified) (1 diff)
• runtime/JSCell.cpp (modified) (1 diff)
• runtime/JSObject.h (modified) (4 diffs)
• runtime/JSWrapperObject.h (modified) (2 diffs)
• runtime/MarkStack.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-09-04  Darin Adler  <[email protected]>
+
+        Reviewed by Geoff Garen.
+
+        DateInstance object collected on ARM JIT (JSValue: WTF_USE_JSVALUE32)
+        https://bugs.webkit.org/show_bug.cgi?id=28909
+
+        Part one.
+
+        Make some improvements to garbage collection code:
+
+            1) Fix the two classes that had the default mark bit set but
+               should not.
+            2) Remove checks of the mark bit outside the MarkStack::append
+               function; they are redundant.
+            3) Make more callers use the checked asCell and asObject
+               casting functions rather than unchecked casts.
+            4) Removed some GC-related functions because these operations are
+               no longer things that code other than the core GC code needs
+               to do directly. Fixed callers that were calling them.
+
+        * bytecode/CodeBlock.cpp:
+        (JSC::CodeBlock::markAggregate): Removed unneeded check of the mark
+        bit before calling MarkStack::append.
+
+        * interpreter/Register.h: Removed unneeded marked and markChildren
+        functions.
+
+        * jit/JITStubs.cpp:
+        (op_eq): Removed unneeded assertions, instead using checked casting
+        functions such as asObject.
+
+        * runtime/ArgList.h: Added now-needed forward declaration of MarkStack.
+
+        * runtime/GetterSetter.cpp:
+        (JSC::GetterSetter::markChildren): Remmoved unneeded check of the mark bit.
+
+        * runtime/GlobalEvalFunction.h:
+        (JSC::GlobalEvalFunction::createStructure): Added. Fixes a bug where the
+        HasDefaultMark bit was set.
+
+        * runtime/JSCell.cpp:
+        (JSC::JSCell::getObject): Use asObject to avoid a direct static_cast.
+
+        * runtime/JSObject.h:
+        (JSC::asObject): Added an overload for JSCell* and changed the JSValue
+        version to call it.
+        (JSC::JSValue::get): Use asObject to avoid a direct static_cast.
+
+        * runtime/JSValue.h: Moved some stray includes that were outside the
+        header guard inside it. Not sure how that happened! Removed the
+        GC-related member functions markChildren, hasChildren, marked, and
+        markDirect.
+
+        * runtime/JSWrapperObject.h: Made markChildren private.
+        (JSC::JSWrapperObject::createStructure): Added. Fixes a bug where the
+        HasDefaultMark bit was set. Later we may want to optimize this for
+        wrapper types that never have cells in their internal values, but there
+        is no measured performance regression in SunSpider or V8 doing this
+        all the time.
+
+        * runtime/MarkStack.cpp: Tweaked formatting.
+
 2009-09-04  Kevin Ollivier  <[email protected]>
 

trunk/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -1410 +1410 @@
 void CodeBlock::markAggregate(MarkStack& markStack)
 {
-    for (size_t i = 0; i < m_constantRegisters.size(); ++i) {
-        if (!m_constantRegisters[i].marked())
-            markStack.append(m_constantRegisters[i].jsValue());
-    }
-
+    for (size_t i = 0; i < m_constantRegisters.size(); ++i)
+        markStack.append(m_constantRegisters[i].jsValue());
     for (size_t i = 0; i < m_functionExprs.size(); ++i)
         m_functionExprs[i]->markAggregate(markStack);

trunk/JavaScriptCore/interpreter/Register.h

@@ -55 +55 @@
 
         JSValue jsValue() const;
-
-        bool marked() const;
-        void markChildren(MarkStack&);
         
         Register(JSActivation*);
@@ -115 +112 @@
         return JSValue::decode(u.value);
     }
-    
-    ALWAYS_INLINE bool Register::marked() const
-    {
-        return jsValue().marked();
-    }
 
     // Interpreter functions

trunk/JavaScriptCore/jit/JITStubs.cpp

@@ -2359 +2359 @@
         return src2.isCell() && asCell(src2)->structure()->typeInfo().masqueradesAsUndefined();
 
-    ASSERT(src1.isCell());
-
     JSCell* cell1 = asCell(src1);
 
@@ -2376 +2374 @@
             return static_cast<JSString*>(cell1)->value().toDouble() == 0.0;
 
-        ASSERT(src2.isCell());
         JSCell* cell2 = asCell(src2);
         if (cell2->isString())
             return static_cast<JSString*>(cell1)->value() == static_cast<JSString*>(cell2)->value();
 
-        ASSERT(cell2->isObject());
-        src2 = static_cast<JSObject*>(cell2)->toPrimitive(stackFrame.callFrame);
+        src2 = asObject(cell2)->toPrimitive(stackFrame.callFrame);
         CHECK_FOR_EXCEPTION();
         goto start;
     }
 
-    ASSERT(cell1->isObject());
     if (src2.isObject())
-        return static_cast<JSObject*>(cell1) == asObject(src2);
-    src1 = static_cast<JSObject*>(cell1)->toPrimitive(stackFrame.callFrame);
+        return asObject(cell1) == asObject(src2);
+    src1 = asObject(cell1)->toPrimitive(stackFrame.callFrame);
     CHECK_FOR_EXCEPTION();
     goto start;

trunk/JavaScriptCore/runtime/ArgList.h

@@ -1 +1 @@
 /*
  *  Copyright (C) 1999-2001 Harri Porten ([email protected])
- *  Copyright (C) 2003, 2007, 2008, 2009 Apple Computer, Inc.
+ *  Copyright (C) 2003, 2007, 2008, 2009 Apple Inc. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or
@@ -24 +24 @@
 
 #include "Register.h"
-
 #include <wtf/HashSet.h>
 #include <wtf/Noncopyable.h>
@@ -30 +29 @@
 
 namespace JSC {
-    
+
+    class MarkStack;
+
     class MarkedArgumentBuffer : public Noncopyable {
     private:

trunk/JavaScriptCore/runtime/GetterSetter.cpp

@@ -33 +33 @@
     JSCell::markChildren(markStack);
 
-    if (m_getter && !m_getter->marked())
+    if (m_getter)
         markStack.append(m_getter);
-    if (m_setter && !m_setter->marked())
+    if (m_setter)
         markStack.append(m_setter);
 }

trunk/JavaScriptCore/runtime/GlobalEvalFunction.h

@@ -36 +36 @@
         JSGlobalObject* cachedGlobalObject() const { return m_cachedGlobalObject; }
 
+        static PassRefPtr<Structure> createStructure(JSValue prototype) 
+        { 
+            return Structure::create(prototype, TypeInfo(ObjectType, ImplementsHasInstance | HasStandardGetOwnPropertySlot));
+        }
+
     private:
         virtual void markChildren(MarkStack&);

trunk/JavaScriptCore/runtime/JSCell.cpp

@@ -106 +106 @@
 JSObject* JSCell::getObject()
 {
-    return isObject() ? static_cast<JSObject*>(this) : 0;
+    return isObject() ? asObject(this) : 0;
 }
 

trunk/JavaScriptCore/runtime/JSObject.h

@@ -254 +254 @@
 JSObject* constructEmptyObject(ExecState*);
 
+inline JSObject* asObject(JSCell* cell)
+{
+    ASSERT(cell->isObject());
+    return static_cast<JSObject*>(cell);
+}
+
 inline JSObject* asObject(JSValue value)
 {
-    ASSERT(asCell(value)->isObject());
-    return static_cast<JSObject*>(asCell(value));
+    return asObject(value.asCell());
 }
 
@@ -583 +588 @@
         if (cell->fastGetOwnPropertySlot(exec, propertyName, slot))
             return slot.getValue(exec, propertyName);
-        ASSERT(cell->isObject());
-        JSValue prototype = static_cast<JSObject*>(cell)->prototype();
+        JSValue prototype = asObject(cell)->prototype();
         if (!prototype.isObject())
             return jsUndefined();
@@ -609 +613 @@
         if (cell->getOwnPropertySlot(exec, propertyName, slot))
             return slot.getValue(exec, propertyName);
-        ASSERT(cell->isObject());
-        JSValue prototype = static_cast<JSObject*>(cell)->prototype();
+        JSValue prototype = asObject(cell)->prototype();
         if (!prototype.isObject())
             return jsUndefined();
@@ -658 +661 @@
 {
     JSCell::markChildren(markStack);
+
     m_structure->markAggregate(markStack);
     

trunk/JavaScriptCore/runtime/JSWrapperObject.h

@@ -26 +26 @@
 
 namespace JSC {
-    
+
     // This class is used as a base for classes such as String,
     // Number, Boolean and Date which are wrappers for primitive types.
@@ -36 +36 @@
         JSValue internalValue() const { return m_internalValue; }
         void setInternalValue(JSValue);
-        
+
+        static PassRefPtr<Structure> createStructure(JSValue prototype) 
+        { 
+            return Structure::create(prototype, TypeInfo(ObjectType, HasStandardGetOwnPropertySlot));
+        }
+
+    private:
         virtual void markChildren(MarkStack&);
         
-    private:
         JSValue m_internalValue;
     };
-    
+
     inline JSWrapperObject::JSWrapperObject(PassRefPtr<Structure> structure)
         : JSObject(structure)
     {
     }
-    
+
     inline void JSWrapperObject::setInternalValue(JSValue value)
     {

trunk/JavaScriptCore/runtime/MarkStack.cpp

@@ -27 +27 @@
 #include "MarkStack.h"
 
-namespace JSC
-{
+namespace JSC {
 
 size_t MarkStack::s_pageSize = 0;