Changeset 64943 in webkit for trunk/JavaScriptCore/bytecode/StructureStubInfo.h

Timestamp:

Aug 8, 2010, 12:22:06 AM (15 years ago)

Author:

[email protected]

Message:

2010-08-07 Sheriff Bot <​[email protected]>

Unreviewed, rolling out r64938.
​http://trac.webkit.org/changeset/64938
​https://bugs.webkit.org/show_bug.cgi?id=43685

Did not compile on several ports (Requested by abarth on
#webkit).

• Android.mk:
• CMakeLists.txt:
• GNUmakefile.am:
• JavaScriptCore.gypi:
• JavaScriptCore.pro:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• assembler/AbstractMacroAssembler.h:
• assembler/MacroAssembler.h:
• assembler/MacroAssemblerX86.h: (JSC::MacroAssemblerX86::load32): (JSC::MacroAssemblerX86::store32):
• assembler/X86Assembler.h: (JSC::X86Assembler::movl_rm): (JSC::X86Assembler::movl_mr):
• bytecode/CodeBlock.cpp: (JSC::CodeBlock::markAggregate):
• bytecode/Instruction.h: (JSC::PolymorphicAccessStructureList::PolymorphicStubInfo::): (JSC::PolymorphicAccessStructureList::PolymorphicStubInfo::set): (JSC::PolymorphicAccessStructureList::PolymorphicAccessStructureList):
• bytecode/StructureStubInfo.cpp: (JSC::StructureStubInfo::deref):
• bytecode/StructureStubInfo.h: (JSC::StructureStubInfo::initGetByIdProto): (JSC::StructureStubInfo::initGetByIdChain): (JSC::StructureStubInfo::):
• jit/JIT.h:
• jit/JITMarkObjects.cpp: Removed.
• jit/JITPropertyAccess.cpp: (JSC::JIT::compileGetDirectOffset): (JSC::JIT::testPrototype): (JSC::JIT::privateCompilePutByIdTransition): (JSC::JIT::privateCompileGetByIdProto): (JSC::JIT::privateCompileGetByIdProtoList): (JSC::JIT::privateCompileGetByIdChainList): (JSC::JIT::privateCompileGetByIdChain):
• jit/JITPropertyAccess32_64.cpp: (JSC::JIT::compileGetDirectOffset): (JSC::JIT::testPrototype): (JSC::JIT::privateCompilePutByIdTransition): (JSC::JIT::privateCompileGetByIdProto): (JSC::JIT::privateCompileGetByIdProtoList): (JSC::JIT::privateCompileGetByIdChainList): (JSC::JIT::privateCompileGetByIdChain):
• jit/JITStubs.cpp: (JSC::setupPolymorphicProtoList):
• wtf/Platform.h:

File:

• trunk/JavaScriptCore/bytecode/StructureStubInfo.h (modified) (6 diffs)

trunk/JavaScriptCore/bytecode/StructureStubInfo.h

@@ -31 +31 @@
 #include "Instruction.h"
 #include "MacroAssembler.h"
-#include "PropertySlot.h"
 #include "Opcode.h"
 #include "Structure.h"
@@ -68 +67 @@
         }
 
-#if ENABLE(MOVABLE_GC_OBJECTS)
-        void initGetByIdProto(Structure* baseObjectStructure, Structure* prototypeStructure, CodeLocationLabel routine, PropertySlot::CachedPropertyType propertyType)
-#else
         void initGetByIdProto(Structure* baseObjectStructure, Structure* prototypeStructure, CodeLocationLabel routine)
-#endif
         {
             accessType = access_get_by_id_proto;
@@ -83 +78 @@
 
             stubRoutine = routine;
-
-#if ENABLE(MOVABLE_GC_OBJECTS)
-            u.getByIdProto.propertyType = propertyType;
-#endif
         }
 
-#if ENABLE(MOVABLE_GC_OBJECTS)
-        void initGetByIdChain(Structure* baseObjectStructure, StructureChain* chain, CodeLocationLabel routine, int count, PropertySlot::CachedPropertyType propertyType)
-#else
         void initGetByIdChain(Structure* baseObjectStructure, StructureChain* chain, CodeLocationLabel routine)
-#endif
         {
             accessType = access_get_by_id_chain;
@@ -104 +91 @@
 
             stubRoutine = routine;
-
-#if ENABLE(MOVABLE_GC_OBJECTS)
-            u.getByIdChain.count = count;
-            u.getByIdChain.propertyType = propertyType;
-#endif
         }
 
@@ -158 +140 @@
 
         void deref();
-#if ENABLE(MOVABLE_GC_OBJECTS)
-        void markAggregate(MarkStack&, CodeBlock*);
-#endif
 
         bool seenOnce()
@@ -182 +161 @@
                 Structure* baseObjectStructure;
                 Structure* prototypeStructure;
-#if ENABLE(MOVABLE_GC_OBJECTS)
-                // The propertyType is required to properly determine the
-                // structure of the underlying code so that we may patch it
-                // correctly.  Different code is generated for different
-                // property types, and therefore, the offsets that we need to
-                // patch at will change.
-                PropertySlot::CachedPropertyType propertyType;
-#endif
             } getByIdProto;
             struct {
                 Structure* baseObjectStructure;
                 StructureChain* chain;
-#if ENABLE(MOVABLE_GC_OBJECTS)
-                // We need the count so that we can iterate over the prototype
-                // chain, marking all of the references to objects.
-                int count;
-                PropertySlot::CachedPropertyType propertyType;
-#endif
             } getByIdChain;
             struct {