Changeset 108358 in webkit for trunk/Source/JavaScriptCore/runtime/Executable.cpp

Timestamp:

Feb 21, 2012, 8:26:12 AM (14 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:

• trunk/Source/JavaScriptCore/runtime/Executable.cpp (modified) (12 diffs)

trunk/Source/JavaScriptCore/runtime/Executable.cpp

@@ -30 +30 @@
 #include "CodeBlock.h"
 #include "DFGDriver.h"
-#include "ExecutionHarness.h"
 #include "JIT.h"
 #include "JITDriver.h"
@@ -90 +89 @@
 static void jettisonCodeBlock(JSGlobalData& globalData, OwnPtr<T>& codeBlock)
 {
-    ASSERT(JITCode::isOptimizingJIT(codeBlock->getJITType()));
+    ASSERT(codeBlock->getJITType() != JITCode::BaselineJIT);
     ASSERT(codeBlock->alternative());
     OwnPtr<T> codeBlockToJettison = codeBlock.release();
@@ -177 +176 @@
 }
 
-#if ENABLE(JIT)
-void EvalExecutable::jitCompile(JSGlobalData& globalData)
-{
-    bool result = jitCompileIfAppropriate(globalData, m_evalCodeBlock, m_jitCodeForCall, JITCode::bottomTierJIT());
-    ASSERT_UNUSED(result, result);
-}
-#endif
-
-inline const char* samplingDescription(JITCode::JITType jitType)
-{
-    switch (jitType) {
-    case JITCode::InterpreterThunk:
-        return "Interpreter Compilation (TOTAL)";
-    case JITCode::BaselineJIT:
-        return "Baseline Compilation (TOTAL)";
-    case JITCode::DFGJIT:
-        return "DFG Compilation (TOTAL)";
-    default:
-        ASSERT_NOT_REACHED();
-        return 0;
-    }
-}
-
 JSObject* EvalExecutable::compileInternal(ExecState* exec, ScopeChainNode* scopeChainNode, JITCode::JITType jitType)
 {
-    SamplingRegion samplingRegion(samplingDescription(jitType));
+    SamplingRegion samplingRegion(jitType == JITCode::BaselineJIT ? "Baseline Compilation (TOTAL)" : "DFG Compilation (TOTAL)");
     
 #if !ENABLE(JIT)
@@ -243 +219 @@
 
 #if ENABLE(JIT)
-    if (!prepareForExecution(*globalData, m_evalCodeBlock, m_jitCodeForCall, jitType))
+    if (!jitCompileIfAppropriate(*globalData, m_evalCodeBlock, m_jitCodeForCall, jitType))
         return 0;
 #endif
@@ -328 +304 @@
 }
 
-#if ENABLE(JIT)
-void ProgramExecutable::jitCompile(JSGlobalData& globalData)
-{
-    bool result = jitCompileIfAppropriate(globalData, m_programCodeBlock, m_jitCodeForCall, JITCode::bottomTierJIT());
-    ASSERT_UNUSED(result, result);
-}
-#endif
-
 JSObject* ProgramExecutable::compileInternal(ExecState* exec, ScopeChainNode* scopeChainNode, JITCode::JITType jitType)
 {
-    SamplingRegion samplingRegion(samplingDescription(jitType));
+    SamplingRegion samplingRegion(jitType == JITCode::BaselineJIT ? "Baseline Compilation (TOTAL)" : "DFG Compilation (TOTAL)");
     
 #if !ENABLE(JIT)
@@ -377 +345 @@
 
 #if ENABLE(JIT)
-    if (!prepareForExecution(*globalData, m_programCodeBlock, m_jitCodeForCall, jitType))
+    if (!jitCompileIfAppropriate(*globalData, m_programCodeBlock, m_jitCodeForCall, jitType))
         return 0;
 #endif
@@ -453 +421 @@
         result = static_cast<FunctionCodeBlock*>(result->alternative());
     ASSERT(result);
-    ASSERT(JITCode::isBaselineCode(result->getJITType()));
+    ASSERT(result->getJITType() == JITCode::BaselineJIT);
     return result;
 }
@@ -478 +446 @@
     return error;
 }
-
-#if ENABLE(JIT)
-void FunctionExecutable::jitCompileForCall(JSGlobalData& globalData)
-{
-    bool result = jitCompileFunctionIfAppropriate(globalData, m_codeBlockForCall, m_jitCodeForCall, m_jitCodeForCallWithArityCheck, m_symbolTable, JITCode::bottomTierJIT());
-    ASSERT_UNUSED(result, result);
-}
-
-void FunctionExecutable::jitCompileForConstruct(JSGlobalData& globalData)
-{
-    bool result = jitCompileFunctionIfAppropriate(globalData, m_codeBlockForConstruct, m_jitCodeForConstruct, m_jitCodeForConstructWithArityCheck, m_symbolTable, JITCode::bottomTierJIT());
-    ASSERT_UNUSED(result, result);
-}
-#endif
 
 FunctionCodeBlock* FunctionExecutable::codeBlockWithBytecodeFor(CodeSpecializationKind kind)
@@ -537 +491 @@
 JSObject* FunctionExecutable::compileForCallInternal(ExecState* exec, ScopeChainNode* scopeChainNode, JITCode::JITType jitType)
 {
-    SamplingRegion samplingRegion(samplingDescription(jitType));
+    SamplingRegion samplingRegion(jitType == JITCode::BaselineJIT ? "Baseline Compilation (TOTAL)" : "DFG Compilation (TOTAL)");
     
 #if !ENABLE(JIT)
@@ -559 +513 @@
 
 #if ENABLE(JIT)
-    if (!prepareFunctionForExecution(exec->globalData(), m_codeBlockForCall, m_jitCodeForCall, m_jitCodeForCallWithArityCheck, m_symbolTable, jitType, CodeForCall))
+    if (!jitCompileFunctionIfAppropriate(exec->globalData(), m_codeBlockForCall, m_jitCodeForCall, m_jitCodeForCallWithArityCheck, m_symbolTable, jitType))
         return 0;
 #endif
@@ -579 +533 @@
 JSObject* FunctionExecutable::compileForConstructInternal(ExecState* exec, ScopeChainNode* scopeChainNode, JITCode::JITType jitType)
 {
-    SamplingRegion samplingRegion(samplingDescription(jitType));
+    SamplingRegion samplingRegion(jitType == JITCode::BaselineJIT ? "Baseline Compilation (TOTAL)" : "DFG Compilation (TOTAL)");
     
 #if !ENABLE(JIT)
@@ -601 +555 @@
 
 #if ENABLE(JIT)
-    if (!prepareFunctionForExecution(exec->globalData(), m_codeBlockForConstruct, m_jitCodeForConstruct, m_jitCodeForConstructWithArityCheck, m_symbolTable, jitType, CodeForConstruct))
+    if (!jitCompileFunctionIfAppropriate(exec->globalData(), m_codeBlockForConstruct, m_jitCodeForConstruct, m_jitCodeForConstructWithArityCheck, m_symbolTable, jitType))
         return 0;
 #endif