Revert "Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn.webkit.org/repository/webkit/trunk@131300)"

This reverts commit 5466563f4b5b6b86523e3f89bb7f77e5b5270c78.

Caused OOM issues on some CI machines :(

1 files changed, 5 insertions, 30 deletions

diff --git a/Source/JavaScriptCore/bytecode/CodeBlock.h b/Source/JavaScriptCore/bytecode/CodeBlock.h
index 01a8ef4a1..22c48311c 100644
--- a/Source/JavaScriptCore/bytecode/CodeBlock.h
+++ b/Source/JavaScriptCore/bytecode/CodeBlock.h
@@ -31,7 +31,6 @@
 #define CodeBlock_h
 
 #include "ArrayProfile.h"
-#include "ByValInfo.h"
 #include "BytecodeConventions.h"
 #include "CallLinkInfo.h"
 #include "CallReturnOffsetToBytecodeOffset.h"
@@ -160,7 +159,7 @@ namespace JSC {
             return result;
         }
 #endif
-
+        
         void visitAggregate(SlotVisitor&);
 
         static void dumpStatistics();
@@ -210,11 +209,6 @@ namespace JSC {
         }
         
         void resetStub(StructureStubInfo&);
-        
-        ByValInfo& getByValInfo(unsigned bytecodeIndex)
-        {
-            return *(binarySearch<ByValInfo, unsigned, getByValInfoBytecodeIndex>(m_byValInfos.begin(), m_byValInfos.size(), bytecodeIndex));
-        }
 
         CallLinkInfo& getCallLinkInfo(ReturnAddressPtr returnAddress)
         {
@@ -616,10 +610,6 @@ namespace JSC {
         void setNumberOfStructureStubInfos(size_t size) { m_structureStubInfos.grow(size); }
         size_t numberOfStructureStubInfos() const { return m_structureStubInfos.size(); }
         StructureStubInfo& structureStubInfo(int index) { return m_structureStubInfos[index]; }
-        
-        void setNumberOfByValInfos(size_t size) { m_byValInfos.grow(size); }
-        size_t numberOfByValInfos() const { return m_byValInfos.size(); }
-        ByValInfo& byValInfo(size_t index) { return m_byValInfos[index]; }
 
         void addGlobalResolveInfo(unsigned globalResolveInstruction)
         {
@@ -925,32 +915,18 @@ namespace JSC {
         }
         RegExp* regexp(int index) const { ASSERT(m_rareData); return m_rareData->m_regexps[index].get(); }
 
-        unsigned numberOfConstantBuffers() const
-        {
-            if (!m_rareData)
-                return 0;
-            return m_rareData->m_constantBuffers.size();
-        }
-        unsigned addConstantBuffer(const Vector<JSValue>& buffer)
+        unsigned addConstantBuffer(unsigned length)
         {
             createRareDataIfNecessary();
             unsigned size = m_rareData->m_constantBuffers.size();
-            m_rareData->m_constantBuffers.append(buffer);
+            m_rareData->m_constantBuffers.append(Vector<JSValue>(length));
             return size;
         }
-        unsigned addConstantBuffer(unsigned length)
-        {
-            return addConstantBuffer(Vector<JSValue>(length));
-        }
 
-        Vector<JSValue>& constantBufferAsVector(unsigned index)
-        {
-            ASSERT(m_rareData);
-            return m_rareData->m_constantBuffers[index];
-        }
         JSValue* constantBuffer(unsigned index)
         {
-            return constantBufferAsVector(index).data();
+            ASSERT(m_rareData);
+            return m_rareData->m_constantBuffers[index].data();
         }
 
         JSGlobalObject* globalObject() { return m_globalObject.get(); }
@@ -1313,7 +1289,6 @@ namespace JSC {
 #endif
 #if ENABLE(JIT)
         Vector<StructureStubInfo> m_structureStubInfos;
-        Vector<ByValInfo> m_byValInfos;
         Vector<GlobalResolveInfo> m_globalResolveInfos;
         Vector<CallLinkInfo> m_callLinkInfos;
         Vector<MethodCallLinkInfo> m_methodCallLinkInfos;