Removed another deprecatedAppend

https://bugs.webkit.org/show_bug.cgi?id=56429

Patch by Geoffrey Garen <ggaren@apple.com> on 2011-03-15
Reviewed by Oliver Hunt.

* collector/handles/HandleHeap.cpp:
(JSC::HandleHeap::markStrongHandles):
* collector/handles/HandleHeap.h: Use HeapRootMarker, since handles are
marked directly by the Heap.

* runtime/Heap.cpp:
(JSC::Heap::markRoots): Ditto.



git-svn-id: svn://svn.chromium.org/blink/trunk@81197 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/JavaScriptCore/ChangeLog

@@ -181,6 +181,32 @@
         (JSC::MarkStack::appendValues):
         (JSC::MarkStack::appendSlots):
 
+2011-03-15  Gavin Barraclough  <barraclough@apple.com>
+
+        Rubber Stamped by Sam Weinig.
+
+        Bug 56420 - Remove ENABLE(JIT) code from ByteCompiler
+        Some methods have unnecessary differences in name/arguments for interpreter/JIT.
+
+        * bytecode/CodeBlock.cpp:
+        * bytecode/CodeBlock.h:
+        (JSC::HandlerInfo::HandlerInfo):
+        (JSC::CodeBlock::addPropertyAccessInfo):
+        (JSC::CodeBlock::addGlobalResolveInfo):
+        (JSC::CodeBlock::addCallLinkInfo):
+        (JSC::CodeBlock::globalResolveInfo):
+        * bytecode/Opcode.h:
+        * bytecode/StructureStubInfo.h:
+        * bytecompiler/BytecodeGenerator.cpp:
+        (JSC::BytecodeGenerator::emitResolve):
+        (JSC::BytecodeGenerator::emitResolveWithBase):
+        (JSC::BytecodeGenerator::emitGetById):
+        (JSC::BytecodeGenerator::emitPutById):
+        (JSC::BytecodeGenerator::emitDirectPutById):
+        (JSC::BytecodeGenerator::emitCall):
+        (JSC::BytecodeGenerator::emitConstruct):
+        (JSC::BytecodeGenerator::emitCatch):
+
 2011-03-15  Gavin Barraclough  <barraclough@apple.com>
 
         Reviewed by Sam Weinig.

third_party/WebKit/Source/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -1608,49 +1608,6 @@ void CodeBlock::expressionRangeForBytecodeOffset(unsigned bytecodeOffset, int& d
     return;
 }
 
-#if ENABLE(INTERPRETER)
-bool CodeBlock::hasGlobalResolveInstructionAtBytecodeOffset(unsigned bytecodeOffset)
-{
-    if (m_globalResolveInstructions.isEmpty())
-        return false;
-
-    int low = 0;
-    int high = m_globalResolveInstructions.size();
-    while (low < high) {
-        int mid = low + (high - low) / 2;
-        if (m_globalResolveInstructions[mid] <= bytecodeOffset)
-            low = mid + 1;
-        else
-            high = mid;
-    }
-
-    if (!low || m_globalResolveInstructions[low - 1] != bytecodeOffset)
-        return false;
-    return true;
-}
-#endif
-#if ENABLE(JIT)
-bool CodeBlock::hasGlobalResolveInfoAtBytecodeOffset(unsigned bytecodeOffset)
-{
-    if (m_globalResolveInfos.isEmpty())
-        return false;
-
-    int low = 0;
-    int high = m_globalResolveInfos.size();
-    while (low < high) {
-        int mid = low + (high - low) / 2;
-        if (m_globalResolveInfos[mid].bytecodeOffset <= bytecodeOffset)
-            low = mid + 1;
-        else
-            high = mid;
-    }
-
-    if (!low || m_globalResolveInfos[low - 1].bytecodeOffset != bytecodeOffset)
-        return false;
-    return true;
-}
-#endif
-
 void CodeBlock::shrinkToFit()
 {
     m_instructions.shrinkToFit();

third_party/WebKit/Source/JavaScriptCore/bytecode/CodeBlock.h

@@ -37,16 +37,13 @@
 #include "JumpTable.h"
 #include "Nodes.h"
 #include "RegExp.h"
+#include "StructureStubInfo.h"
 #include "UString.h"
 #include <wtf/FastAllocBase.h>
 #include <wtf/PassOwnPtr.h>
 #include <wtf/RefPtr.h>
 #include <wtf/Vector.h>
 
-#if ENABLE(JIT)
-#include "StructureStubInfo.h"
-#endif
-
 // Register numbers used in bytecode operations have different meaning according to their ranges:
 //      0x80000000-0xFFFFFFFF  Negative indices from the CallFrame pointer are entries in the call frame, see RegisterFile.h.
 //      0x00000000-0x3FFFFFFF  Forwards indices from the CallFrame pointer are local vars and temporaries with the function's callframe.
@@ -68,6 +65,14 @@ namespace JSC {
     static ALWAYS_INLINE int missingThisObjectMarker() { return std::numeric_limits<int>::max(); }
 
     struct HandlerInfo {
+        HandlerInfo(uint32_t start, uint32_t end, uint32_t target, uint32_t scopeDepth)
+            : start(start)
+            , end(end)
+            , target(target)
+            , scopeDepth(scopeDepth)
+        {
+        }
+
         uint32_t start;
         uint32_t end;
         uint32_t target;
@@ -389,18 +394,17 @@ namespace JSC {
         void createActivation(CallFrame*);
 
 #if ENABLE(INTERPRETER)
-        void addPropertyAccessInstruction(unsigned propertyAccessInstruction) { m_propertyAccessInstructions.append(propertyAccessInstruction); }
-        void addGlobalResolveInstruction(unsigned globalResolveInstruction) { m_globalResolveInstructions.append(globalResolveInstruction); }
-        bool hasGlobalResolveInstructionAtBytecodeOffset(unsigned bytecodeOffset);
+        void addPropertyAccessInfo(unsigned propertyAccessInstruction, AccessType) { m_propertyAccessInstructions.append(propertyAccessInstruction); }
+        void addGlobalResolveInfo(unsigned globalResolveInstruction) { m_globalResolveInstructions.append(globalResolveInstruction); }
+        void addCallLinkInfo() { }
 #endif
 #if ENABLE(JIT)
         size_t numberOfStructureStubInfos() const { return m_structureStubInfos.size(); }
-        void addStructureStubInfo(const StructureStubInfo& stubInfo) { m_structureStubInfos.append(stubInfo); }
+        void addPropertyAccessInfo(unsigned, AccessType accessType) { m_structureStubInfos.append(accessType); }
         StructureStubInfo& structureStubInfo(int index) { return m_structureStubInfos[index]; }
 
         void addGlobalResolveInfo(unsigned globalResolveInstruction) { m_globalResolveInfos.append(GlobalResolveInfo(globalResolveInstruction)); }
         GlobalResolveInfo& globalResolveInfo(int index) { return m_globalResolveInfos[index]; }
-        bool hasGlobalResolveInfoAtBytecodeOffset(unsigned bytecodeOffset);
 
         size_t numberOfCallLinkInfos() const { return m_callLinkInfos.size(); }
         void addCallLinkInfo() { m_callLinkInfos.append(CallLinkInfo()); }

third_party/WebKit/Source/JavaScriptCore/bytecode/Opcode.h

@@ -270,6 +270,22 @@ namespace JSC {
         return 0;
     }
 
+    enum AccessType {
+        access_get_by_id_self,
+        access_get_by_id_proto,
+        access_get_by_id_chain,
+        access_get_by_id_self_list,
+        access_get_by_id_proto_list,
+        access_put_by_id_transition,
+        access_put_by_id_replace,
+        access_get_by_id,
+        access_put_by_id,
+        access_get_by_id_generic,
+        access_put_by_id_generic,
+        access_get_array_length,
+        access_get_string_length,
+    };
+
 } // namespace JSC
 
 #endif // Opcode_h

third_party/WebKit/Source/JavaScriptCore/bytecode/StructureStubInfo.h

@@ -35,22 +35,6 @@
 
 namespace JSC {
 
-    enum AccessType {
-        access_get_by_id_self,
-        access_get_by_id_proto,
-        access_get_by_id_chain,
-        access_get_by_id_self_list,
-        access_get_by_id_proto_list,
-        access_put_by_id_transition,
-        access_put_by_id_replace,
-        access_get_by_id,
-        access_put_by_id,
-        access_get_by_id_generic,
-        access_put_by_id_generic,
-        access_get_array_length,
-        access_get_string_length,
-    };
-
     struct StructureStubInfo {
         StructureStubInfo(AccessType accessType)
             : accessType(accessType)

third_party/WebKit/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp

@@ -1201,11 +1201,8 @@ RegisterID* BytecodeGenerator::emitResolve(RegisterID* dst, const Identifier& pr
             return emitGetScopedVar(dst, depth, index, globalObject);
         }
 
-#if ENABLE(JIT)
         m_codeBlock->addGlobalResolveInfo(instructions().size());
-#else
-        m_codeBlock->addGlobalResolveInstruction(instructions().size());
-#endif
+
         emitOpcode(requiresDynamicChecks ? op_resolve_global_dynamic : op_resolve_global);
         instructions().append(dst->index());
         instructions().append(addConstant(property));
@@ -1341,11 +1338,8 @@ RegisterID* BytecodeGenerator::emitResolveWithBase(RegisterID* baseDst, Register
         return baseDst;
     }
 
-#if ENABLE(JIT)
     m_codeBlock->addGlobalResolveInfo(instructions().size());
-#else
-    m_codeBlock->addGlobalResolveInstruction(instructions().size());
-#endif
+
     emitOpcode(requiresDynamicChecks ? op_resolve_global_dynamic : op_resolve_global);
     instructions().append(propDst->index());
     instructions().append(addConstant(property));
@@ -1363,11 +1357,7 @@ void BytecodeGenerator::emitMethodCheck()
 
 RegisterID* BytecodeGenerator::emitGetById(RegisterID* dst, RegisterID* base, const Identifier& property)
 {
-#if ENABLE(JIT)
-    m_codeBlock->addStructureStubInfo(StructureStubInfo(access_get_by_id));
-#else
-    m_codeBlock->addPropertyAccessInstruction(instructions().size());
-#endif
+    m_codeBlock->addPropertyAccessInfo(instructions().size(), access_get_by_id);
 
     emitOpcode(op_get_by_id);
     instructions().append(dst->index());
@@ -1392,11 +1382,7 @@ RegisterID* BytecodeGenerator::emitGetArgumentsLength(RegisterID* dst, RegisterI
 
 RegisterID* BytecodeGenerator::emitPutById(RegisterID* base, const Identifier& property, RegisterID* value)
 {
-#if ENABLE(JIT)
-    m_codeBlock->addStructureStubInfo(StructureStubInfo(access_put_by_id));
-#else
-    m_codeBlock->addPropertyAccessInstruction(instructions().size());
-#endif
+    m_codeBlock->addPropertyAccessInfo(instructions().size(), access_put_by_id);
 
     emitOpcode(op_put_by_id);
     instructions().append(base->index());
@@ -1412,11 +1398,7 @@ RegisterID* BytecodeGenerator::emitPutById(RegisterID* base, const Identifier& p
 
 RegisterID* BytecodeGenerator::emitDirectPutById(RegisterID* base, const Identifier& property, RegisterID* value)
 {
-#if ENABLE(JIT)
-    m_codeBlock->addStructureStubInfo(StructureStubInfo(access_put_by_id));
-#else
-    m_codeBlock->addPropertyAccessInstruction(instructions().size());
-#endif
+    m_codeBlock->addPropertyAccessInfo(instructions().size(), access_put_by_id);
     
     emitOpcode(op_put_by_id);
     instructions().append(base->index());
@@ -1647,9 +1629,7 @@ RegisterID* BytecodeGenerator::emitCall(OpcodeID opcodeID, RegisterID* dst, Regi
 
     emitExpressionInfo(divot, startOffset, endOffset);
 
-#if ENABLE(JIT)
     m_codeBlock->addCallLinkInfo();
-#endif
 
     // Emit call.
     emitOpcode(opcodeID);
@@ -1764,9 +1744,7 @@ RegisterID* BytecodeGenerator::emitConstruct(RegisterID* dst, RegisterID* func,
 
     emitExpressionInfo(divot, startOffset, endOffset);
 
-#if ENABLE(JIT)
     m_codeBlock->addCallLinkInfo();
-#endif
 
     emitOpcode(op_construct);
     instructions().append(func->index()); // func
@@ -2029,11 +2007,7 @@ RegisterID* BytecodeGenerator::emitNextPropertyName(RegisterID* dst, RegisterID*
 RegisterID* BytecodeGenerator::emitCatch(RegisterID* targetRegister, Label* start, Label* end)
 {
     m_usesExceptions = true;
-#if ENABLE(JIT)
-    HandlerInfo info = { start->bind(0, 0), end->bind(0, 0), instructions().size(), m_dynamicScopeDepth + m_baseScopeDepth, CodeLocationLabel() };
-#else
-    HandlerInfo info = { start->bind(0, 0), end->bind(0, 0), instructions().size(), m_dynamicScopeDepth + m_baseScopeDepth };
-#endif
+    HandlerInfo info = HandlerInfo(start->bind(0, 0), end->bind(0, 0), instructions().size(), m_dynamicScopeDepth + m_baseScopeDepth);
 
     m_codeBlock->addExceptionHandler(info);
     emitOpcode(op_catch);