Remove unused VM members
authorjoepeck@webkit.org <joepeck@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 6 Jun 2017 00:03:53 +0000 (00:03 +0000)
committerjoepeck@webkit.org <joepeck@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 6 Jun 2017 00:03:53 +0000 (00:03 +0000)
https://bugs.webkit.org/show_bug.cgi?id=172941

Reviewed by Mark Lam.

* runtime/HashMapImpl.h:
(JSC::HashMapImpl::selectStructure): Deleted.
* runtime/VM.cpp:
(JSC::VM::VM):
* runtime/VM.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@217808 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/runtime/HashMapImpl.h
Source/JavaScriptCore/runtime/VM.cpp
Source/JavaScriptCore/runtime/VM.h

index d4951e3..6177c8a 100644 (file)
@@ -1,5 +1,18 @@
 2017-06-05  Joseph Pecoraro  <pecoraro@apple.com>
 
+        Remove unused VM members
+        https://bugs.webkit.org/show_bug.cgi?id=172941
+
+        Reviewed by Mark Lam.
+
+        * runtime/HashMapImpl.h:
+        (JSC::HashMapImpl::selectStructure): Deleted.
+        * runtime/VM.cpp:
+        (JSC::VM::VM):
+        * runtime/VM.h:
+
+2017-06-05  Joseph Pecoraro  <pecoraro@apple.com>
+
         Web Inspector: Improve ES6 Class instances in Heap Snapshot instances view
         https://bugs.webkit.org/show_bug.cgi?id=172848
         <rdar://problem/25709212>
index eed7c99..86e4cb5 100644 (file)
@@ -285,18 +285,6 @@ class HashMapImpl : public JSNonFinalObject {
     using Base = JSNonFinalObject;
     using HashMapBufferType = HashMapBuffer<HashMapBucketType>;
 
-    template <typename T = HashMapBucketType>
-    static typename std::enable_if<std::is_same<T, HashMapBucket<HashMapBucketDataKey>>::value, Structure*>::type selectStructure(VM& vm)
-    {
-        return vm.hashMapImplSetStructure.get();
-    }
-
-    template <typename T = HashMapBucketType>
-    static typename std::enable_if<std::is_same<T, HashMapBucket<HashMapBucketDataKeyValue>>::value, Structure*>::type selectStructure(VM& vm)
-    {
-        return vm.hashMapImplMapStructure.get();
-    }
-
 public:
     using BucketType = HashMapBucketType;
 
index 5020851..681c28d 100644 (file)
@@ -180,8 +180,6 @@ VM::VM(VMType vmType, HeapType heapType)
     , symbolImplToSymbolMap(*this)
     , prototypeMap(*this)
     , interpreter(0)
-    , jsArrayClassInfo(JSArray::info())
-    , jsFinalObjectClassInfo(JSFinalObject::info())
     , sizeOfLastScratchBuffer(0)
     , entryScope(0)
     , m_regExpCache(new RegExpCache(this))
@@ -224,8 +222,6 @@ VM::VM(VMType vmType, HeapType heapType)
     customGetterSetterStructure.set(*this, CustomGetterSetter::createStructure(*this, 0, jsNull()));
     scopedArgumentsTableStructure.set(*this, ScopedArgumentsTable::createStructure(*this, 0, jsNull()));
     apiWrapperStructure.set(*this, JSAPIValueWrapper::createStructure(*this, 0, jsNull()));
-    JSScopeStructure.set(*this, JSScope::createStructure(*this, 0, jsNull()));
-    executableStructure.set(*this, ExecutableBase::createStructure(*this, 0, jsNull()));
     nativeExecutableStructure.set(*this, NativeExecutable::createStructure(*this, 0, jsNull()));
     evalExecutableStructure.set(*this, EvalExecutable::createStructure(*this, 0, jsNull()));
     programExecutableStructure.set(*this, ProgramExecutable::createStructure(*this, 0, jsNull()));
@@ -265,7 +261,6 @@ VM::VM(VMType vmType, HeapType heapType)
     hashMapBucketSetStructure.set(*this, HashMapBucket<HashMapBucketDataKey>::createStructure(*this, 0, jsNull()));
     hashMapBucketMapStructure.set(*this, HashMapBucket<HashMapBucketDataKeyValue>::createStructure(*this, 0, jsNull()));
 
-    iterationTerminator.set(*this, JSFinalObject::create(*this, JSFinalObject::createStructure(*this, 0, jsNull(), 1)));
     nativeStdFunctionCellStructure.set(*this, NativeStdFunctionCell::createStructure(*this, 0, jsNull()));
     smallStrings.initializeCommonStrings(*this);
 
index 6423188..19e343c 100644 (file)
@@ -314,8 +314,6 @@ public:
     Strong<Structure> customGetterSetterStructure;
     Strong<Structure> scopedArgumentsTableStructure;
     Strong<Structure> apiWrapperStructure;
-    Strong<Structure> JSScopeStructure;
-    Strong<Structure> executableStructure;
     Strong<Structure> nativeExecutableStructure;
     Strong<Structure> evalExecutableStructure;
     Strong<Structure> programExecutableStructure;
@@ -355,10 +353,7 @@ public:
     Strong<Structure> functionCodeBlockStructure;
     Strong<Structure> hashMapBucketSetStructure;
     Strong<Structure> hashMapBucketMapStructure;
-    Strong<Structure> hashMapImplSetStructure;
-    Strong<Structure> hashMapImplMapStructure;
 
-    Strong<JSCell> iterationTerminator;
     Strong<JSCell> emptyPropertyNameEnumerator;
 
     std::unique_ptr<PromiseDeferredTimer> promiseDeferredTimer;
@@ -525,9 +520,6 @@ public:
     void* lastStackTop() { return m_lastStackTop; }
     void setLastStackTop(void*);
 
-    const ClassInfo* const jsArrayClassInfo;
-    const ClassInfo* const jsFinalObjectClassInfo;
-
     JSValue hostCallReturnValue;
     unsigned varargsLength;
     ExecState* newCallFrameReturnValue;