Changeset 177222 in webkit for trunk/Source/JavaScriptCore/ftl

Timestamp:

Dec 12, 2014, 5:34:59 AM (10 years ago)

Author:

[email protected]

Message:

Final clean up OwnPtr in JSC - runtime, ftl, and tool directories
​https://bugs.webkit.org/show_bug.cgi?id=139532

Reviewed by Mark Lam.

Final remove OwnPtr, PassOwnPtr in runtime, ftl, and tools directories of JSC.

• builtins/BuiltinExecutables.h:
• bytecode/CodeBlock.h:
• bytecode/UnlinkedCodeBlock.cpp:

(JSC::generateFunctionCodeBlock):

• ftl/FTLAbstractHeap.cpp:

(JSC::FTL::IndexedAbstractHeap::atSlow):

• ftl/FTLAbstractHeap.h:
• ftl/FTLCompile.cpp:

(JSC::FTL::mmAllocateDataSection):

• ftl/FTLJITFinalizer.h:
• jsc.cpp:

(jscmain):

• parser/Lexer.h:
• runtime/PropertyMapHashTable.h:

(JSC::PropertyTable::clearDeletedOffsets):
(JSC::PropertyTable::addDeletedOffset):

• runtime/PropertyTable.cpp:

(JSC::PropertyTable::PropertyTable):

• runtime/RegExpObject.cpp:
• runtime/SmallStrings.cpp:
• runtime/Structure.cpp:
• runtime/StructureIDTable.cpp:

(JSC::StructureIDTable::StructureIDTable):
(JSC::StructureIDTable::resize):

• runtime/StructureIDTable.h:
• runtime/StructureTransitionTable.h:
• runtime/VM.cpp:

(JSC::VM::VM):
(JSC::VM::~VM):

• runtime/VM.h:
• tools/CodeProfile.h:

(JSC::CodeProfile::CodeProfile):
(JSC::CodeProfile::addChild):

Location:

trunk/Source/JavaScriptCore/ftl

Files:

• FTLAbstractHeap.cpp (modified) (1 diff)
• FTLAbstractHeap.h (modified) (2 diffs)
• FTLCompile.cpp (modified) (3 diffs)
• FTLJITFinalizer.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ftl/FTLAbstractHeap.cpp

@@ -103 +103 @@
     
     if (UNLIKELY(!m_largeIndices))
-        m_largeIndices = adoptPtr(new MapType());
+        m_largeIndices = std::make_unique<MapType>();
 
     std::unique_ptr<AbstractField>& field = m_largeIndices->add(index, nullptr).iterator->value;

trunk/Source/JavaScriptCore/ftl/FTLAbstractHeap.h

@@ -35 +35 @@
 #include <wtf/HashMap.h>
 #include <wtf/Noncopyable.h>
-#include <wtf/OwnPtr.h>
 #include <wtf/Vector.h>
 #include <wtf/text/CString.h>
@@ -184 +183 @@
     typedef HashMap<ptrdiff_t, std::unique_ptr<AbstractField>, WTF::IntHash<ptrdiff_t>, WithoutZeroOrOneHashTraits> MapType;
     
-    OwnPtr<MapType> m_largeIndices;
+    std::unique_ptr<MapType> m_largeIndices;
     Vector<CString, 16> m_largeIndexNames;
 };

trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp

@@ -323 +323 @@
         RELEASE_ASSERT(didSeeUnwindInfo);
         
-        OwnPtr<LinkBuffer> linkBuffer = adoptPtr(new LinkBuffer(
-            vm, exitThunkGenerator, codeBlock, JITCompilationMustSucceed));
+        auto linkBuffer = std::make_unique<LinkBuffer>(
+            vm, exitThunkGenerator, codeBlock, JITCompilationMustSucceed);
         
         RELEASE_ASSERT(state.finalizer->osrExit.size() == state.jitCode->osrExit.size());
@@ -360 +360 @@
         }
         
-        state.finalizer->exitThunksLinkBuffer = linkBuffer.release();
+        state.finalizer->exitThunksLinkBuffer = WTF::move(linkBuffer);
     }
 
@@ -484 +484 @@
         MacroAssembler::Jump exceptionJump = slowPathJIT.jump();
         
-        state.finalizer->sideCodeLinkBuffer = adoptPtr(
-            new LinkBuffer(vm, slowPathJIT, codeBlock, JITCompilationMustSucceed));
+        state.finalizer->sideCodeLinkBuffer = std::make_unique<LinkBuffer>(vm, slowPathJIT, codeBlock, JITCompilationMustSucceed);
         state.finalizer->sideCodeLinkBuffer->link(
             exceptionJump, state.finalizer->handleExceptionsLinkBuffer->entrypoint());

trunk/Source/JavaScriptCore/ftl/FTLJITFinalizer.h

@@ -49 +49 @@
     bool finalizeFunction() override;
 
-    OwnPtr<LinkBuffer> exitThunksLinkBuffer;
+    std::unique_ptr<LinkBuffer> exitThunksLinkBuffer;
     std::unique_ptr<LinkBuffer> entrypointLinkBuffer;
-    OwnPtr<LinkBuffer> sideCodeLinkBuffer;
+    std::unique_ptr<LinkBuffer> sideCodeLinkBuffer;
     std::unique_ptr<LinkBuffer> handleExceptionsLinkBuffer;
     Vector<SlowPathCall> slowPathCalls; // Calls inside the side code.