Ignore:
Timestamp:
Feb 21, 2012, 8:26:12 AM (13 years ago)
Author:
Adam Roben
Message:

Roll out r108309, r108323, and r108326

They broke the 32-bit Lion build.

Original bugs is <​http://webkit.org/b/75812> <rdar://problem/10079694>.

Source/JavaScriptCore:

  • CMakeLists.txt:
  • GNUmakefile.am:
  • GNUmakefile.list.am:
  • JavaScriptCore.pri:
  • JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
  • JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops:
  • JavaScriptCore.vcproj/JavaScriptCore/copy-files.cmd:
  • JavaScriptCore.xcodeproj/project.pbxproj:
  • Target.pri:
  • assembler/LinkBuffer.h:
  • assembler/MacroAssemblerCodeRef.h:
  • bytecode/BytecodeConventions.h: Removed.
  • bytecode/CallLinkStatus.cpp:
  • bytecode/CallLinkStatus.h:
  • bytecode/CodeBlock.cpp:
  • bytecode/CodeBlock.h:
  • bytecode/GetByIdStatus.cpp:
  • bytecode/GetByIdStatus.h:
  • bytecode/Instruction.h:
  • bytecode/LLIntCallLinkInfo.h: Removed.
  • bytecode/MethodCallLinkStatus.cpp:
  • bytecode/Opcode.cpp:
  • bytecode/Opcode.h:
  • bytecode/PutByIdStatus.cpp:
  • bytecode/PutByIdStatus.h:
  • bytecompiler/BytecodeGenerator.cpp:
  • dfg/DFGByteCodeParser.cpp:
  • dfg/DFGCapabilities.h:
  • dfg/DFGOSRExitCompiler.cpp:
  • dfg/DFGOperations.cpp:
  • heap/Heap.h:
  • heap/MarkStack.cpp:
  • heap/MarkedAllocator.h:
  • heap/MarkedSpace.h:
  • interpreter/CallFrame.cpp:
  • interpreter/CallFrame.h:
  • interpreter/Interpreter.cpp:
  • interpreter/Interpreter.h:
  • interpreter/RegisterFile.h:
  • jit/ExecutableAllocator.h:
  • jit/HostCallReturnValue.cpp: Removed.
  • jit/HostCallReturnValue.h: Removed.
  • jit/JIT.cpp:
  • jit/JITCode.h:
  • jit/JITDriver.h:
  • jit/JITExceptions.cpp:
  • jit/JITInlineMethods.h:
  • jit/JITStubs.cpp:
  • jit/JITStubs.h:
  • jit/JSInterfaceJIT.h:
  • llint/LLIntCommon.h: Removed.
  • llint/LLIntData.cpp: Removed.
  • llint/LLIntData.h: Removed.
  • llint/LLIntEntrypoints.cpp: Removed.
  • llint/LLIntEntrypoints.h: Removed.
  • llint/LLIntExceptions.cpp: Removed.
  • llint/LLIntExceptions.h: Removed.
  • llint/LLIntOfflineAsmConfig.h: Removed.
  • llint/LLIntOffsetsExtractor.cpp: Removed.
  • llint/LLIntSlowPaths.cpp: Removed.
  • llint/LLIntSlowPaths.h: Removed.
  • llint/LLIntThunks.cpp: Removed.
  • llint/LLIntThunks.h: Removed.
  • llint/LowLevelInterpreter.asm: Removed.
  • llint/LowLevelInterpreter.cpp: Removed.
  • llint/LowLevelInterpreter.h: Removed.
  • offlineasm/armv7.rb: Removed.
  • offlineasm/asm.rb: Removed.
  • offlineasm/ast.rb: Removed.
  • offlineasm/backends.rb: Removed.
  • offlineasm/generate_offset_extractor.rb: Removed.
  • offlineasm/instructions.rb: Removed.
  • offlineasm/offset_extractor_constants.rb: Removed.
  • offlineasm/offsets.rb: Removed.
  • offlineasm/opt.rb: Removed.
  • offlineasm/parser.rb: Removed.
  • offlineasm/registers.rb: Removed.
  • offlineasm/self_hash.rb: Removed.
  • offlineasm/settings.rb: Removed.
  • offlineasm/transform.rb: Removed.
  • offlineasm/x86.rb: Removed.
  • runtime/CodeSpecializationKind.h: Removed.
  • runtime/CommonSlowPaths.h:
  • runtime/Executable.cpp:
  • runtime/Executable.h:
  • runtime/ExecutionHarness.h: Removed.
  • runtime/JSArray.h:
  • runtime/JSCell.h:
  • runtime/JSFunction.h:
  • runtime/JSGlobalData.cpp:
  • runtime/JSGlobalData.h:
  • runtime/JSGlobalObject.h:
  • runtime/JSObject.h:
  • runtime/JSPropertyNameIterator.h:
  • runtime/JSString.h:
  • runtime/JSTypeInfo.h:
  • runtime/JSValue.cpp:
  • runtime/JSValue.h:
  • runtime/JSVariableObject.h:
  • runtime/Options.cpp:
  • runtime/Options.h:
  • runtime/ScopeChain.h:
  • runtime/Structure.cpp:
  • runtime/Structure.h:
  • runtime/StructureChain.h:
  • wtf/InlineASM.h:
  • wtf/Platform.h:
  • wtf/SentinelLinkedList.h:
  • wtf/text/StringImpl.h:

Source/WebCore:

  • CMakeLists.txt:

Source/WebKit:

  • CMakeLists.txt:

Tools:

  • DumpRenderTree/efl/CMakeLists.txt:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/interpreter/CallFrame.cpp

    r108309 r108358  
    5151#endif
    5252
    53 #if USE(JSVALUE32_64)
    54 unsigned CallFrame::bytecodeOffsetForNonDFGCode() const
    55 {
    56     ASSERT(codeBlock());
    57     return currentVPC() - codeBlock()->instructions().begin();
    58 }
    59 
    60 void CallFrame::setBytecodeOffsetForNonDFGCode(unsigned offset)
    61 {
    62     ASSERT(codeBlock());
    63     setCurrentVPC(codeBlock()->instructions().begin() + offset);
    64 }
    65 #else
    66 Instruction* CallFrame::currentVPC() const
    67 {
    68     return codeBlock()->instructions().begin() + bytecodeOffsetForNonDFGCode();
    69 }
    70 void CallFrame::setCurrentVPC(Instruction* vpc)
    71 {
    72     setBytecodeOffsetForNonDFGCode(vpc - codeBlock()->instructions().begin());
    73 }
    74 #endif
    75    
    7653#if ENABLE(DFG_JIT)
    7754bool CallFrame::isInlineCallFrameSlow()
    … …  
    166143
    167144    // Am I an inline call frame? If so, we're done.
    168     if (isInlineCallFrame())
     145    if (isInlineCallFrame() || !hasReturnPC())
    169146        return callerFrame()->removeHostCallFrameFlag();
    170147   
    … …  
    177154   
    178155    // Figure out how we want to get the current code location.
    179     if (!hasReturnPC() || returnAddressIsInCtiTrampoline(returnPC()))
     156    if (hasHostCallFrameFlag() || returnAddressIsInCtiTrampoline(returnPC()))
    180157        return machineCaller->trueCallFrameFromVMCode()->removeHostCallFrameFlag();
    181158   
Note: See TracChangeset for help on using the changeset viewer.