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

Timestamp:

Dec 10, 2014, 9:31:04 PM (10 years ago)

Author:

[email protected]

Message:

Use std::unique_ptr instead of OwnPtr in JSC - heap, jit, runtime, and parser directories
​https://bugs.webkit.org/show_bug.cgi?id=139351

Reviewed by Filip Pizlo.

As a step to use std::unique_ptr<>, this cleans up OwnPtr and PassOwnPtr.

• bytecode/SamplingTool.h:

(JSC::SamplingTool::SamplingTool):

• heap/CopiedBlock.h:

(JSC::CopiedBlock::didSurviveGC):
(JSC::CopiedBlock::pin):

• heap/CopiedBlockInlines.h:

(JSC::CopiedBlock::reportLiveBytes):

• heap/GCActivityCallback.h:
• heap/GCThread.cpp:
• heap/Heap.h:
• heap/HeapInlines.h:

(JSC::Heap::markListSet):

• jit/ExecutableAllocator.cpp:
• jit/JIT.cpp:

(JSC::JIT::privateCompile):

• jit/JIT.h:
• jit/JITThunks.cpp:

(JSC::JITThunks::JITThunks):
(JSC::JITThunks::clearHostFunctionStubs):

• jit/JITThunks.h:
• parser/Parser.cpp:

(JSC::Parser<LexerType>::Parser):

• parser/Parser.h:

(JSC::Scope::Scope):
(JSC::Scope::pushLabel):

• parser/ParserArena.cpp:
• parser/ParserArena.h:

(JSC::ParserArena::identifierArena):

• parser/SourceProviderCache.h:
• runtime/CodeCache.h:
• runtime/Executable.h:
• runtime/JSArray.cpp:

(JSC::JSArray::sortVector):

• runtime/JSGlobalObject.h:

Location:

trunk/Source/JavaScriptCore/heap

Files:

• CopiedBlock.h (modified) (4 diffs)
• CopiedBlockInlines.h (modified) (1 diff)
• GCActivityCallback.h (modified) (1 diff)
• GCThread.cpp (modified) (1 diff)
• Heap.h (modified) (1 diff)
• HeapInlines.h (modified) (1 diff)

trunk/Source/JavaScriptCore/heap/CopiedBlock.h

@@ -33 +33 @@
 #include "Options.h"
 #include <wtf/Atomics.h>
-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
 
 namespace JSC {
@@ -95 +93 @@
 
     SpinLock m_workListLock;
-    OwnPtr<CopyWorkList> m_workList;
+    std::unique_ptr<CopyWorkList> m_workList;
 
     size_t m_remaining;
@@ -155 +153 @@
     m_isPinned = false;
     if (m_workList)
-        m_workList.clear();
+        m_workList = nullptr;
 }
 
@@ -186 +184 @@
     m_isPinned = true;
     if (m_workList)
-        m_workList.clear();
+        m_workList = nullptr;
 }
 

trunk/Source/JavaScriptCore/heap/CopiedBlockInlines.h

@@ -63 +63 @@
 
     if (!m_workList)
-        m_workList = adoptPtr(new CopyWorkList(Heap::heap(owner)->blockAllocator()));
+        m_workList = std::make_unique<CopyWorkList>(Heap::heap(owner)->blockAllocator());
 
     m_workList->append(CopyWorklistItem(owner, token));

trunk/Source/JavaScriptCore/heap/GCActivityCallback.h

@@ -31 +31 @@
 
 #include "HeapTimer.h"
-#include <wtf/OwnPtr.h>
 #include <wtf/PassRefPtr.h>
 

trunk/Source/JavaScriptCore/heap/GCThread.cpp

@@ -33 +33 @@
 #include "SlotVisitor.h"
 #include <wtf/MainThread.h>
-#include <wtf/PassOwnPtr.h>
 
 namespace JSC {

trunk/Source/JavaScriptCore/heap/Heap.h

@@ -354 +354 @@
     ProtectCountSet m_protectedValues;
     Vector<Vector<ValueStringPair, 0, UnsafeVectorOverflow>*> m_tempSortingVectors;
-    OwnPtr<HashSet<MarkedArgumentBuffer*>> m_markListSet;
+    std::unique_ptr<HashSet<MarkedArgumentBuffer*>> m_markListSet;
 
     MachineThreads m_machineThreads;

trunk/Source/JavaScriptCore/heap/HeapInlines.h

@@ -287 +287 @@
 {
     if (!m_markListSet)
-        m_markListSet = adoptPtr(new HashSet<MarkedArgumentBuffer*>); 
+        m_markListSet = std::make_unique<HashSet<MarkedArgumentBuffer*>>();
     return *m_markListSet;
 }