Changeset 96465 in webkit for trunk/Source/JavaScriptCore/heap

Timestamp:

Oct 1, 2011, 5:54:56 PM (14 years ago)

Author:

[email protected]

Message:

Removed redundant helper functions for allocating Strong handles
​https://bugs.webkit.org/show_bug.cgi?id=69218

Reviewed by Sam Weinig.

../JavaScriptCore:

• heap/Heap.h:

(JSC::Heap::handleHeap):

• runtime/JSGlobalData.h: Removed these helper functions, since they

just created indirection.

• heap/StrongInlines.h: Added. Broke out a header for inline functions

to resolve circular dependencies created by inlining. I'm told this is
the future for JavaScriptCore.

• GNUmakefile.list.am:
• JavaScriptCore.gypi:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj: Go forth and build.

• API/JSCallbackObjectFunctions.h:

(JSC::::init):

• runtime/WeakGCMap.h:

(JSC::WeakGCMap::add):
(JSC::WeakGCMap::set):

• runtime/StructureTransitionTable.h:

(JSC::StructureTransitionTable::setSingleTransition):

• heap/Local.h:

(JSC::::Local):

• heap/Strong.h:

(JSC::::Strong):
(JSC::::set):

• heap/Weak.h:

(JSC::Weak::Weak):
(JSC::Weak::set): Allocate handles directly instead of going through a
chain of forwarding functions.

• bytecompiler/BytecodeGenerator.cpp:
• runtime/JSGlobalData.cpp:
• runtime/LiteralParser.cpp:
• runtime/RegExpCache.cpp: Updated for header changes.

../JavaScriptGlue:

• JSRun.cpp:
• JSValueWrapper.cpp:

../WebCore:

• ForwardingHeaders/heap/StrongInlines.h: Added.
• bindings/js/JSCallbackData.h:
• bindings/js/JSDOMWindowShell.cpp:
• bindings/js/ScheduledAction.h:
• bindings/js/ScriptCachedFrameData.cpp:
• bindings/js/ScriptController.cpp:
• bindings/js/ScriptState.cpp:
• bindings/js/ScriptValue.h:
• bindings/js/WorkerScriptController.cpp:
• bridge/runtime_root.cpp:

../WebKit2:

• WebProcess/Plugins/Netscape/NPJSObject.cpp:
• WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp:

Location:

trunk/Source/JavaScriptCore/heap

Files:

• Heap.h (modified) (1 diff)
• Local.h (modified) (2 diffs)
• Strong.h (modified) (3 diffs)
• StrongInlines.h (added)
• Weak.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/heap/Heap.h

@@ -119 +119 @@
         template<typename Functor> typename Functor::ReturnType forEachProtectedCell(Functor&);
         template<typename Functor> typename Functor::ReturnType forEachProtectedCell();
-        
-        HandleSlot allocateGlobalHandle() { return m_handleHeap.allocate(); }
-        HandleSlot allocateLocalHandle() { return m_handleStack.push(); }
-
+
+        HandleHeap* handleHeap() { return &m_handleHeap; }
         HandleStack* handleStack() { return &m_handleStack; }
+
         void getConservativeRegisterRoots(HashSet<JSCell*>& roots);
 

trunk/Source/JavaScriptCore/heap/Local.h

@@ -58 +58 @@
 
 template <typename T> inline Local<T>::Local(JSGlobalData& globalData, ExternalType value)
-    : Handle<T>(globalData.allocateLocalHandle())
+    : Handle<T>(globalData.heap.handleStack()->push())
 {
     set(value);
@@ -64 +64 @@
 
 template <typename T> inline Local<T>::Local(JSGlobalData& globalData, Handle<T> other)
-    : Handle<T>(globalData.allocateLocalHandle())
+    : Handle<T>(globalData.heap.handleStack()->push())
 {
     set(other.get());

trunk/Source/JavaScriptCore/heap/Strong.h

@@ -34 +34 @@
 
 class JSGlobalData;
-HandleSlot allocateGlobalHandle(JSGlobalData&);
 
 // A strongly referenced handle that prevents the object it points to from being garbage collected.
@@ -49 +48 @@
     }
     
-    Strong(JSGlobalData& globalData, ExternalType value = ExternalType())
-        : Handle<T>(allocateGlobalHandle(globalData))
-    {
-        set(value);
-    }
+    Strong(JSGlobalData&, ExternalType = ExternalType());
 
-    Strong(JSGlobalData& globalData, Handle<T> handle)
-        : Handle<T>(allocateGlobalHandle(globalData))
-    {
-        set(handle.get());
-    }
+    Strong(JSGlobalData&, Handle<T>);
     
     Strong(const Strong& other)
@@ -96 +87 @@
     }
 
-    void set(JSGlobalData& globalData, ExternalType value)
-    {
-        if (!slot())
-            setSlot(allocateGlobalHandle(globalData));
-        set(value);
-    }
+    void set(JSGlobalData&, ExternalType);
 
     template <typename U> Strong& operator=(const Strong<U>& other)

trunk/Source/JavaScriptCore/heap/Weak.h

@@ -48 +48 @@
 
     Weak(JSGlobalData& globalData, ExternalType value = ExternalType(), WeakHandleOwner* weakOwner = 0, void* context = 0)
-        : Handle<T>(globalData.allocateGlobalHandle())
+        : Handle<T>(globalData.heap.handleHeap()->allocate())
     {
         HandleHeap::heapFor(slot())->makeWeak(slot(), weakOwner, context);
@@ -107 +107 @@
     {
         if (!slot()) {
-            setSlot(globalData.allocateGlobalHandle());
+            setSlot(globalData.heap.handleHeap()->allocate());
             HandleHeap::heapFor(slot())->makeWeak(slot(), weakOwner, context);
         }