Changeset 176508 in webkit for trunk/Source/JavaScriptCore/bytecode/CodeBlock.h

Timestamp:

Nov 22, 2014, 8:37:15 PM (11 years ago)

Author:

[email protected]

Message:

Clean up OwnPtr and PassOwnPtr in some of JS classes
​https://bugs.webkit.org/show_bug.cgi?id=138724

Reviewed by Filip Pizlo.

As a step to use std::unique_ptr<> and std::make_unique<>, this patch replaces
OwnPtr with std::unique_ptr<>. Besides create() factory function is removed as well.

• builtins/BuiltinExecutables.h:

(JSC::BuiltinExecutables::create): Deleted.

• bytecode/CodeBlock.h:

(JSC::CodeBlock::createRareDataIfNecessary):

• bytecode/StructureStubInfo.h:
• bytecode/UnlinkedCodeBlock.h:

(JSC::UnlinkedCodeBlock::hasRareData):
(JSC::UnlinkedCodeBlock::createRareDataIfNecessary):

• runtime/CodeCache.cpp:

(JSC::CodeCache::getGlobalCodeBlock):

• runtime/CodeCache.h:

(JSC::CodeCache::create): Deleted.

• runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::clearRareData):

• runtime/JSGlobalObject.h:

(JSC::JSGlobalObject::createRareDataIfNeeded):

• runtime/RegExpConstructor.h:
• runtime/SmallStrings.cpp:

(JSC::SmallStrings::createSingleCharacterString):
(JSC::SmallStrings::singleCharacterStringRep):

• runtime/SmallStrings.h:
• runtime/VM.cpp:

(JSC::VM::VM):

• runtime/VM.h:

File:

• trunk/Source/JavaScriptCore/bytecode/CodeBlock.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/bytecode/CodeBlock.h

@@ -955 +955 @@
     bool isKnownToBeLiveDuringGC(); // Will only return valid results when called during GC. Assumes that you've already established that the owner executable is live.
 
+    struct RareData {
+        WTF_MAKE_FAST_ALLOCATED;
+    public:
+        Vector<HandlerInfo> m_exceptionHandlers;
+
+        // Buffers used for large array literals
+        Vector<Vector<JSValue>> m_constantBuffers;
+
+        // Jump Tables
+        Vector<SimpleJumpTable> m_switchJumpTables;
+        Vector<StringJumpTable> m_stringSwitchJumpTables;
+
+        EvalCodeCache m_evalCodeCache;
+    };
 
 protected:
@@ -1022 +1036 @@
     {
         if (!m_rareData)
-            m_rareData = adoptPtr(new RareData);
+            m_rareData = std::make_unique<RareData>();
     }
 
@@ -1105 +1119 @@
     std::unique_ptr<BytecodeLivenessAnalysis> m_livenessAnalysis;
 
-    struct RareData {
-        WTF_MAKE_FAST_ALLOCATED;
-    public:
-        Vector<HandlerInfo> m_exceptionHandlers;
-
-        // Buffers used for large array literals
-        Vector<Vector<JSValue>> m_constantBuffers;
-
-        // Jump Tables
-        Vector<SimpleJumpTable> m_switchJumpTables;
-        Vector<StringJumpTable> m_stringSwitchJumpTables;
-
-        EvalCodeCache m_evalCodeCache;
-    };
-#if COMPILER(MSVC)
-    friend void WTF::deleteOwnedPtr<RareData>(RareData*);
-#endif
-    OwnPtr<RareData> m_rareData;
+    std::unique_ptr<RareData> m_rareData;
 #if ENABLE(JIT)
     DFG::CapabilityLevel m_capabilityLevelState;