Ignore:
Timestamp:
Jun 13, 2012, 2:38:42 AM (13 years ago)
Author:
[email protected]
Message:

Unreviewed, rolling out r120172.
​http://trac.webkit.org/changeset/120172
​https://bugs.webkit.org/show_bug.cgi?id=88976

The patch causes compilation failures on Gtk, Qt and Apple Win
bots (Requested by zdobersek on #webkit).

Patch by Sheriff Bot <​[email protected]> on 2012-06-13

Source/JavaScriptCore:

  • CMakeLists.txt:
  • GNUmakefile.list.am:
  • JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
  • JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
  • JavaScriptCore.xcodeproj/project.pbxproj:
  • Target.pri:
  • assembler/ARMv7Assembler.h:

(JSC::ARMv7Assembler::nop):
(JSC::ARMv7Assembler::label):
(JSC::ARMv7Assembler::readPointer):
(ARMv7Assembler):

  • assembler/AbstractMacroAssembler.h:

(JSC):
(AbstractMacroAssembler):
(Label):

  • assembler/AssemblerBuffer.h:
  • assembler/MacroAssemblerARM.h:
  • assembler/MacroAssemblerARMv7.h:

(JSC::MacroAssemblerARMv7::nop):
(JSC::MacroAssemblerARMv7::jump):
(JSC::MacroAssemblerARMv7::makeBranch):

  • assembler/MacroAssemblerMIPS.h:
  • assembler/MacroAssemblerSH4.h:
  • assembler/MacroAssemblerX86.h:

(MacroAssemblerX86):
(JSC::MacroAssemblerX86::moveWithPatch):

  • assembler/MacroAssemblerX86Common.h:
  • assembler/MacroAssemblerX86_64.h:

(JSC::MacroAssemblerX86_64::branchTest8):

  • assembler/X86Assembler.h:

(JSC::X86Assembler::cmpb_im):
(JSC::X86Assembler::codeSize):
(JSC::X86Assembler::label):
(JSC::X86Assembler::X86InstructionFormatter::memoryModRM):

  • bytecode/CodeBlock.cpp:

(JSC::CodeBlock::dump):

  • bytecode/CodeBlock.h:

(JSC::CodeBlock::appendOSRExit):
(JSC::CodeBlock::appendSpeculationRecovery):
(DFGData):

  • bytecode/DFGExitProfile.h:

(JSC::DFG::exitKindToString):
(JSC::DFG::exitKindIsCountable):

  • bytecode/Instruction.h:
  • bytecode/Opcode.h:

(JSC):
(JSC::padOpcodeName):

  • bytecode/Watchpoint.cpp: Removed.
  • bytecode/Watchpoint.h: Removed.
  • bytecompiler/BytecodeGenerator.cpp:

(JSC::ResolveResult::checkValidity):
(JSC::BytecodeGenerator::addGlobalVar):
(JSC::BytecodeGenerator::BytecodeGenerator):
(JSC::BytecodeGenerator::resolve):
(JSC::BytecodeGenerator::emitResolve):
(JSC::BytecodeGenerator::emitResolveWithBase):
(JSC::BytecodeGenerator::emitResolveWithThis):
(JSC::BytecodeGenerator::emitGetStaticVar):
(JSC::BytecodeGenerator::emitPutStaticVar):

  • bytecompiler/BytecodeGenerator.h:

(BytecodeGenerator):

  • bytecompiler/NodesCodegen.cpp:

(JSC::FunctionCallResolveNode::emitBytecode):
(JSC::PostfixResolveNode::emitBytecode):
(JSC::PrefixResolveNode::emitBytecode):
(JSC::ReadModifyResolveNode::emitBytecode):
(JSC::AssignResolveNode::emitBytecode):
(JSC::ConstDeclNode::emitCodeSingle):

  • dfg/DFGAbstractState.cpp:

(JSC::DFG::AbstractState::execute):
(JSC::DFG::AbstractState::clobberStructures):

  • dfg/DFGAbstractState.h:

(AbstractState):

  • dfg/DFGByteCodeParser.cpp:

(JSC::DFG::ByteCodeParser::handleInlining):
(JSC::DFG::ByteCodeParser::parseBlock):

  • dfg/DFGCCallHelpers.h:

(JSC::DFG::CCallHelpers::setupArguments):

  • dfg/DFGCSEPhase.cpp:

(JSC::DFG::CSEPhase::globalVarStoreElimination):
(JSC::DFG::CSEPhase::performNodeCSE):

  • dfg/DFGCapabilities.h:

(JSC::DFG::canCompileOpcode):

  • dfg/DFGConstantFoldingPhase.cpp:

(JSC::DFG::ConstantFoldingPhase::run):

  • dfg/DFGCorrectableJumpPoint.h:
  • dfg/DFGJITCompiler.cpp:

(JSC::DFG::JITCompiler::linkOSRExits):
(JSC::DFG::JITCompiler::link):

  • dfg/DFGNode.h:

(JSC::DFG::Node::hasRegisterPointer):

  • dfg/DFGNodeType.h:

(DFG):

  • dfg/DFGOSRExit.cpp:

(JSC::DFG::OSRExit::OSRExit):

  • dfg/DFGOSRExit.h:

(OSRExit):

  • dfg/DFGOperations.cpp:
  • dfg/DFGOperations.h:
  • dfg/DFGPredictionPropagationPhase.cpp:

(JSC::DFG::PredictionPropagationPhase::propagate):

  • dfg/DFGSpeculativeJIT.h:

(JSC::DFG::SpeculativeJIT::callOperation):
(JSC::DFG::SpeculativeJIT::appendCallSetResult):
(JSC::DFG::SpeculativeJIT::speculationCheck):

  • dfg/DFGSpeculativeJIT32_64.cpp:

(JSC::DFG::SpeculativeJIT::compile):

  • dfg/DFGSpeculativeJIT64.cpp:

(JSC::DFG::SpeculativeJIT::compile):

  • jit/JIT.cpp:

(JSC::JIT::privateCompileMainPass):
(JSC::JIT::privateCompileSlowCases):

  • jit/JIT.h:
  • jit/JITPropertyAccess.cpp:
  • jit/JITPropertyAccess32_64.cpp:
  • jit/JITStubs.cpp:
  • jit/JITStubs.h:
  • llint/LLIntSlowPaths.cpp:
  • llint/LLIntSlowPaths.h:

(LLInt):

  • llint/LowLevelInterpreter32_64.asm:
  • llint/LowLevelInterpreter64.asm:
  • runtime/JSObject.cpp:

(JSC::JSObject::removeDirect):

  • runtime/JSObject.h:

(JSObject):

  • runtime/JSSymbolTableObject.h:

(JSC::symbolTableGet):
(JSC::symbolTablePut):
(JSC::symbolTablePutWithAttributes):

  • runtime/SymbolTable.cpp: Removed.
  • runtime/SymbolTable.h:

(JSC):
(JSC::SymbolTableEntry::isNull):
(JSC::SymbolTableEntry::getIndex):
(SymbolTableEntry):
(JSC::SymbolTableEntry::getAttributes):
(JSC::SymbolTableEntry::isReadOnly):
(JSC::SymbolTableEntry::pack):
(JSC::SymbolTableEntry::isValidIndex):

Source/WTF:

  • wtf/SegmentedVector.h:

(WTF):
(SegmentedVectorIterator):
(WTF::SegmentedVectorIterator::operator=):
(WTF::SegmentedVectorIterator::SegmentedVectorIterator):
(SegmentedVector):

LayoutTests:

  • fast/js/dfg-call-function-hit-watchpoint-expected.txt: Removed.
  • fast/js/dfg-call-function-hit-watchpoint.html: Removed.
  • fast/js/jsc-test-list:
  • fast/js/script-tests/dfg-call-function-hit-watchpoint.js: Removed.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/runtime/JSSymbolTableObject.h

    r120172 r120175  
    7373    SymbolTableObjectType* object, PropertyName propertyName, PropertySlot& slot)
    7474{
    75     SymbolTable& symbolTable = object->symbolTable();
    76     SymbolTable::iterator iter = symbolTable.find(propertyName.publicName());
    77     if (iter == symbolTable.end())
     75    SymbolTableEntry entry = object->symbolTable().inlineGet(propertyName.publicName());
     76    if (entry.isNull())
    7877        return false;
    79     SymbolTableEntry::Fast entry = iter->second;
    80     ASSERT(!entry.isNull());
    8178    slot.setValue(object->registerAt(entry.getIndex()).get());
    8279    return true;
    … …  
    8784    SymbolTableObjectType* object, PropertyName propertyName, PropertyDescriptor& descriptor)
    8885{
    89     SymbolTable& symbolTable = object->symbolTable();
    90     SymbolTable::iterator iter = symbolTable.find(propertyName.publicName());
    91     if (iter == symbolTable.end())
     86    SymbolTableEntry entry = object->symbolTable().inlineGet(propertyName.publicName());
     87    if (entry.isNull())
    9288        return false;
    93     SymbolTableEntry::Fast entry = iter->second;
    94     ASSERT(!entry.isNull());
    9589    descriptor.setDescriptor(
    9690        object->registerAt(entry.getIndex()).get(), entry.getAttributes() | DontDelete);
    … …  
    10397    bool& slotIsWriteable)
    10498{
    105     SymbolTable& symbolTable = object->symbolTable();
    106     SymbolTable::iterator iter = symbolTable.find(propertyName.publicName());
    107     if (iter == symbolTable.end())
     99    SymbolTableEntry entry = object->symbolTable().inlineGet(propertyName.publicName());
     100    if (entry.isNull())
    108101        return false;
    109     SymbolTableEntry::Fast entry = iter->second;
    110     ASSERT(!entry.isNull());
    111102    slot.setValue(object->registerAt(entry.getIndex()).get());
    112103    slotIsWriteable = !entry.isReadOnly();
    … …  
    122113    ASSERT(!Heap::heap(value) || Heap::heap(value) == Heap::heap(object));
    123114   
    124     SymbolTable& symbolTable = object->symbolTable();
    125     SymbolTable::iterator iter = symbolTable.find(propertyName.publicName());
    126     if (iter == symbolTable.end())
     115    SymbolTableEntry entry = object->symbolTable().inlineGet(propertyName.publicName());
     116    if (entry.isNull())
    127117        return false;
    128     bool wasFat;
    129     SymbolTableEntry::Fast fastEntry = iter->second.getFast(wasFat);
    130     ASSERT(!fastEntry.isNull());
    131     if (fastEntry.isReadOnly()) {
     118    if (entry.isReadOnly()) {
    132119        if (shouldThrow)
    133120            throwTypeError(exec, StrictModeReadonlyPropertyWriteError);
    134121        return true;
    135122    }
    136     if (UNLIKELY(wasFat))
    137         iter->second.notifyWrite();
    138     object->registerAt(fastEntry.getIndex()).set(globalData, object, value);
     123    object->registerAt(entry.getIndex()).set(globalData, object, value);
    139124    return true;
    140125}
    … …  
    152137    SymbolTableEntry& entry = iter->second;
    153138    ASSERT(!entry.isNull());
    154     entry.notifyWrite();
    155139    entry.setAttributes(attributes);
    156140    object->registerAt(entry.getIndex()).set(globalData, object, value);
Note: See TracChangeset for help on using the changeset viewer.