X-Git-Url: https://git.saurik.com/apple/javascriptcore.git/blobdiff_plain/4be4e30906bcb8ee30b4d189205cb70bad6707ce..81345200c95645a1b0d2635520f96ad55dfde63f:/bytecode/CodeBlock.cpp diff --git a/bytecode/CodeBlock.cpp b/bytecode/CodeBlock.cpp index bd76ef3..da60b48 100644 --- a/bytecode/CodeBlock.cpp +++ b/bytecode/CodeBlock.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved. + * Copyright (C) 2008, 2009, 2010, 2012, 2013, 2014 Apple Inc. All rights reserved. * Copyright (C) 2008 Cameron Zwarich * * Redistribution and use in source and binary forms, with or without @@ -11,7 +11,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * 3. Neither the name of Apple Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * @@ -31,11 +31,13 @@ #include "CodeBlock.h" #include "BytecodeGenerator.h" +#include "BytecodeUseDef.h" #include "CallLinkStatus.h" #include "DFGCapabilities.h" #include "DFGCommon.h" -#include "DFGNode.h" -#include "DFGRepatch.h" +#include "DFGDriver.h" +#include "DFGJITCode.h" +#include "DFGWorklist.h" #include "Debugger.h" #include "Interpreter.h" #include "JIT.h" @@ -44,12 +46,18 @@ #include "JSCJSValue.h" #include "JSFunction.h" #include "JSNameScope.h" +#include "LLIntEntrypoint.h" #include "LowLevelInterpreter.h" -#include "Operations.h" +#include "JSCInlines.h" +#include "PolymorphicGetByIdList.h" +#include "PolymorphicPutByIdList.h" +#include "ProfilerDatabase.h" #include "ReduceWhitespace.h" +#include "Repatch.h" #include "RepatchBuffer.h" #include "SlotVisitorInlines.h" -#include +#include "UnlinkedInstructionStream.h" +#include #include #include #include @@ -58,15 +66,13 @@ #include "DFGOperations.h" #endif -#define DUMP_CODE_BLOCK_STATISTICS 0 +#if ENABLE(FTL_JIT) +#include "FTLJITCode.h" +#endif namespace JSC { -#if ENABLE(DFG_JIT) -using namespace DFG; -#endif - -String CodeBlock::inferredName() const +CString CodeBlock::inferredName() const { switch (codeType()) { case GlobalCode: @@ -74,22 +80,36 @@ String CodeBlock::inferredName() const case EvalCode: return ""; case FunctionCode: - return jsCast(ownerExecutable())->inferredName().string(); + return jsCast(ownerExecutable())->inferredName().utf8(); default: CRASH(); - return String(); + return CString("", 0); } } +bool CodeBlock::hasHash() const +{ + return !!m_hash; +} + +bool CodeBlock::isSafeToComputeHash() const +{ + return !isCompilationThread(); +} + CodeBlockHash CodeBlock::hash() const { - return CodeBlockHash(ownerExecutable()->source(), specializationKind()); + if (!m_hash) { + RELEASE_ASSERT(isSafeToComputeHash()); + m_hash = CodeBlockHash(ownerExecutable()->source(), specializationKind()); + } + return m_hash; } -String CodeBlock::sourceCodeForTools() const +CString CodeBlock::sourceCodeForTools() const { if (codeType() != FunctionCode) - return ownerExecutable()->source().toString(); + return ownerExecutable()->source().toUTF8(); SourceProvider* provider = source(); FunctionExecutable* executable = jsCast(ownerExecutable()); @@ -97,76 +117,82 @@ String CodeBlock::sourceCodeForTools() const unsigned unlinkedStartOffset = unlinked->startOffset(); unsigned linkedStartOffset = executable->source().startOffset(); int delta = linkedStartOffset - unlinkedStartOffset; - StringBuilder builder; - builder.append("function "); - builder.append(provider->getRange( - delta + unlinked->functionStartOffset(), - delta + unlinked->startOffset() + unlinked->sourceLength())); - return builder.toString(); + unsigned rangeStart = delta + unlinked->unlinkedFunctionNameStart(); + unsigned rangeEnd = delta + unlinked->startOffset() + unlinked->sourceLength(); + return toCString( + "function ", + provider->source().impl()->utf8ForRange(rangeStart, rangeEnd - rangeStart)); } -String CodeBlock::sourceCodeOnOneLine() const +CString CodeBlock::sourceCodeOnOneLine() const { return reduceWhitespace(sourceCodeForTools()); } +CString CodeBlock::hashAsStringIfPossible() const +{ + if (hasHash() || isSafeToComputeHash()) + return toCString(hash()); + return ""; +} + void CodeBlock::dumpAssumingJITType(PrintStream& out, JITCode::JITType jitType) const { - out.print(inferredName(), "#", hash(), ":[", RawPointer(this), "->", RawPointer(ownerExecutable()), ", ", jitType, codeType()); + out.print(inferredName(), "#", hashAsStringIfPossible()); + out.print(":[", RawPointer(this), "->"); + if (!!m_alternative) + out.print(RawPointer(m_alternative.get()), "->"); + out.print(RawPointer(ownerExecutable()), ", ", jitType, codeType()); + if (codeType() == FunctionCode) out.print(specializationKind()); + out.print(", ", instructionCount()); + if (this->jitType() == JITCode::BaselineJIT && m_shouldAlwaysBeInlined) + out.print(" (SABI)"); + if (ownerExecutable()->neverInline()) + out.print(" (NeverInline)"); + if (ownerExecutable()->isStrictMode()) + out.print(" (StrictMode)"); + if (this->jitType() == JITCode::BaselineJIT && m_didFailFTLCompilation) + out.print(" (FTLFail)"); + if (this->jitType() == JITCode::BaselineJIT && m_hasBeenCompiledWithFTL) + out.print(" (HadFTLReplacement)"); out.print("]"); } void CodeBlock::dump(PrintStream& out) const { - dumpAssumingJITType(out, getJITType()); + dumpAssumingJITType(out, jitType()); } -static String escapeQuotes(const String& str) +static CString constantName(int k, JSValue value) { - String result = str; - size_t pos = 0; - while ((pos = result.find('\"', pos)) != notFound) { - result = makeString(result.substringSharingImpl(0, pos), "\"\\\"\"", result.substringSharingImpl(pos + 1)); - pos += 4; - } - return result; -} - -static String valueToSourceString(ExecState* exec, JSValue val) -{ - if (!val) - return ASCIILiteral("0"); - - if (val.isString()) - return makeString("\"", escapeQuotes(val.toString(exec)->value(exec)), "\""); - - return toString(val); -} - -static CString constantName(ExecState* exec, int k, JSValue value) -{ - return makeString(valueToSourceString(exec, value), "(@k", String::number(k - FirstConstantRegisterIndex), ")").utf8(); + return toCString(value, "(@k", k - FirstConstantRegisterIndex, ")"); } static CString idName(int id0, const Identifier& ident) { - return makeString(ident.string(), "(@id", String::number(id0), ")").utf8(); + return toCString(ident.impl(), "(@id", id0, ")"); } -CString CodeBlock::registerName(ExecState* exec, int r) const +CString CodeBlock::registerName(int r) const { if (r == missingThisObjectMarker()) return ""; if (isConstantRegisterIndex(r)) - return constantName(exec, r, getConstant(r)); + return constantName(r, getConstant(r)); + + if (operandIsArgument(r)) { + if (!VirtualRegister(r).toArgument()) + return "this"; + return toCString("arg", VirtualRegister(r).toArgument()); + } - return makeString("r", String::number(r)).utf8(); + return toCString("loc", VirtualRegister(r).toLocal()); } -static String regexpToSourceString(RegExp* regExp) +static CString regexpToSourceString(RegExp* regExp) { char postfix[5] = { '/', 0, 0, 0, 0 }; int index = 1; @@ -177,19 +203,12 @@ static String regexpToSourceString(RegExp* regExp) if (regExp->multiline()) postfix[index] = 'm'; - return makeString("/", regExp->pattern(), postfix); + return toCString("/", regExp->pattern().impl(), postfix); } static CString regexpName(int re, RegExp* regexp) { - return makeString(regexpToSourceString(regexp), "(@re", String::number(re), ")").utf8(); -} - -static String pointerToSourceString(void* p) -{ - char buffer[2 + 2 * sizeof(void*) + 1]; // 0x [two characters per byte] \0 - snprintf(buffer, sizeof(buffer), "%p", p); - return buffer; + return toCString(regexpToSourceString(regexp), "(@re", re, ")"); } NEVER_INLINE static const char* debugHookName(int debugHookID) @@ -218,7 +237,8 @@ void CodeBlock::printUnaryOp(PrintStream& out, ExecState* exec, int location, co int r0 = (++it)->u.operand; int r1 = (++it)->u.operand; - out.printf("[%4d] %s\t\t %s, %s", location, op, registerName(exec, r0).data(), registerName(exec, r1).data()); + printLocationAndOp(out, exec, location, it, op); + out.printf("%s, %s", registerName(r0).data(), registerName(r1).data()); } void CodeBlock::printBinaryOp(PrintStream& out, ExecState* exec, int location, const Instruction*& it, const char* op) @@ -226,14 +246,16 @@ void CodeBlock::printBinaryOp(PrintStream& out, ExecState* exec, int location, c int r0 = (++it)->u.operand; int r1 = (++it)->u.operand; int r2 = (++it)->u.operand; - out.printf("[%4d] %s\t\t %s, %s, %s", location, op, registerName(exec, r0).data(), registerName(exec, r1).data(), registerName(exec, r2).data()); + printLocationAndOp(out, exec, location, it, op); + out.printf("%s, %s, %s", registerName(r0).data(), registerName(r1).data(), registerName(r2).data()); } void CodeBlock::printConditionalJump(PrintStream& out, ExecState* exec, const Instruction*, const Instruction*& it, int location, const char* op) { int r0 = (++it)->u.operand; int offset = (++it)->u.operand; - out.printf("[%4d] %s\t\t %s, %d(->%d)", location, op, registerName(exec, r0).data(), offset, location + offset); + printLocationAndOp(out, exec, location, it, op); + out.printf("%s, %d(->%d)", registerName(r0).data(), offset, location + offset); } void CodeBlock::printGetByIdOp(PrintStream& out, ExecState* exec, int location, const Instruction*& it) @@ -246,42 +268,9 @@ void CodeBlock::printGetByIdOp(PrintStream& out, ExecState* exec, int location, case op_get_by_id_out_of_line: op = "get_by_id_out_of_line"; break; - case op_get_by_id_self: - op = "get_by_id_self"; - break; - case op_get_by_id_proto: - op = "get_by_id_proto"; - break; - case op_get_by_id_chain: - op = "get_by_id_chain"; - break; - case op_get_by_id_getter_self: - op = "get_by_id_getter_self"; - break; - case op_get_by_id_getter_proto: - op = "get_by_id_getter_proto"; - break; - case op_get_by_id_getter_chain: - op = "get_by_id_getter_chain"; - break; - case op_get_by_id_custom_self: - op = "get_by_id_custom_self"; - break; - case op_get_by_id_custom_proto: - op = "get_by_id_custom_proto"; - break; - case op_get_by_id_custom_chain: - op = "get_by_id_custom_chain"; - break; - case op_get_by_id_generic: - op = "get_by_id_generic"; - break; case op_get_array_length: op = "array_length"; break; - case op_get_string_length: - op = "string_length"; - break; default: RELEASE_ASSERT_NOT_REACHED(); op = 0; @@ -289,26 +278,25 @@ void CodeBlock::printGetByIdOp(PrintStream& out, ExecState* exec, int location, int r0 = (++it)->u.operand; int r1 = (++it)->u.operand; int id0 = (++it)->u.operand; - out.printf("[%4d] %s\t %s, %s, %s", location, op, registerName(exec, r0).data(), registerName(exec, r1).data(), idName(id0, m_identifiers[id0]).data()); + printLocationAndOp(out, exec, location, it, op); + out.printf("%s, %s, %s", registerName(r0).data(), registerName(r1).data(), idName(id0, identifier(id0)).data()); it += 4; // Increment up to the value profiler. } -#if ENABLE(JIT) || ENABLE(LLINT) // unused in some configurations -static void dumpStructure(PrintStream& out, const char* name, ExecState* exec, Structure* structure, Identifier& ident) +static void dumpStructure(PrintStream& out, const char* name, ExecState* exec, Structure* structure, const Identifier& ident) { if (!structure) return; out.printf("%s = %p", name, structure); - PropertyOffset offset = structure->get(exec->vm(), ident); + PropertyOffset offset = structure->getConcurrently(exec->vm(), ident.impl()); if (offset != invalidOffset) out.printf(" (offset = %d)", offset); } -#endif #if ENABLE(JIT) // unused when not ENABLE(JIT), leading to silly warnings -static void dumpChain(PrintStream& out, ExecState* exec, StructureChain* chain, Identifier& ident) +static void dumpChain(PrintStream& out, ExecState* exec, StructureChain* chain, const Identifier& ident) { out.printf("chain = %p: [", chain); bool first = true; @@ -325,15 +313,14 @@ static void dumpChain(PrintStream& out, ExecState* exec, StructureChain* chain, } #endif -void CodeBlock::printGetByIdCacheStatus(PrintStream& out, ExecState* exec, int location) +void CodeBlock::printGetByIdCacheStatus(PrintStream& out, ExecState* exec, int location, const StubInfoMap& map) { Instruction* instruction = instructions().begin() + location; - Identifier& ident = identifier(instruction[3].u.operand); + const Identifier& ident = identifier(instruction[3].u.operand); UNUSED_PARAM(ident); // tell the compiler to shut up in certain platform configurations. -#if ENABLE(LLINT) if (exec->interpreter()->getOpcodeID(instruction[0].u.opcode) == op_get_array_length) out.printf(" llint(array_length)"); else if (Structure* structure = instruction[4].u.structure.get()) { @@ -341,57 +328,38 @@ void CodeBlock::printGetByIdCacheStatus(PrintStream& out, ExecState* exec, int l dumpStructure(out, "struct", exec, structure, ident); out.printf(")"); } -#endif #if ENABLE(JIT) - if (numberOfStructureStubInfos()) { - StructureStubInfo& stubInfo = getStubInfo(location); + if (StructureStubInfo* stubPtr = map.get(CodeOrigin(location))) { + StructureStubInfo& stubInfo = *stubPtr; + if (stubInfo.resetByGC) + out.print(" (Reset By GC)"); + if (stubInfo.seen) { out.printf(" jit("); Structure* baseStructure = 0; Structure* prototypeStructure = 0; StructureChain* chain = 0; - PolymorphicAccessStructureList* structureList = 0; - int listSize = 0; + PolymorphicGetByIdList* list = 0; switch (stubInfo.accessType) { case access_get_by_id_self: out.printf("self"); baseStructure = stubInfo.u.getByIdSelf.baseObjectStructure.get(); break; - case access_get_by_id_proto: - out.printf("proto"); - baseStructure = stubInfo.u.getByIdProto.baseObjectStructure.get(); - prototypeStructure = stubInfo.u.getByIdProto.prototypeStructure.get(); - break; case access_get_by_id_chain: out.printf("chain"); baseStructure = stubInfo.u.getByIdChain.baseObjectStructure.get(); chain = stubInfo.u.getByIdChain.chain.get(); break; - case access_get_by_id_self_list: - out.printf("self_list"); - structureList = stubInfo.u.getByIdSelfList.structureList; - listSize = stubInfo.u.getByIdSelfList.listSize; - break; - case access_get_by_id_proto_list: - out.printf("proto_list"); - structureList = stubInfo.u.getByIdProtoList.structureList; - listSize = stubInfo.u.getByIdProtoList.listSize; + case access_get_by_id_list: + out.printf("list"); + list = stubInfo.u.getByIdList.list; break; case access_unset: out.printf("unset"); break; - case access_get_by_id_generic: - out.printf("generic"); - break; - case access_get_array_length: - out.printf("array_length"); - break; - case access_get_string_length: - out.printf("string_length"); - break; default: RELEASE_ASSERT_NOT_REACHED(); break; @@ -412,23 +380,16 @@ void CodeBlock::printGetByIdCacheStatus(PrintStream& out, ExecState* exec, int l dumpChain(out, exec, chain, ident); } - if (structureList) { - out.printf(", list = %p: [", structureList); - for (int i = 0; i < listSize; ++i) { + if (list) { + out.printf(", list = %p: [", list); + for (unsigned i = 0; i < list->size(); ++i) { if (i) out.printf(", "); out.printf("("); - dumpStructure(out, "base", exec, structureList->list[i].base.get(), ident); - if (structureList->list[i].isChain) { - if (structureList->list[i].u.chain.get()) { - out.printf(", "); - dumpChain(out, exec, structureList->list[i].u.chain.get(), ident); - } - } else { - if (structureList->list[i].u.proto.get()) { - out.printf(", "); - dumpStructure(out, "proto", exec, structureList->list[i].u.proto.get(), ident); - } + dumpStructure(out, "base", exec, list->at(i).structure(), ident); + if (list->at(i).chain()) { + out.printf(", "); + dumpChain(out, exec, list->at(i).chain(), ident); } out.printf(")"); } @@ -437,17 +398,20 @@ void CodeBlock::printGetByIdCacheStatus(PrintStream& out, ExecState* exec, int l out.printf(")"); } } +#else + UNUSED_PARAM(map); #endif } -void CodeBlock::printCallOp(PrintStream& out, ExecState* exec, int location, const Instruction*& it, const char* op, CacheDumpMode cacheDumpMode) +void CodeBlock::printCallOp(PrintStream& out, ExecState* exec, int location, const Instruction*& it, const char* op, CacheDumpMode cacheDumpMode, bool& hasPrintedProfiling, const CallLinkInfoMap& map) { + int dst = (++it)->u.operand; int func = (++it)->u.operand; int argCount = (++it)->u.operand; int registerOffset = (++it)->u.operand; - out.printf("[%4d] %s\t %s, %d, %d", location, op, registerName(exec, func).data(), argCount, registerOffset); + printLocationAndOp(out, exec, location, it, op); + out.printf("%s, %s, %d, %d", registerName(dst).data(), registerName(func).data(), argCount, registerOffset); if (cacheDumpMode == DumpCaches) { -#if ENABLE(LLINT) LLIntCallLinkInfo* callLinkInfo = it[1].u.callLinkInfo; if (callLinkInfo->lastSeenCallee) { out.printf( @@ -455,17 +419,21 @@ void CodeBlock::printCallOp(PrintStream& out, ExecState* exec, int location, con callLinkInfo->lastSeenCallee.get(), callLinkInfo->lastSeenCallee->executable()); } -#endif #if ENABLE(JIT) - if (numberOfCallLinkInfos()) { - JSFunction* target = getCallLinkInfo(location).lastSeenCallee.get(); + if (CallLinkInfo* info = map.get(CodeOrigin(location))) { + JSFunction* target = info->lastSeenCallee.get(); if (target) out.printf(" jit(%p, exec %p)", target, target->executable()); } + out.print(" status(", CallLinkStatus::computeFor(this, location, map), ")"); +#else + UNUSED_PARAM(map); #endif - out.print(" status(", CallLinkStatus::computeFor(this, location), ")"); } - it += 2; + ++it; + ++it; + dumpArrayProfiling(out, it, hasPrintedProfiling); + dumpValueProfiling(out, it, hasPrintedProfiling); } void CodeBlock::printPutByIdOp(PrintStream& out, ExecState* exec, int location, const Instruction*& it, const char* op) @@ -473,54 +441,11 @@ void CodeBlock::printPutByIdOp(PrintStream& out, ExecState* exec, int location, int r0 = (++it)->u.operand; int id0 = (++it)->u.operand; int r1 = (++it)->u.operand; - out.printf("[%4d] %s\t %s, %s, %s", location, op, registerName(exec, r0).data(), idName(id0, m_identifiers[id0]).data(), registerName(exec, r1).data()); + printLocationAndOp(out, exec, location, it, op); + out.printf("%s, %s, %s", registerName(r0).data(), idName(id0, identifier(id0)).data(), registerName(r1).data()); it += 5; } -void CodeBlock::printStructure(PrintStream& out, const char* name, const Instruction* vPC, int operand) -{ - unsigned instructionOffset = vPC - instructions().begin(); - out.printf(" [%4d] %s: %s\n", instructionOffset, name, pointerToSourceString(vPC[operand].u.structure).utf8().data()); -} - -void CodeBlock::printStructures(PrintStream& out, const Instruction* vPC) -{ - Interpreter* interpreter = m_vm->interpreter; - unsigned instructionOffset = vPC - instructions().begin(); - - if (vPC[0].u.opcode == interpreter->getOpcode(op_get_by_id)) { - printStructure(out, "get_by_id", vPC, 4); - return; - } - if (vPC[0].u.opcode == interpreter->getOpcode(op_get_by_id_self)) { - printStructure(out, "get_by_id_self", vPC, 4); - return; - } - if (vPC[0].u.opcode == interpreter->getOpcode(op_get_by_id_proto)) { - out.printf(" [%4d] %s: %s, %s\n", instructionOffset, "get_by_id_proto", pointerToSourceString(vPC[4].u.structure).utf8().data(), pointerToSourceString(vPC[5].u.structure).utf8().data()); - return; - } - if (vPC[0].u.opcode == interpreter->getOpcode(op_put_by_id_transition)) { - out.printf(" [%4d] %s: %s, %s, %s\n", instructionOffset, "put_by_id_transition", pointerToSourceString(vPC[4].u.structure).utf8().data(), pointerToSourceString(vPC[5].u.structure).utf8().data(), pointerToSourceString(vPC[6].u.structureChain).utf8().data()); - return; - } - if (vPC[0].u.opcode == interpreter->getOpcode(op_get_by_id_chain)) { - out.printf(" [%4d] %s: %s, %s\n", instructionOffset, "get_by_id_chain", pointerToSourceString(vPC[4].u.structure).utf8().data(), pointerToSourceString(vPC[5].u.structureChain).utf8().data()); - return; - } - if (vPC[0].u.opcode == interpreter->getOpcode(op_put_by_id)) { - printStructure(out, "put_by_id", vPC, 4); - return; - } - if (vPC[0].u.opcode == interpreter->getOpcode(op_put_by_id_replace)) { - printStructure(out, "put_by_id_replace", vPC, 4); - return; - } - - // These m_instructions doesn't ref Structures. - ASSERT(vPC[0].u.opcode == interpreter->getOpcode(op_get_by_id_generic) || vPC[0].u.opcode == interpreter->getOpcode(op_put_by_id_generic) || vPC[0].u.opcode == interpreter->getOpcode(op_call) || vPC[0].u.opcode == interpreter->getOpcode(op_call_eval) || vPC[0].u.opcode == interpreter->getOpcode(op_construct)); -} - void CodeBlock::dumpBytecode(PrintStream& out) { // We only use the ExecState* for things that don't actually lead to JS execution, @@ -541,37 +466,42 @@ void CodeBlock::dumpBytecode(PrintStream& out) if (symbolTable() && symbolTable()->captureCount()) { out.printf( "; %d captured var(s) (from r%d to r%d, inclusive)", - symbolTable()->captureCount(), symbolTable()->captureStart(), symbolTable()->captureEnd() - 1); + symbolTable()->captureCount(), symbolTable()->captureStart(), symbolTable()->captureEnd() + 1); } if (usesArguments()) { out.printf( "; uses arguments, in r%d, r%d", - argumentsRegister(), - unmodifiedArgumentsRegister(argumentsRegister())); + argumentsRegister().offset(), + unmodifiedArgumentsRegister(argumentsRegister()).offset()); } - if (needsFullScopeChain() && codeType() == FunctionCode) - out.printf("; activation in r%d", activationRegister()); - out.print("\n\nSource: ", sourceCodeOnOneLine(), "\n\n"); - + if (needsActivation() && codeType() == FunctionCode) + out.printf("; activation in r%d", activationRegister().offset()); + out.printf("\n"); + + StubInfoMap stubInfos; + CallLinkInfoMap callLinkInfos; + getStubInfoMap(stubInfos); + getCallLinkInfoMap(callLinkInfos); + const Instruction* begin = instructions().begin(); const Instruction* end = instructions().end(); for (const Instruction* it = begin; it != end; ++it) - dumpBytecode(out, exec, begin, it); - - if (!m_identifiers.isEmpty()) { + dumpBytecode(out, exec, begin, it, stubInfos, callLinkInfos); + + if (numberOfIdentifiers()) { out.printf("\nIdentifiers:\n"); size_t i = 0; do { - out.printf(" id%u = %s\n", static_cast(i), m_identifiers[i].string().utf8().data()); + out.printf(" id%u = %s\n", static_cast(i), identifier(i).string().utf8().data()); ++i; - } while (i != m_identifiers.size()); + } while (i != numberOfIdentifiers()); } if (!m_constantRegisters.isEmpty()) { out.printf("\nConstants:\n"); size_t i = 0; do { - out.printf(" k%u = %s\n", static_cast(i), valueToSourceString(exec, m_constantRegisters[i].get()).utf8().data()); + out.printf(" k%u = %s\n", static_cast(i), toCString(m_constantRegisters[i].get()).data()); ++i; } while (i < m_constantRegisters.size()); } @@ -580,16 +510,11 @@ void CodeBlock::dumpBytecode(PrintStream& out) out.printf("\nm_regexps:\n"); size_t i = 0; do { - out.printf(" re%u = %s\n", static_cast(i), regexpToSourceString(m_unlinkedCode->regexp(i)).utf8().data()); + out.printf(" re%u = %s\n", static_cast(i), regexpToSourceString(m_unlinkedCode->regexp(i)).data()); ++i; } while (i < count); } -#if ENABLE(JIT) - if (!m_structureStubInfos.isEmpty()) - out.printf("\nStructures:\n"); -#endif - if (m_rareData && !m_rareData->m_exceptionHandlers.isEmpty()) { out.printf("\nException Handlers:\n"); unsigned i = 0; @@ -599,40 +524,21 @@ void CodeBlock::dumpBytecode(PrintStream& out) } while (i < m_rareData->m_exceptionHandlers.size()); } - if (m_rareData && !m_rareData->m_immediateSwitchJumpTables.isEmpty()) { - out.printf("Immediate Switch Jump Tables:\n"); - unsigned i = 0; - do { - out.printf(" %1d = {\n", i); - int entry = 0; - Vector::const_iterator end = m_rareData->m_immediateSwitchJumpTables[i].branchOffsets.end(); - for (Vector::const_iterator iter = m_rareData->m_immediateSwitchJumpTables[i].branchOffsets.begin(); iter != end; ++iter, ++entry) { - if (!*iter) - continue; - out.printf("\t\t%4d => %04d\n", entry + m_rareData->m_immediateSwitchJumpTables[i].min, *iter); - } - out.printf(" }\n"); - ++i; - } while (i < m_rareData->m_immediateSwitchJumpTables.size()); - } - - if (m_rareData && !m_rareData->m_characterSwitchJumpTables.isEmpty()) { - out.printf("\nCharacter Switch Jump Tables:\n"); + if (m_rareData && !m_rareData->m_switchJumpTables.isEmpty()) { + out.printf("Switch Jump Tables:\n"); unsigned i = 0; do { out.printf(" %1d = {\n", i); int entry = 0; - Vector::const_iterator end = m_rareData->m_characterSwitchJumpTables[i].branchOffsets.end(); - for (Vector::const_iterator iter = m_rareData->m_characterSwitchJumpTables[i].branchOffsets.begin(); iter != end; ++iter, ++entry) { + Vector::const_iterator end = m_rareData->m_switchJumpTables[i].branchOffsets.end(); + for (Vector::const_iterator iter = m_rareData->m_switchJumpTables[i].branchOffsets.begin(); iter != end; ++iter, ++entry) { if (!*iter) continue; - ASSERT(!((i + m_rareData->m_characterSwitchJumpTables[i].min) & ~0xFFFF)); - UChar ch = static_cast(entry + m_rareData->m_characterSwitchJumpTables[i].min); - out.printf("\t\t\"%s\" => %04d\n", String(&ch, 1).utf8().data(), *iter); + out.printf("\t\t%4d => %04d\n", entry + m_rareData->m_switchJumpTables[i].min, *iter); } out.printf(" }\n"); ++i; - } while (i < m_rareData->m_characterSwitchJumpTables.size()); + } while (i < m_rareData->m_switchJumpTables.size()); } if (m_rareData && !m_rareData->m_stringSwitchJumpTables.isEmpty()) { @@ -642,7 +548,7 @@ void CodeBlock::dumpBytecode(PrintStream& out) out.printf(" %1d = {\n", i); StringJumpTable::StringOffsetTable::const_iterator end = m_rareData->m_stringSwitchJumpTables[i].offsetTable.end(); for (StringJumpTable::StringOffsetTable::const_iterator iter = m_rareData->m_stringSwitchJumpTables[i].offsetTable.begin(); iter != end; ++iter) - out.printf("\t\t\"%s\" => %04d\n", String(iter->key).utf8().data(), iter->value.branchOffset); + out.printf("\t\t\"%s\" => %04d\n", iter->key->utf8().data(), iter->value.branchOffset); out.printf(" }\n"); ++i; } while (i < m_rareData->m_stringSwitchJumpTables.size()); @@ -664,35 +570,30 @@ void CodeBlock::beginDumpProfiling(PrintStream& out, bool& hasPrintedProfiling) void CodeBlock::dumpValueProfiling(PrintStream& out, const Instruction*& it, bool& hasPrintedProfiling) { + ConcurrentJITLocker locker(m_lock); + ++it; -#if ENABLE(VALUE_PROFILER) - CString description = it->u.profile->briefDescription(); + CString description = it->u.profile->briefDescription(locker); if (!description.length()) return; beginDumpProfiling(out, hasPrintedProfiling); out.print(description); -#else - UNUSED_PARAM(out); - UNUSED_PARAM(hasPrintedProfiling); -#endif } void CodeBlock::dumpArrayProfiling(PrintStream& out, const Instruction*& it, bool& hasPrintedProfiling) { + ConcurrentJITLocker locker(m_lock); + ++it; -#if ENABLE(VALUE_PROFILER) - CString description = it->u.arrayProfile->briefDescription(this); + if (!it->u.arrayProfile) + return; + CString description = it->u.arrayProfile->briefDescription(locker, this); if (!description.length()) return; beginDumpProfiling(out, hasPrintedProfiling); out.print(description); -#else - UNUSED_PARAM(out); - UNUSED_PARAM(hasPrintedProfiling); -#endif } -#if ENABLE(VALUE_PROFILER) void CodeBlock::dumpRareCaseProfile(PrintStream& out, const char* name, RareCaseProfile* profile, bool& hasPrintedProfiling) { if (!profile || !profile->m_counter) @@ -701,35 +602,52 @@ void CodeBlock::dumpRareCaseProfile(PrintStream& out, const char* name, RareCase beginDumpProfiling(out, hasPrintedProfiling); out.print(name, profile->m_counter); } -#endif -void CodeBlock::dumpBytecode(PrintStream& out, ExecState* exec, const Instruction* begin, const Instruction*& it) +void CodeBlock::printLocationAndOp(PrintStream& out, ExecState*, int location, const Instruction*&, const char* op) +{ + out.printf("[%4d] %-17s ", location, op); +} + +void CodeBlock::printLocationOpAndRegisterOperand(PrintStream& out, ExecState* exec, int location, const Instruction*& it, const char* op, int operand) +{ + printLocationAndOp(out, exec, location, it, op); + out.printf("%s", registerName(operand).data()); +} + +void CodeBlock::dumpBytecode( + PrintStream& out, ExecState* exec, const Instruction* begin, const Instruction*& it, + const StubInfoMap& stubInfos, const CallLinkInfoMap& callLinkInfos) { int location = it - begin; bool hasPrintedProfiling = false; - switch (exec->interpreter()->getOpcodeID(it->u.opcode)) { + OpcodeID opcode = exec->interpreter()->getOpcodeID(it->u.opcode); + switch (opcode) { case op_enter: { - out.printf("[%4d] enter", location); + printLocationAndOp(out, exec, location, it, "enter"); + break; + } + case op_touch_entry: { + printLocationAndOp(out, exec, location, it, "touch_entry"); break; } case op_create_activation: { int r0 = (++it)->u.operand; - out.printf("[%4d] create_activation %s", location, registerName(exec, r0).data()); + printLocationOpAndRegisterOperand(out, exec, location, it, "create_activation", r0); break; } case op_create_arguments: { int r0 = (++it)->u.operand; - out.printf("[%4d] create_arguments\t %s", location, registerName(exec, r0).data()); + printLocationOpAndRegisterOperand(out, exec, location, it, "create_arguments", r0); break; } case op_init_lazy_reg: { int r0 = (++it)->u.operand; - out.printf("[%4d] init_lazy_reg\t %s", location, registerName(exec, r0).data()); + printLocationOpAndRegisterOperand(out, exec, location, it, "init_lazy_reg", r0); break; } case op_get_callee: { int r0 = (++it)->u.operand; - out.printf("[%4d] op_get_callee %s\n", location, registerName(exec, r0).data()); + printLocationOpAndRegisterOperand(out, exec, location, it, "get_callee", r0); ++it; break; } @@ -737,19 +655,23 @@ void CodeBlock::dumpBytecode(PrintStream& out, ExecState* exec, const Instructio int r0 = (++it)->u.operand; int r1 = (++it)->u.operand; unsigned inferredInlineCapacity = (++it)->u.operand; - out.printf("[%4d] create_this %s, %s, %u", location, registerName(exec, r0).data(), registerName(exec, r1).data(), inferredInlineCapacity); + printLocationAndOp(out, exec, location, it, "create_this"); + out.printf("%s, %s, %u", registerName(r0).data(), registerName(r1).data(), inferredInlineCapacity); break; } - case op_convert_this: { + case op_to_this: { int r0 = (++it)->u.operand; - out.printf("[%4d] convert_this\t %s", location, registerName(exec, r0).data()); - ++it; // Skip value profile. + printLocationOpAndRegisterOperand(out, exec, location, it, "to_this", r0); + Structure* structure = (++it)->u.structure.get(); + if (structure) + out.print(" cache(struct = ", RawPointer(structure), ")"); break; } case op_new_object: { int r0 = (++it)->u.operand; unsigned inferredInlineCapacity = (++it)->u.operand; - out.printf("[%4d] new_object\t %s, %u", location, registerName(exec, r0).data(), inferredInlineCapacity); + printLocationAndOp(out, exec, location, it, "new_object"); + out.printf("%s, %u", registerName(r0).data(), inferredInlineCapacity); ++it; // Skip object allocation profile. break; } @@ -757,14 +679,16 @@ void CodeBlock::dumpBytecode(PrintStream& out, ExecState* exec, const Instructio int dst = (++it)->u.operand; int argv = (++it)->u.operand; int argc = (++it)->u.operand; - out.printf("[%4d] new_array\t %s, %s, %d", location, registerName(exec, dst).data(), registerName(exec, argv).data(), argc); + printLocationAndOp(out, exec, location, it, "new_array"); + out.printf("%s, %s, %d", registerName(dst).data(), registerName(argv).data(), argc); ++it; // Skip array allocation profile. break; } case op_new_array_with_size: { int dst = (++it)->u.operand; int length = (++it)->u.operand; - out.printf("[%4d] new_array_with_size\t %s, %s", location, registerName(exec, dst).data(), registerName(exec, length).data()); + printLocationAndOp(out, exec, location, it, "new_array_with_size"); + out.printf("%s, %s", registerName(dst).data(), registerName(length).data()); ++it; // Skip array allocation profile. break; } @@ -772,14 +696,16 @@ void CodeBlock::dumpBytecode(PrintStream& out, ExecState* exec, const Instructio int dst = (++it)->u.operand; int argv = (++it)->u.operand; int argc = (++it)->u.operand; - out.printf("[%4d] new_array_buffer\t %s, %d, %d", location, registerName(exec, dst).data(), argv, argc); + printLocationAndOp(out, exec, location, it, "new_array_buffer"); + out.printf("%s, %d, %d", registerName(dst).data(), argv, argc); ++it; // Skip array allocation profile. break; } case op_new_regexp: { int r0 = (++it)->u.operand; int re0 = (++it)->u.operand; - out.printf("[%4d] new_regexp\t %s, ", location, registerName(exec, r0).data()); + printLocationAndOp(out, exec, location, it, "new_regexp"); + out.printf("%s, ", registerName(r0).data()); if (r0 >=0 && r0 < (int)m_unlinkedCode->numberOfRegExps()) out.printf("%s", regexpName(re0, regexp(re0)).data()); else @@ -789,7 +715,16 @@ void CodeBlock::dumpBytecode(PrintStream& out, ExecState* exec, const Instructio case op_mov: { int r0 = (++it)->u.operand; int r1 = (++it)->u.operand; - out.printf("[%4d] mov\t\t %s, %s", location, registerName(exec, r0).data(), registerName(exec, r1).data()); + printLocationAndOp(out, exec, location, it, "mov"); + out.printf("%s, %s", registerName(r0).data(), registerName(r1).data()); + break; + } + case op_captured_mov: { + int r0 = (++it)->u.operand; + int r1 = (++it)->u.operand; + printLocationAndOp(out, exec, location, it, "captured_mov"); + out.printf("%s, %s", registerName(r0).data(), registerName(r1).data()); + ++it; break; } case op_not: { @@ -838,12 +773,12 @@ void CodeBlock::dumpBytecode(PrintStream& out, ExecState* exec, const Instructio } case op_inc: { int r0 = (++it)->u.operand; - out.printf("[%4d] pre_inc\t\t %s", location, registerName(exec, r0).data()); + printLocationOpAndRegisterOperand(out, exec, location, it, "inc", r0); break; } case op_dec: { int r0 = (++it)->u.operand; - out.printf("[%4d] pre_dec\t\t %s", location, registerName(exec, r0).data()); + printLocationOpAndRegisterOperand(out, exec, location, it, "dec", r0); break; } case op_to_number: { @@ -910,14 +845,20 @@ void CodeBlock::dumpBytecode(PrintStream& out, ExecState* exec, const Instructio int r1 = (++it)->u.operand; int r2 = (++it)->u.operand; int offset = (++it)->u.operand; - out.printf("[%4d] check_has_instance\t\t %s, %s, %s, %d(->%d)", location, registerName(exec, r0).data(), registerName(exec, r1).data(), registerName(exec, r2).data(), offset, location + offset); + printLocationAndOp(out, exec, location, it, "check_has_instance"); + out.printf("%s, %s, %s, %d(->%d)", registerName(r0).data(), registerName(r1).data(), registerName(r2).data(), offset, location + offset); break; } case op_instanceof: { int r0 = (++it)->u.operand; int r1 = (++it)->u.operand; int r2 = (++it)->u.operand; - out.printf("[%4d] instanceof\t\t %s, %s, %s", location, registerName(exec, r0).data(), registerName(exec, r1).data(), registerName(exec, r2).data()); + printLocationAndOp(out, exec, location, it, "instanceof"); + out.printf("%s, %s, %s", registerName(r0).data(), registerName(r1).data(), registerName(r2).data()); + break; + } + case op_unsigned: { + printUnaryOp(out, exec, location, it, "unsigned"); break; } case op_typeof: { @@ -952,45 +893,8 @@ void CodeBlock::dumpBytecode(PrintStream& out, ExecState* exec, const Instructio printBinaryOp(out, exec, location, it, "in"); break; } - case op_put_to_base_variable: - case op_put_to_base: { - int base = (++it)->u.operand; - int id0 = (++it)->u.operand; - int value = (++it)->u.operand; - int resolveInfo = (++it)->u.operand; - out.printf("[%4d] put_to_base\t %s, %s, %s, %d", location, registerName(exec, base).data(), idName(id0, m_identifiers[id0]).data(), registerName(exec, value).data(), resolveInfo); - break; - } - case op_resolve: - case op_resolve_global_property: - case op_resolve_global_var: - case op_resolve_scoped_var: - case op_resolve_scoped_var_on_top_scope: - case op_resolve_scoped_var_with_top_scope_check: { - int r0 = (++it)->u.operand; - int id0 = (++it)->u.operand; - int resolveInfo = (++it)->u.operand; - out.printf("[%4d] resolve\t\t %s, %s, %d", location, registerName(exec, r0).data(), idName(id0, m_identifiers[id0]).data(), resolveInfo); - dumpValueProfiling(out, it, hasPrintedProfiling); - break; - } - case op_get_scoped_var: { - int r0 = (++it)->u.operand; - int index = (++it)->u.operand; - int skipLevels = (++it)->u.operand; - out.printf("[%4d] get_scoped_var\t %s, %d, %d", location, registerName(exec, r0).data(), index, skipLevels); - dumpValueProfiling(out, it, hasPrintedProfiling); - break; - } - case op_put_scoped_var: { - int index = (++it)->u.operand; - int skipLevels = (++it)->u.operand; - int r0 = (++it)->u.operand; - out.printf("[%4d] put_scoped_var\t %d, %d, %s", location, index, skipLevels, registerName(exec, r0).data()); - break; - } case op_init_global_const_nop: { - out.printf("[%4d] init_global_const_nop\t", location); + printLocationAndOp(out, exec, location, it, "init_global_const_nop"); it++; it++; it++; @@ -1000,68 +904,17 @@ void CodeBlock::dumpBytecode(PrintStream& out, ExecState* exec, const Instructio case op_init_global_const: { WriteBarrier* registerPointer = (++it)->u.registerPointer; int r0 = (++it)->u.operand; - out.printf("[%4d] init_global_const\t g%d(%p), %s", location, m_globalObject->findRegisterIndex(registerPointer), registerPointer, registerName(exec, r0).data()); - it++; - it++; - break; - } - case op_init_global_const_check: { - WriteBarrier* registerPointer = (++it)->u.registerPointer; - int r0 = (++it)->u.operand; - out.printf("[%4d] init_global_const_check\t g%d(%p), %s", location, m_globalObject->findRegisterIndex(registerPointer), registerPointer, registerName(exec, r0).data()); + printLocationAndOp(out, exec, location, it, "init_global_const"); + out.printf("g%d(%p), %s", m_globalObject->findRegisterIndex(registerPointer), registerPointer, registerName(r0).data()); it++; it++; break; } - case op_resolve_base_to_global: - case op_resolve_base_to_global_dynamic: - case op_resolve_base_to_scope: - case op_resolve_base_to_scope_with_top_scope_check: - case op_resolve_base: { - int r0 = (++it)->u.operand; - int id0 = (++it)->u.operand; - int isStrict = (++it)->u.operand; - int resolveInfo = (++it)->u.operand; - int putToBaseInfo = (++it)->u.operand; - out.printf("[%4d] resolve_base%s\t %s, %s, %d, %d", location, isStrict ? "_strict" : "", registerName(exec, r0).data(), idName(id0, m_identifiers[id0]).data(), resolveInfo, putToBaseInfo); - dumpValueProfiling(out, it, hasPrintedProfiling); - break; - } - case op_resolve_with_base: { - int r0 = (++it)->u.operand; - int r1 = (++it)->u.operand; - int id0 = (++it)->u.operand; - int resolveInfo = (++it)->u.operand; - int putToBaseInfo = (++it)->u.operand; - out.printf("[%4d] resolve_with_base %s, %s, %s, %d, %d", location, registerName(exec, r0).data(), registerName(exec, r1).data(), idName(id0, m_identifiers[id0]).data(), resolveInfo, putToBaseInfo); - dumpValueProfiling(out, it, hasPrintedProfiling); - break; - } - case op_resolve_with_this: { - int r0 = (++it)->u.operand; - int r1 = (++it)->u.operand; - int id0 = (++it)->u.operand; - int resolveInfo = (++it)->u.operand; - out.printf("[%4d] resolve_with_this %s, %s, %s, %d", location, registerName(exec, r0).data(), registerName(exec, r1).data(), idName(id0, m_identifiers[id0]).data(), resolveInfo); - dumpValueProfiling(out, it, hasPrintedProfiling); - break; - } case op_get_by_id: case op_get_by_id_out_of_line: - case op_get_by_id_self: - case op_get_by_id_proto: - case op_get_by_id_chain: - case op_get_by_id_getter_self: - case op_get_by_id_getter_proto: - case op_get_by_id_getter_chain: - case op_get_by_id_custom_self: - case op_get_by_id_custom_proto: - case op_get_by_id_custom_chain: - case op_get_by_id_generic: - case op_get_array_length: - case op_get_string_length: { + case op_get_array_length: { printGetByIdOp(out, exec, location, it); - printGetByIdCacheStatus(out, exec, location); + printGetByIdCacheStatus(out, exec, location, stubInfos); dumpValueProfiling(out, it, hasPrintedProfiling); break; } @@ -1078,14 +931,6 @@ void CodeBlock::dumpBytecode(PrintStream& out, ExecState* exec, const Instructio printPutByIdOp(out, exec, location, it, "put_by_id_out_of_line"); break; } - case op_put_by_id_replace: { - printPutByIdOp(out, exec, location, it, "put_by_id_replace"); - break; - } - case op_put_by_id_transition: { - printPutByIdOp(out, exec, location, it, "put_by_id_transition"); - break; - } case op_put_by_id_transition_direct: { printPutByIdOp(out, exec, location, it, "put_by_id_transition_direct"); break; @@ -1102,30 +947,29 @@ void CodeBlock::dumpBytecode(PrintStream& out, ExecState* exec, const Instructio printPutByIdOp(out, exec, location, it, "put_by_id_transition_normal_out_of_line"); break; } - case op_put_by_id_generic: { - printPutByIdOp(out, exec, location, it, "put_by_id_generic"); - break; - } case op_put_getter_setter: { int r0 = (++it)->u.operand; int id0 = (++it)->u.operand; int r1 = (++it)->u.operand; int r2 = (++it)->u.operand; - out.printf("[%4d] put_getter_setter\t %s, %s, %s, %s", location, registerName(exec, r0).data(), idName(id0, m_identifiers[id0]).data(), registerName(exec, r1).data(), registerName(exec, r2).data()); + printLocationAndOp(out, exec, location, it, "put_getter_setter"); + out.printf("%s, %s, %s, %s", registerName(r0).data(), idName(id0, identifier(id0)).data(), registerName(r1).data(), registerName(r2).data()); break; } case op_del_by_id: { int r0 = (++it)->u.operand; int r1 = (++it)->u.operand; int id0 = (++it)->u.operand; - out.printf("[%4d] del_by_id\t %s, %s, %s", location, registerName(exec, r0).data(), registerName(exec, r1).data(), idName(id0, m_identifiers[id0]).data()); + printLocationAndOp(out, exec, location, it, "del_by_id"); + out.printf("%s, %s, %s", registerName(r0).data(), registerName(r1).data(), idName(id0, identifier(id0)).data()); break; } case op_get_by_val: { int r0 = (++it)->u.operand; int r1 = (++it)->u.operand; int r2 = (++it)->u.operand; - out.printf("[%4d] get_by_val\t %s, %s, %s", location, registerName(exec, r0).data(), registerName(exec, r1).data(), registerName(exec, r2).data()); + printLocationAndOp(out, exec, location, it, "get_by_val"); + out.printf("%s, %s, %s", registerName(r0).data(), registerName(r1).data(), registerName(r2).data()); dumpArrayProfiling(out, it, hasPrintedProfiling); dumpValueProfiling(out, it, hasPrintedProfiling); break; @@ -1134,7 +978,8 @@ void CodeBlock::dumpBytecode(PrintStream& out, ExecState* exec, const Instructio int r0 = (++it)->u.operand; int r1 = (++it)->u.operand; int r2 = (++it)->u.operand; - out.printf("[%4d] get_argument_by_val\t %s, %s, %s", location, registerName(exec, r0).data(), registerName(exec, r1).data(), registerName(exec, r2).data()); + printLocationAndOp(out, exec, location, it, "get_argument_by_val"); + out.printf("%s, %s, %s", registerName(r0).data(), registerName(r1).data(), registerName(r2).data()); ++it; dumpValueProfiling(out, it, hasPrintedProfiling); break; @@ -1146,14 +991,25 @@ void CodeBlock::dumpBytecode(PrintStream& out, ExecState* exec, const Instructio int r3 = (++it)->u.operand; int r4 = (++it)->u.operand; int r5 = (++it)->u.operand; - out.printf("[%4d] get_by_pname\t %s, %s, %s, %s, %s, %s", location, registerName(exec, r0).data(), registerName(exec, r1).data(), registerName(exec, r2).data(), registerName(exec, r3).data(), registerName(exec, r4).data(), registerName(exec, r5).data()); + printLocationAndOp(out, exec, location, it, "get_by_pname"); + out.printf("%s, %s, %s, %s, %s, %s", registerName(r0).data(), registerName(r1).data(), registerName(r2).data(), registerName(r3).data(), registerName(r4).data(), registerName(r5).data()); break; } case op_put_by_val: { int r0 = (++it)->u.operand; int r1 = (++it)->u.operand; int r2 = (++it)->u.operand; - out.printf("[%4d] put_by_val\t %s, %s, %s", location, registerName(exec, r0).data(), registerName(exec, r1).data(), registerName(exec, r2).data()); + printLocationAndOp(out, exec, location, it, "put_by_val"); + out.printf("%s, %s, %s", registerName(r0).data(), registerName(r1).data(), registerName(r2).data()); + dumpArrayProfiling(out, it, hasPrintedProfiling); + break; + } + case op_put_by_val_direct: { + int r0 = (++it)->u.operand; + int r1 = (++it)->u.operand; + int r2 = (++it)->u.operand; + printLocationAndOp(out, exec, location, it, "put_by_val_direct"); + out.printf("%s, %s, %s", registerName(r0).data(), registerName(r1).data(), registerName(r2).data()); dumpArrayProfiling(out, it, hasPrintedProfiling); break; } @@ -1161,19 +1017,22 @@ void CodeBlock::dumpBytecode(PrintStream& out, ExecState* exec, const Instructio int r0 = (++it)->u.operand; int r1 = (++it)->u.operand; int r2 = (++it)->u.operand; - out.printf("[%4d] del_by_val\t %s, %s, %s", location, registerName(exec, r0).data(), registerName(exec, r1).data(), registerName(exec, r2).data()); + printLocationAndOp(out, exec, location, it, "del_by_val"); + out.printf("%s, %s, %s", registerName(r0).data(), registerName(r1).data(), registerName(r2).data()); break; } case op_put_by_index: { int r0 = (++it)->u.operand; unsigned n0 = (++it)->u.operand; int r1 = (++it)->u.operand; - out.printf("[%4d] put_by_index\t %s, %u, %s", location, registerName(exec, r0).data(), n0, registerName(exec, r1).data()); + printLocationAndOp(out, exec, location, it, "put_by_index"); + out.printf("%s, %u, %s", registerName(r0).data(), n0, registerName(r1).data()); break; } case op_jmp: { int offset = (++it)->u.operand; - out.printf("[%4d] jmp\t\t %d(->%d)", location, offset, location + offset); + printLocationAndOp(out, exec, location, it, "jmp"); + out.printf("%d(->%d)", offset, location + offset); break; } case op_jtrue: { @@ -1196,162 +1055,190 @@ void CodeBlock::dumpBytecode(PrintStream& out, ExecState* exec, const Instructio int r0 = (++it)->u.operand; Special::Pointer pointer = (++it)->u.specialPointer; int offset = (++it)->u.operand; - out.printf("[%4d] jneq_ptr\t\t %s, %d (%p), %d(->%d)", location, registerName(exec, r0).data(), pointer, m_globalObject->actualPointerFor(pointer), offset, location + offset); + printLocationAndOp(out, exec, location, it, "jneq_ptr"); + out.printf("%s, %d (%p), %d(->%d)", registerName(r0).data(), pointer, m_globalObject->actualPointerFor(pointer), offset, location + offset); break; } case op_jless: { int r0 = (++it)->u.operand; int r1 = (++it)->u.operand; int offset = (++it)->u.operand; - out.printf("[%4d] jless\t\t %s, %s, %d(->%d)", location, registerName(exec, r0).data(), registerName(exec, r1).data(), offset, location + offset); + printLocationAndOp(out, exec, location, it, "jless"); + out.printf("%s, %s, %d(->%d)", registerName(r0).data(), registerName(r1).data(), offset, location + offset); break; } case op_jlesseq: { int r0 = (++it)->u.operand; int r1 = (++it)->u.operand; int offset = (++it)->u.operand; - out.printf("[%4d] jlesseq\t\t %s, %s, %d(->%d)", location, registerName(exec, r0).data(), registerName(exec, r1).data(), offset, location + offset); + printLocationAndOp(out, exec, location, it, "jlesseq"); + out.printf("%s, %s, %d(->%d)", registerName(r0).data(), registerName(r1).data(), offset, location + offset); break; } case op_jgreater: { int r0 = (++it)->u.operand; int r1 = (++it)->u.operand; int offset = (++it)->u.operand; - out.printf("[%4d] jgreater\t\t %s, %s, %d(->%d)", location, registerName(exec, r0).data(), registerName(exec, r1).data(), offset, location + offset); + printLocationAndOp(out, exec, location, it, "jgreater"); + out.printf("%s, %s, %d(->%d)", registerName(r0).data(), registerName(r1).data(), offset, location + offset); break; } case op_jgreatereq: { int r0 = (++it)->u.operand; int r1 = (++it)->u.operand; int offset = (++it)->u.operand; - out.printf("[%4d] jgreatereq\t\t %s, %s, %d(->%d)", location, registerName(exec, r0).data(), registerName(exec, r1).data(), offset, location + offset); + printLocationAndOp(out, exec, location, it, "jgreatereq"); + out.printf("%s, %s, %d(->%d)", registerName(r0).data(), registerName(r1).data(), offset, location + offset); break; } case op_jnless: { int r0 = (++it)->u.operand; int r1 = (++it)->u.operand; int offset = (++it)->u.operand; - out.printf("[%4d] jnless\t\t %s, %s, %d(->%d)", location, registerName(exec, r0).data(), registerName(exec, r1).data(), offset, location + offset); + printLocationAndOp(out, exec, location, it, "jnless"); + out.printf("%s, %s, %d(->%d)", registerName(r0).data(), registerName(r1).data(), offset, location + offset); break; } case op_jnlesseq: { int r0 = (++it)->u.operand; int r1 = (++it)->u.operand; int offset = (++it)->u.operand; - out.printf("[%4d] jnlesseq\t\t %s, %s, %d(->%d)", location, registerName(exec, r0).data(), registerName(exec, r1).data(), offset, location + offset); + printLocationAndOp(out, exec, location, it, "jnlesseq"); + out.printf("%s, %s, %d(->%d)", registerName(r0).data(), registerName(r1).data(), offset, location + offset); break; } case op_jngreater: { int r0 = (++it)->u.operand; int r1 = (++it)->u.operand; int offset = (++it)->u.operand; - out.printf("[%4d] jngreater\t\t %s, %s, %d(->%d)", location, registerName(exec, r0).data(), registerName(exec, r1).data(), offset, location + offset); + printLocationAndOp(out, exec, location, it, "jngreater"); + out.printf("%s, %s, %d(->%d)", registerName(r0).data(), registerName(r1).data(), offset, location + offset); break; } case op_jngreatereq: { int r0 = (++it)->u.operand; int r1 = (++it)->u.operand; int offset = (++it)->u.operand; - out.printf("[%4d] jngreatereq\t\t %s, %s, %d(->%d)", location, registerName(exec, r0).data(), registerName(exec, r1).data(), offset, location + offset); + printLocationAndOp(out, exec, location, it, "jngreatereq"); + out.printf("%s, %s, %d(->%d)", registerName(r0).data(), registerName(r1).data(), offset, location + offset); break; } case op_loop_hint: { - out.printf("[%4d] loop_hint", location); + printLocationAndOp(out, exec, location, it, "loop_hint"); break; } case op_switch_imm: { int tableIndex = (++it)->u.operand; int defaultTarget = (++it)->u.operand; int scrutineeRegister = (++it)->u.operand; - out.printf("[%4d] switch_imm\t %d, %d(->%d), %s", location, tableIndex, defaultTarget, location + defaultTarget, registerName(exec, scrutineeRegister).data()); + printLocationAndOp(out, exec, location, it, "switch_imm"); + out.printf("%d, %d(->%d), %s", tableIndex, defaultTarget, location + defaultTarget, registerName(scrutineeRegister).data()); break; } case op_switch_char: { int tableIndex = (++it)->u.operand; int defaultTarget = (++it)->u.operand; int scrutineeRegister = (++it)->u.operand; - out.printf("[%4d] switch_char\t %d, %d(->%d), %s", location, tableIndex, defaultTarget, location + defaultTarget, registerName(exec, scrutineeRegister).data()); + printLocationAndOp(out, exec, location, it, "switch_char"); + out.printf("%d, %d(->%d), %s", tableIndex, defaultTarget, location + defaultTarget, registerName(scrutineeRegister).data()); break; } case op_switch_string: { int tableIndex = (++it)->u.operand; int defaultTarget = (++it)->u.operand; int scrutineeRegister = (++it)->u.operand; - out.printf("[%4d] switch_string\t %d, %d(->%d), %s", location, tableIndex, defaultTarget, location + defaultTarget, registerName(exec, scrutineeRegister).data()); + printLocationAndOp(out, exec, location, it, "switch_string"); + out.printf("%d, %d(->%d), %s", tableIndex, defaultTarget, location + defaultTarget, registerName(scrutineeRegister).data()); break; } case op_new_func: { int r0 = (++it)->u.operand; int f0 = (++it)->u.operand; int shouldCheck = (++it)->u.operand; - out.printf("[%4d] new_func\t\t %s, f%d, %s", location, registerName(exec, r0).data(), f0, shouldCheck ? "" : ""); + printLocationAndOp(out, exec, location, it, "new_func"); + out.printf("%s, f%d, %s", registerName(r0).data(), f0, shouldCheck ? "" : ""); + break; + } + case op_new_captured_func: { + int r0 = (++it)->u.operand; + int f0 = (++it)->u.operand; + printLocationAndOp(out, exec, location, it, "new_captured_func"); + out.printf("%s, f%d", registerName(r0).data(), f0); + ++it; break; } case op_new_func_exp: { int r0 = (++it)->u.operand; int f0 = (++it)->u.operand; - out.printf("[%4d] new_func_exp\t %s, f%d", location, registerName(exec, r0).data(), f0); + printLocationAndOp(out, exec, location, it, "new_func_exp"); + out.printf("%s, f%d", registerName(r0).data(), f0); break; } case op_call: { - printCallOp(out, exec, location, it, "call", DumpCaches); + printCallOp(out, exec, location, it, "call", DumpCaches, hasPrintedProfiling, callLinkInfos); break; } case op_call_eval: { - printCallOp(out, exec, location, it, "call_eval", DontDumpCaches); + printCallOp(out, exec, location, it, "call_eval", DontDumpCaches, hasPrintedProfiling, callLinkInfos); break; } + + case op_construct_varargs: case op_call_varargs: { + int result = (++it)->u.operand; int callee = (++it)->u.operand; int thisValue = (++it)->u.operand; int arguments = (++it)->u.operand; int firstFreeRegister = (++it)->u.operand; - out.printf("[%4d] call_varargs\t %s, %s, %s, %d", location, registerName(exec, callee).data(), registerName(exec, thisValue).data(), registerName(exec, arguments).data(), firstFreeRegister); + int varArgOffset = (++it)->u.operand; + ++it; + printLocationAndOp(out, exec, location, it, opcode == op_call_varargs ? "call_varargs" : "construct_varargs"); + out.printf("%s, %s, %s, %s, %d, %d", registerName(result).data(), registerName(callee).data(), registerName(thisValue).data(), registerName(arguments).data(), firstFreeRegister, varArgOffset); + dumpValueProfiling(out, it, hasPrintedProfiling); break; } + case op_tear_off_activation: { int r0 = (++it)->u.operand; - out.printf("[%4d] tear_off_activation\t %s", location, registerName(exec, r0).data()); + printLocationOpAndRegisterOperand(out, exec, location, it, "tear_off_activation", r0); break; } case op_tear_off_arguments: { int r0 = (++it)->u.operand; int r1 = (++it)->u.operand; - out.printf("[%4d] tear_off_arguments %s, %s", location, registerName(exec, r0).data(), registerName(exec, r1).data()); + printLocationAndOp(out, exec, location, it, "tear_off_arguments"); + out.printf("%s, %s", registerName(r0).data(), registerName(r1).data()); break; } case op_ret: { int r0 = (++it)->u.operand; - out.printf("[%4d] ret\t\t %s", location, registerName(exec, r0).data()); - break; - } - case op_call_put_result: { - int r0 = (++it)->u.operand; - out.printf("[%4d] call_put_result\t\t %s", location, registerName(exec, r0).data()); - dumpValueProfiling(out, it, hasPrintedProfiling); + printLocationOpAndRegisterOperand(out, exec, location, it, "ret", r0); break; } case op_ret_object_or_this: { int r0 = (++it)->u.operand; int r1 = (++it)->u.operand; - out.printf("[%4d] constructor_ret\t\t %s %s", location, registerName(exec, r0).data(), registerName(exec, r1).data()); + printLocationAndOp(out, exec, location, it, "constructor_ret"); + out.printf("%s %s", registerName(r0).data(), registerName(r1).data()); break; } case op_construct: { - printCallOp(out, exec, location, it, "construct", DumpCaches); + printCallOp(out, exec, location, it, "construct", DumpCaches, hasPrintedProfiling, callLinkInfos); break; } case op_strcat: { int r0 = (++it)->u.operand; int r1 = (++it)->u.operand; int count = (++it)->u.operand; - out.printf("[%4d] strcat\t\t %s, %s, %d", location, registerName(exec, r0).data(), registerName(exec, r1).data(), count); + printLocationAndOp(out, exec, location, it, "strcat"); + out.printf("%s, %s, %d", registerName(r0).data(), registerName(r1).data(), count); break; } case op_to_primitive: { int r0 = (++it)->u.operand; int r1 = (++it)->u.operand; - out.printf("[%4d] to_primitive\t %s, %s", location, registerName(exec, r0).data(), registerName(exec, r1).data()); + printLocationAndOp(out, exec, location, it, "to_primitive"); + out.printf("%s, %s", registerName(r0).data(), registerName(r1).data()); break; } case op_get_pnames: { @@ -1360,7 +1247,8 @@ void CodeBlock::dumpBytecode(PrintStream& out, ExecState* exec, const Instructio int r2 = it[3].u.operand; int r3 = it[4].u.operand; int offset = it[5].u.operand; - out.printf("[%4d] get_pnames\t %s, %s, %s, %s, %d(->%d)", location, registerName(exec, r0).data(), registerName(exec, r1).data(), registerName(exec, r2).data(), registerName(exec, r3).data(), offset, location + offset); + printLocationAndOp(out, exec, location, it, "get_pnames"); + out.printf("%s, %s, %s, %s, %d(->%d)", registerName(r0).data(), registerName(r1).data(), registerName(r2).data(), registerName(r3).data(), offset, location + offset); it += OPCODE_LENGTH(op_get_pnames) - 1; break; } @@ -1371,83 +1259,122 @@ void CodeBlock::dumpBytecode(PrintStream& out, ExecState* exec, const Instructio int size = it[4].u.operand; int iter = it[5].u.operand; int offset = it[6].u.operand; - out.printf("[%4d] next_pname\t %s, %s, %s, %s, %s, %d(->%d)", location, registerName(exec, dest).data(), registerName(exec, base).data(), registerName(exec, i).data(), registerName(exec, size).data(), registerName(exec, iter).data(), offset, location + offset); + printLocationAndOp(out, exec, location, it, "next_pname"); + out.printf("%s, %s, %s, %s, %s, %d(->%d)", registerName(dest).data(), registerName(base).data(), registerName(i).data(), registerName(size).data(), registerName(iter).data(), offset, location + offset); it += OPCODE_LENGTH(op_next_pname) - 1; break; } case op_push_with_scope: { int r0 = (++it)->u.operand; - out.printf("[%4d] push_with_scope\t %s", location, registerName(exec, r0).data()); + printLocationOpAndRegisterOperand(out, exec, location, it, "push_with_scope", r0); break; } case op_pop_scope: { - out.printf("[%4d] pop_scope", location); + printLocationAndOp(out, exec, location, it, "pop_scope"); break; } case op_push_name_scope: { int id0 = (++it)->u.operand; int r1 = (++it)->u.operand; unsigned attributes = (++it)->u.operand; - out.printf("[%4d] push_name_scope \t%s, %s, %u", location, idName(id0, m_identifiers[id0]).data(), registerName(exec, r1).data(), attributes); + printLocationAndOp(out, exec, location, it, "push_name_scope"); + out.printf("%s, %s, %u", idName(id0, identifier(id0)).data(), registerName(r1).data(), attributes); break; } case op_catch: { int r0 = (++it)->u.operand; - out.printf("[%4d] catch\t\t %s", location, registerName(exec, r0).data()); + printLocationOpAndRegisterOperand(out, exec, location, it, "catch", r0); break; } case op_throw: { int r0 = (++it)->u.operand; - out.printf("[%4d] throw\t\t %s", location, registerName(exec, r0).data()); + printLocationOpAndRegisterOperand(out, exec, location, it, "throw", r0); break; } case op_throw_static_error: { int k0 = (++it)->u.operand; int k1 = (++it)->u.operand; - out.printf("[%4d] throw_static_error\t %s, %s", location, constantName(exec, k0, getConstant(k0)).data(), k1 ? "true" : "false"); + printLocationAndOp(out, exec, location, it, "throw_static_error"); + out.printf("%s, %s", constantName(k0, getConstant(k0)).data(), k1 ? "true" : "false"); break; } case op_debug: { int debugHookID = (++it)->u.operand; - int firstLine = (++it)->u.operand; - int lastLine = (++it)->u.operand; - int column = (++it)->u.operand; - out.printf("[%4d] debug\t\t %s, %d, %d, %d", location, debugHookName(debugHookID), firstLine, lastLine, column); + int hasBreakpointFlag = (++it)->u.operand; + printLocationAndOp(out, exec, location, it, "debug"); + out.printf("%s %d", debugHookName(debugHookID), hasBreakpointFlag); break; } case op_profile_will_call: { int function = (++it)->u.operand; - out.printf("[%4d] profile_will_call %s", location, registerName(exec, function).data()); + printLocationOpAndRegisterOperand(out, exec, location, it, "profile_will_call", function); break; } case op_profile_did_call: { int function = (++it)->u.operand; - out.printf("[%4d] profile_did_call\t %s", location, registerName(exec, function).data()); + printLocationOpAndRegisterOperand(out, exec, location, it, "profile_did_call", function); break; } case op_end: { int r0 = (++it)->u.operand; - out.printf("[%4d] end\t\t %s", location, registerName(exec, r0).data()); + printLocationOpAndRegisterOperand(out, exec, location, it, "end", r0); + break; + } + case op_resolve_scope: { + int r0 = (++it)->u.operand; + int id0 = (++it)->u.operand; + ResolveModeAndType modeAndType = ResolveModeAndType((++it)->u.operand); + int depth = (++it)->u.operand; + printLocationAndOp(out, exec, location, it, "resolve_scope"); + out.printf("%s, %s, %u<%s|%s>, %d", registerName(r0).data(), idName(id0, identifier(id0)).data(), + modeAndType.operand(), resolveModeName(modeAndType.mode()), resolveTypeName(modeAndType.type()), + depth); + ++it; + break; + } + case op_get_from_scope: { + int r0 = (++it)->u.operand; + int r1 = (++it)->u.operand; + int id0 = (++it)->u.operand; + ResolveModeAndType modeAndType = ResolveModeAndType((++it)->u.operand); + ++it; // Structure + int operand = (++it)->u.operand; // Operand + ++it; // Skip value profile. + printLocationAndOp(out, exec, location, it, "get_from_scope"); + out.printf("%s, %s, %s, %u<%s|%s>, , %d", + registerName(r0).data(), registerName(r1).data(), idName(id0, identifier(id0)).data(), + modeAndType.operand(), resolveModeName(modeAndType.mode()), resolveTypeName(modeAndType.type()), + operand); + break; + } + case op_put_to_scope: { + int r0 = (++it)->u.operand; + int id0 = (++it)->u.operand; + int r1 = (++it)->u.operand; + ResolveModeAndType modeAndType = ResolveModeAndType((++it)->u.operand); + ++it; // Structure + int operand = (++it)->u.operand; // Operand + printLocationAndOp(out, exec, location, it, "put_to_scope"); + out.printf("%s, %s, %s, %u<%s|%s>, , %d", + registerName(r0).data(), idName(id0, identifier(id0)).data(), registerName(r1).data(), + modeAndType.operand(), resolveModeName(modeAndType.mode()), resolveTypeName(modeAndType.type()), + operand); break; } -#if ENABLE(LLINT_C_LOOP) default: RELEASE_ASSERT_NOT_REACHED(); -#endif } -#if ENABLE(VALUE_PROFILER) dumpRareCaseProfile(out, "rare case: ", rareCaseProfileForBytecodeOffset(location), hasPrintedProfiling); dumpRareCaseProfile(out, "special fast case: ", specialFastCaseProfileForBytecodeOffset(location), hasPrintedProfiling); -#endif #if ENABLE(DFG_JIT) - Vector exitSites = exitProfile().exitSitesFor(location); + Vector exitSites = exitProfile().exitSitesFor(location); if (!exitSites.isEmpty()) { out.print(" !! frequent exits: "); CommaPrinter comma; for (unsigned i = 0; i < exitSites.size(); ++i) - out.print(comma, exitSites[i].kind()); + out.print(comma, exitSites[i].kind(), " ", exitSites[i].jitType()); } #else // ENABLE(DFG_JIT) UNUSED_PARAM(location); @@ -1455,21 +1382,17 @@ void CodeBlock::dumpBytecode(PrintStream& out, ExecState* exec, const Instructio out.print("\n"); } -void CodeBlock::dumpBytecode(PrintStream& out, unsigned bytecodeOffset) +void CodeBlock::dumpBytecode( + PrintStream& out, unsigned bytecodeOffset, + const StubInfoMap& stubInfos, const CallLinkInfoMap& callLinkInfos) { ExecState* exec = m_globalObject->globalExec(); const Instruction* it = instructions().begin() + bytecodeOffset; - dumpBytecode(out, exec, instructions().begin(), it); + dumpBytecode(out, exec, instructions().begin(), it, stubInfos, callLinkInfos); } -#if DUMP_CODE_BLOCK_STATISTICS -static HashSet liveCodeBlockSet; -#endif - #define FOR_EACH_MEMBER_VECTOR(macro) \ macro(instructions) \ - macro(globalResolveInfos) \ - macro(structureStubInfos) \ macro(callLinkInfos) \ macro(linkedCallerList) \ macro(identifiers) \ @@ -1480,8 +1403,7 @@ static HashSet liveCodeBlockSet; macro(regexps) \ macro(functions) \ macro(exceptionHandlers) \ - macro(immediateSwitchJumpTables) \ - macro(characterSwitchJumpTables) \ + macro(switchJumpTables) \ macro(stringSwitchJumpTables) \ macro(evalCodeCache) \ macro(expressionInfo) \ @@ -1494,105 +1416,19 @@ static size_t sizeInBytes(const Vector& vector) return vector.capacity() * sizeof(T); } -void CodeBlock::dumpStatistics() -{ -#if DUMP_CODE_BLOCK_STATISTICS - #define DEFINE_VARS(name) size_t name##IsNotEmpty = 0; size_t name##TotalSize = 0; - FOR_EACH_MEMBER_VECTOR(DEFINE_VARS) - FOR_EACH_MEMBER_VECTOR_RARE_DATA(DEFINE_VARS) - #undef DEFINE_VARS - - // Non-vector data members - size_t evalCodeCacheIsNotEmpty = 0; - - size_t symbolTableIsNotEmpty = 0; - size_t symbolTableTotalSize = 0; - - size_t hasRareData = 0; - - size_t isFunctionCode = 0; - size_t isGlobalCode = 0; - size_t isEvalCode = 0; - - HashSet::const_iterator end = liveCodeBlockSet.end(); - for (HashSet::const_iterator it = liveCodeBlockSet.begin(); it != end; ++it) { - CodeBlock* codeBlock = *it; - - #define GET_STATS(name) if (!codeBlock->m_##name.isEmpty()) { name##IsNotEmpty++; name##TotalSize += sizeInBytes(codeBlock->m_##name); } - FOR_EACH_MEMBER_VECTOR(GET_STATS) - #undef GET_STATS - - if (codeBlock->symbolTable() && !codeBlock->symbolTable()->isEmpty()) { - symbolTableIsNotEmpty++; - symbolTableTotalSize += (codeBlock->symbolTable()->capacity() * (sizeof(SymbolTable::KeyType) + sizeof(SymbolTable::MappedType))); - } - - if (codeBlock->m_rareData) { - hasRareData++; - #define GET_STATS(name) if (!codeBlock->m_rareData->m_##name.isEmpty()) { name##IsNotEmpty++; name##TotalSize += sizeInBytes(codeBlock->m_rareData->m_##name); } - FOR_EACH_MEMBER_VECTOR_RARE_DATA(GET_STATS) - #undef GET_STATS - - if (!codeBlock->m_rareData->m_evalCodeCache.isEmpty()) - evalCodeCacheIsNotEmpty++; - } - - switch (codeBlock->codeType()) { - case FunctionCode: - ++isFunctionCode; - break; - case GlobalCode: - ++isGlobalCode; - break; - case EvalCode: - ++isEvalCode; - break; - } - } - - size_t totalSize = 0; - - #define GET_TOTAL_SIZE(name) totalSize += name##TotalSize; - FOR_EACH_MEMBER_VECTOR(GET_TOTAL_SIZE) - FOR_EACH_MEMBER_VECTOR_RARE_DATA(GET_TOTAL_SIZE) - #undef GET_TOTAL_SIZE - - totalSize += symbolTableTotalSize; - totalSize += (liveCodeBlockSet.size() * sizeof(CodeBlock)); - - dataLogF("Number of live CodeBlocks: %d\n", liveCodeBlockSet.size()); - dataLogF("Size of a single CodeBlock [sizeof(CodeBlock)]: %zu\n", sizeof(CodeBlock)); - dataLogF("Size of all CodeBlocks: %zu\n", totalSize); - dataLogF("Average size of a CodeBlock: %zu\n", totalSize / liveCodeBlockSet.size()); - - dataLogF("Number of FunctionCode CodeBlocks: %zu (%.3f%%)\n", isFunctionCode, static_cast(isFunctionCode) * 100.0 / liveCodeBlockSet.size()); - dataLogF("Number of GlobalCode CodeBlocks: %zu (%.3f%%)\n", isGlobalCode, static_cast(isGlobalCode) * 100.0 / liveCodeBlockSet.size()); - dataLogF("Number of EvalCode CodeBlocks: %zu (%.3f%%)\n", isEvalCode, static_cast(isEvalCode) * 100.0 / liveCodeBlockSet.size()); - - dataLogF("Number of CodeBlocks with rare data: %zu (%.3f%%)\n", hasRareData, static_cast(hasRareData) * 100.0 / liveCodeBlockSet.size()); - - #define PRINT_STATS(name) dataLogF("Number of CodeBlocks with " #name ": %zu\n", name##IsNotEmpty); dataLogF("Size of all " #name ": %zu\n", name##TotalSize); - FOR_EACH_MEMBER_VECTOR(PRINT_STATS) - FOR_EACH_MEMBER_VECTOR_RARE_DATA(PRINT_STATS) - #undef PRINT_STATS - - dataLogF("Number of CodeBlocks with evalCodeCache: %zu\n", evalCodeCacheIsNotEmpty); - dataLogF("Number of CodeBlocks with symbolTable: %zu\n", symbolTableIsNotEmpty); - - dataLogF("Size of all symbolTables: %zu\n", symbolTableTotalSize); - -#else - dataLogF("Dumping CodeBlock statistics is not enabled.\n"); -#endif -} - CodeBlock::CodeBlock(CopyParsedBlockTag, CodeBlock& other) : m_globalObject(other.m_globalObject) , m_heap(other.m_heap) , m_numCalleeRegisters(other.m_numCalleeRegisters) , m_numVars(other.m_numVars) , m_isConstructor(other.m_isConstructor) + , m_shouldAlwaysBeInlined(true) + , m_didFailFTLCompilation(false) + , m_hasBeenCompiledWithFTL(false) , m_unlinkedCode(*other.m_vm, other.m_ownerExecutable.get(), other.m_unlinkedCode.get()) + , m_hasDebuggerStatement(false) + , m_steppingMode(SteppingModeDisabled) + , m_numBreakpoints(0) , m_ownerExecutable(*other.m_vm, other.m_ownerExecutable.get(), other.m_ownerExecutable.get()) , m_vm(other.m_vm) , m_instructions(other.m_instructions) @@ -1601,23 +1437,28 @@ CodeBlock::CodeBlock(CopyParsedBlockTag, CodeBlock& other) , m_activationRegister(other.m_activationRegister) , m_isStrictMode(other.m_isStrictMode) , m_needsActivation(other.m_needsActivation) + , m_mayBeExecuting(false) + , m_visitAggregateHasBeenCalled(false) , m_source(other.m_source) , m_sourceOffset(other.m_sourceOffset) , m_firstLineColumnOffset(other.m_firstLineColumnOffset) , m_codeType(other.m_codeType) - , m_identifiers(other.m_identifiers) , m_constantRegisters(other.m_constantRegisters) , m_functionDecls(other.m_functionDecls) , m_functionExprs(other.m_functionExprs) , m_osrExitCounter(0) , m_optimizationDelayCounter(0) , m_reoptimizationRetryCounter(0) - , m_resolveOperations(other.m_resolveOperations) - , m_putToBaseOperations(other.m_putToBaseOperations) + , m_hash(other.m_hash) #if ENABLE(JIT) - , m_canCompileWithDFGState(DFG::CapabilityLevelNotSet) + , m_capabilityLevelState(DFG::CapabilityLevelNotSet) #endif { + ASSERT(m_heap->isDeferred()); + + if (SymbolTable* symbolTable = other.symbolTable()) + m_symbolTable.set(*m_vm, m_ownerExecutable.get(), symbolTable); + setNumParameters(other.numParameters()); optimizeAfterWarmUp(); jitAfterWarmUp(); @@ -1627,72 +1468,94 @@ CodeBlock::CodeBlock(CopyParsedBlockTag, CodeBlock& other) m_rareData->m_exceptionHandlers = other.m_rareData->m_exceptionHandlers; m_rareData->m_constantBuffers = other.m_rareData->m_constantBuffers; - m_rareData->m_immediateSwitchJumpTables = other.m_rareData->m_immediateSwitchJumpTables; - m_rareData->m_characterSwitchJumpTables = other.m_rareData->m_characterSwitchJumpTables; + m_rareData->m_switchJumpTables = other.m_rareData->m_switchJumpTables; m_rareData->m_stringSwitchJumpTables = other.m_rareData->m_stringSwitchJumpTables; } + + m_heap->m_codeBlocks.add(this); + m_heap->reportExtraMemoryCost(sizeof(CodeBlock)); } -CodeBlock::CodeBlock(ScriptExecutable* ownerExecutable, UnlinkedCodeBlock* unlinkedCodeBlock, JSGlobalObject* globalObject, unsigned baseScopeDepth, PassRefPtr sourceProvider, unsigned sourceOffset, unsigned firstLineColumnOffset, PassOwnPtr alternative) - : m_globalObject(globalObject->vm(), ownerExecutable, globalObject) +CodeBlock::CodeBlock(ScriptExecutable* ownerExecutable, UnlinkedCodeBlock* unlinkedCodeBlock, JSScope* scope, PassRefPtr sourceProvider, unsigned sourceOffset, unsigned firstLineColumnOffset) + : m_globalObject(scope->globalObject()->vm(), ownerExecutable, scope->globalObject()) , m_heap(&m_globalObject->vm().heap) , m_numCalleeRegisters(unlinkedCodeBlock->m_numCalleeRegisters) , m_numVars(unlinkedCodeBlock->m_numVars) , m_isConstructor(unlinkedCodeBlock->isConstructor()) - , m_unlinkedCode(globalObject->vm(), ownerExecutable, unlinkedCodeBlock) - , m_ownerExecutable(globalObject->vm(), ownerExecutable, ownerExecutable) + , m_shouldAlwaysBeInlined(true) + , m_didFailFTLCompilation(false) + , m_hasBeenCompiledWithFTL(false) + , m_unlinkedCode(m_globalObject->vm(), ownerExecutable, unlinkedCodeBlock) + , m_hasDebuggerStatement(false) + , m_steppingMode(SteppingModeDisabled) + , m_numBreakpoints(0) + , m_ownerExecutable(m_globalObject->vm(), ownerExecutable, ownerExecutable) , m_vm(unlinkedCodeBlock->vm()) , m_thisRegister(unlinkedCodeBlock->thisRegister()) , m_argumentsRegister(unlinkedCodeBlock->argumentsRegister()) , m_activationRegister(unlinkedCodeBlock->activationRegister()) , m_isStrictMode(unlinkedCodeBlock->isStrictMode()) - , m_needsActivation(unlinkedCodeBlock->needsFullScopeChain()) + , m_needsActivation(unlinkedCodeBlock->hasActivationRegister() && unlinkedCodeBlock->codeType() == FunctionCode) + , m_mayBeExecuting(false) + , m_visitAggregateHasBeenCalled(false) , m_source(sourceProvider) , m_sourceOffset(sourceOffset) , m_firstLineColumnOffset(firstLineColumnOffset) , m_codeType(unlinkedCodeBlock->codeType()) - , m_alternative(alternative) , m_osrExitCounter(0) , m_optimizationDelayCounter(0) , m_reoptimizationRetryCounter(0) +#if ENABLE(JIT) + , m_capabilityLevelState(DFG::CapabilityLevelNotSet) +#endif { - m_vm->startedCompiling(this); + ASSERT(m_heap->isDeferred()); + bool didCloneSymbolTable = false; + + if (SymbolTable* symbolTable = unlinkedCodeBlock->symbolTable()) { + if (codeType() == FunctionCode && symbolTable->captureCount()) { + m_symbolTable.set(*m_vm, m_ownerExecutable.get(), symbolTable->cloneCapturedNames(*m_vm)); + didCloneSymbolTable = true; + } else + m_symbolTable.set(*m_vm, m_ownerExecutable.get(), symbolTable); + } + ASSERT(m_source); setNumParameters(unlinkedCodeBlock->numParameters()); -#if DUMP_CODE_BLOCK_STATISTICS - liveCodeBlockSet.add(this); -#endif - setIdentifiers(unlinkedCodeBlock->identifiers()); setConstantRegisters(unlinkedCodeBlock->constantRegisters()); if (unlinkedCodeBlock->usesGlobalObject()) - m_constantRegisters[unlinkedCodeBlock->globalObjectRegister()].set(*m_vm, ownerExecutable, globalObject); - m_functionDecls.grow(unlinkedCodeBlock->numberOfFunctionDecls()); + m_constantRegisters[unlinkedCodeBlock->globalObjectRegister().toConstantIndex()].set(*m_vm, ownerExecutable, m_globalObject.get()); + m_functionDecls.resizeToFit(unlinkedCodeBlock->numberOfFunctionDecls()); for (size_t count = unlinkedCodeBlock->numberOfFunctionDecls(), i = 0; i < count; ++i) { UnlinkedFunctionExecutable* unlinkedExecutable = unlinkedCodeBlock->functionDecl(i); unsigned lineCount = unlinkedExecutable->lineCount(); unsigned firstLine = ownerExecutable->lineNo() + unlinkedExecutable->firstLineOffset(); - unsigned startColumn = unlinkedExecutable->functionStartColumn(); - startColumn += (unlinkedExecutable->firstLineOffset() ? 1 : ownerExecutable->startColumn()); + bool startColumnIsOnOwnerStartLine = !unlinkedExecutable->firstLineOffset(); + unsigned startColumn = unlinkedExecutable->unlinkedBodyStartColumn() + (startColumnIsOnOwnerStartLine ? ownerExecutable->startColumn() : 1); + bool endColumnIsOnStartLine = !lineCount; + unsigned endColumn = unlinkedExecutable->unlinkedBodyEndColumn() + (endColumnIsOnStartLine ? startColumn : 1); unsigned startOffset = sourceOffset + unlinkedExecutable->startOffset(); unsigned sourceLength = unlinkedExecutable->sourceLength(); SourceCode code(m_source, startOffset, startOffset + sourceLength, firstLine, startColumn); - FunctionExecutable* executable = FunctionExecutable::create(*m_vm, code, unlinkedExecutable, firstLine, firstLine + lineCount, startColumn); + FunctionExecutable* executable = FunctionExecutable::create(*m_vm, code, unlinkedExecutable, firstLine, firstLine + lineCount, startColumn, endColumn); m_functionDecls[i].set(*m_vm, ownerExecutable, executable); } - m_functionExprs.grow(unlinkedCodeBlock->numberOfFunctionExprs()); + m_functionExprs.resizeToFit(unlinkedCodeBlock->numberOfFunctionExprs()); for (size_t count = unlinkedCodeBlock->numberOfFunctionExprs(), i = 0; i < count; ++i) { UnlinkedFunctionExecutable* unlinkedExecutable = unlinkedCodeBlock->functionExpr(i); unsigned lineCount = unlinkedExecutable->lineCount(); unsigned firstLine = ownerExecutable->lineNo() + unlinkedExecutable->firstLineOffset(); - unsigned startColumn = unlinkedExecutable->functionStartColumn(); - startColumn += (unlinkedExecutable->firstLineOffset() ? 1 : ownerExecutable->startColumn()); + bool startColumnIsOnOwnerStartLine = !unlinkedExecutable->firstLineOffset(); + unsigned startColumn = unlinkedExecutable->unlinkedBodyStartColumn() + (startColumnIsOnOwnerStartLine ? ownerExecutable->startColumn() : 1); + bool endColumnIsOnStartLine = !lineCount; + unsigned endColumn = unlinkedExecutable->unlinkedBodyEndColumn() + (endColumnIsOnStartLine ? startColumn : 1); unsigned startOffset = sourceOffset + unlinkedExecutable->startOffset(); unsigned sourceLength = unlinkedExecutable->sourceLength(); SourceCode code(m_source, startOffset, startOffset + sourceLength, firstLine, startColumn); - FunctionExecutable* executable = FunctionExecutable::create(*m_vm, code, unlinkedExecutable, firstLine, firstLine + lineCount, startColumn); + FunctionExecutable* executable = FunctionExecutable::create(*m_vm, code, unlinkedExecutable, firstLine, firstLine + lineCount, startColumn, endColumn); m_functionExprs[i].set(*m_vm, ownerExecutable, executable); } @@ -1706,15 +1569,16 @@ CodeBlock::CodeBlock(ScriptExecutable* ownerExecutable, UnlinkedCodeBlock* unlin } } if (size_t count = unlinkedCodeBlock->numberOfExceptionHandlers()) { - m_rareData->m_exceptionHandlers.grow(count); + m_rareData->m_exceptionHandlers.resizeToFit(count); + size_t nonLocalScopeDepth = scope->depth(); for (size_t i = 0; i < count; i++) { const UnlinkedHandlerInfo& handler = unlinkedCodeBlock->exceptionHandler(i); m_rareData->m_exceptionHandlers[i].start = handler.start; m_rareData->m_exceptionHandlers[i].end = handler.end; m_rareData->m_exceptionHandlers[i].target = handler.target; - m_rareData->m_exceptionHandlers[i].scopeDepth = handler.scopeDepth + baseScopeDepth; -#if ENABLE(JIT) && ENABLE(LLINT) - m_rareData->m_exceptionHandlers[i].nativeCode = CodeLocationLabel(MacroAssemblerCodePtr::createFromExecutableAddress(LLInt::getCodePtr(llint_op_catch))); + m_rareData->m_exceptionHandlers[i].scopeDepth = nonLocalScopeDepth + handler.scopeDepth; +#if ENABLE(JIT) + m_rareData->m_exceptionHandlers[i].nativeCode = CodeLocationLabel(MacroAssemblerCodePtr::createFromExecutableAddress(LLInt::getCodePtr(op_catch))); #endif } } @@ -1732,84 +1596,71 @@ CodeBlock::CodeBlock(ScriptExecutable* ownerExecutable, UnlinkedCodeBlock* unlin } } - if (size_t count = unlinkedCodeBlock->numberOfImmediateSwitchJumpTables()) { - m_rareData->m_immediateSwitchJumpTables.grow(count); + if (size_t count = unlinkedCodeBlock->numberOfSwitchJumpTables()) { + m_rareData->m_switchJumpTables.grow(count); for (size_t i = 0; i < count; i++) { - UnlinkedSimpleJumpTable& sourceTable = unlinkedCodeBlock->immediateSwitchJumpTable(i); - SimpleJumpTable& destTable = m_rareData->m_immediateSwitchJumpTables[i]; + UnlinkedSimpleJumpTable& sourceTable = unlinkedCodeBlock->switchJumpTable(i); + SimpleJumpTable& destTable = m_rareData->m_switchJumpTables[i]; destTable.branchOffsets = sourceTable.branchOffsets; destTable.min = sourceTable.min; } } - - if (size_t count = unlinkedCodeBlock->numberOfCharacterSwitchJumpTables()) { - m_rareData->m_characterSwitchJumpTables.grow(count); - for (size_t i = 0; i < count; i++) { - UnlinkedSimpleJumpTable& sourceTable = unlinkedCodeBlock->characterSwitchJumpTable(i); - SimpleJumpTable& destTable = m_rareData->m_characterSwitchJumpTables[i]; - destTable.branchOffsets = sourceTable.branchOffsets; - destTable.min = sourceTable.min; - } - } - } + } // Allocate metadata buffers for the bytecode -#if ENABLE(LLINT) if (size_t size = unlinkedCodeBlock->numberOfLLintCallLinkInfos()) - m_llintCallLinkInfos.grow(size); -#endif -#if ENABLE(DFG_JIT) + m_llintCallLinkInfos.resizeToFit(size); if (size_t size = unlinkedCodeBlock->numberOfArrayProfiles()) m_arrayProfiles.grow(size); if (size_t size = unlinkedCodeBlock->numberOfArrayAllocationProfiles()) - m_arrayAllocationProfiles.grow(size); + m_arrayAllocationProfiles.resizeToFit(size); if (size_t size = unlinkedCodeBlock->numberOfValueProfiles()) - m_valueProfiles.grow(size); -#endif + m_valueProfiles.resizeToFit(size); if (size_t size = unlinkedCodeBlock->numberOfObjectAllocationProfiles()) - m_objectAllocationProfiles.grow(size); - if (size_t size = unlinkedCodeBlock->numberOfResolveOperations()) - m_resolveOperations.grow(size); - if (size_t putToBaseCount = unlinkedCodeBlock->numberOfPutToBaseOperations()) { - m_putToBaseOperations.reserveInitialCapacity(putToBaseCount); - for (size_t i = 0; i < putToBaseCount; ++i) - m_putToBaseOperations.uncheckedAppend(PutToBaseOperation(isStrictMode())); - } + m_objectAllocationProfiles.resizeToFit(size); // Copy and translate the UnlinkedInstructions - size_t instructionCount = unlinkedCodeBlock->instructions().size(); - UnlinkedInstruction* pc = unlinkedCodeBlock->instructions().data(); + unsigned instructionCount = unlinkedCodeBlock->instructions().count(); + UnlinkedInstructionStream::Reader instructionReader(unlinkedCodeBlock->instructions()); + Vector instructions(instructionCount); - for (size_t i = 0; i < unlinkedCodeBlock->instructions().size(); ) { - unsigned opLength = opcodeLength(pc[i].u.opcode); - instructions[i] = vm()->interpreter->getOpcode(pc[i].u.opcode); + for (unsigned i = 0; !instructionReader.atEnd(); ) { + const UnlinkedInstruction* pc = instructionReader.next(); + + unsigned opLength = opcodeLength(pc[0].u.opcode); + + instructions[i] = vm()->interpreter->getOpcode(pc[0].u.opcode); for (size_t j = 1; j < opLength; ++j) { if (sizeof(int32_t) != sizeof(intptr_t)) instructions[i + j].u.pointer = 0; - instructions[i + j].u.operand = pc[i + j].u.operand; + instructions[i + j].u.operand = pc[j].u.operand; } - switch (pc[i].u.opcode) { -#if ENABLE(DFG_JIT) + switch (pc[0].u.opcode) { + case op_call_varargs: + case op_construct_varargs: case op_get_by_val: case op_get_argument_by_val: { - int arrayProfileIndex = pc[i + opLength - 2].u.operand; + int arrayProfileIndex = pc[opLength - 2].u.operand; m_arrayProfiles[arrayProfileIndex] = ArrayProfile(i); instructions[i + opLength - 2] = &m_arrayProfiles[arrayProfileIndex]; - // fallthrough + FALLTHROUGH; } - case op_convert_this: - case op_get_by_id: - case op_call_put_result: - case op_get_callee: { - ValueProfile* profile = &m_valueProfiles[pc[i + opLength - 1].u.operand]; + case op_get_by_id: { + ValueProfile* profile = &m_valueProfiles[pc[opLength - 1].u.operand]; ASSERT(profile->m_bytecodeOffset == -1); profile->m_bytecodeOffset = i; instructions[i + opLength - 1] = profile; break; } case op_put_by_val: { - int arrayProfileIndex = pc[i + opLength - 1].u.operand; + int arrayProfileIndex = pc[opLength - 1].u.operand; + m_arrayProfiles[arrayProfileIndex] = ArrayProfile(i); + instructions[i + opLength - 1] = &m_arrayProfiles[arrayProfileIndex]; + break; + } + case op_put_by_val_direct: { + int arrayProfileIndex = pc[opLength - 1].u.operand; m_arrayProfiles[arrayProfileIndex] = ArrayProfile(i); instructions[i + opLength - 1] = &m_arrayProfiles[arrayProfileIndex]; break; @@ -1818,68 +1669,14 @@ CodeBlock::CodeBlock(ScriptExecutable* ownerExecutable, UnlinkedCodeBlock* unlin case op_new_array: case op_new_array_buffer: case op_new_array_with_size: { - int arrayAllocationProfileIndex = pc[i + opLength - 1].u.operand; + int arrayAllocationProfileIndex = pc[opLength - 1].u.operand; instructions[i + opLength - 1] = &m_arrayAllocationProfiles[arrayAllocationProfileIndex]; break; } -#endif - case op_resolve_base: - case op_resolve_base_to_global: - case op_resolve_base_to_global_dynamic: - case op_resolve_base_to_scope: - case op_resolve_base_to_scope_with_top_scope_check: { - instructions[i + 4].u.resolveOperations = &m_resolveOperations[pc[i + 4].u.operand]; - instructions[i + 5].u.putToBaseOperation = &m_putToBaseOperations[pc[i + 5].u.operand]; -#if ENABLE(DFG_JIT) - ValueProfile* profile = &m_valueProfiles[pc[i + opLength - 1].u.operand]; - ASSERT(profile->m_bytecodeOffset == -1); - profile->m_bytecodeOffset = i; - ASSERT((opLength - 1) > 5); - instructions[i + opLength - 1] = profile; -#endif - break; - } - case op_resolve_global_property: - case op_resolve_global_var: - case op_resolve_scoped_var: - case op_resolve_scoped_var_on_top_scope: - case op_resolve_scoped_var_with_top_scope_check: { - instructions[i + 3].u.resolveOperations = &m_resolveOperations[pc[i + 3].u.operand]; - break; - } - case op_put_to_base: - case op_put_to_base_variable: { - instructions[i + 4].u.putToBaseOperation = &m_putToBaseOperations[pc[i + 4].u.operand]; - break; - } - case op_resolve: { -#if ENABLE(DFG_JIT) - ValueProfile* profile = &m_valueProfiles[pc[i + opLength - 1].u.operand]; - ASSERT(profile->m_bytecodeOffset == -1); - profile->m_bytecodeOffset = i; - ASSERT((opLength - 1) > 3); - instructions[i + opLength - 1] = profile; -#endif - instructions[i + 3].u.resolveOperations = &m_resolveOperations[pc[i + 3].u.operand]; - break; - } - case op_resolve_with_base: - case op_resolve_with_this: { - instructions[i + 4].u.resolveOperations = &m_resolveOperations[pc[i + 4].u.operand]; - if (pc[i].u.opcode != op_resolve_with_this) - instructions[i + 5].u.putToBaseOperation = &m_putToBaseOperations[pc[i + 5].u.operand]; -#if ENABLE(DFG_JIT) - ValueProfile* profile = &m_valueProfiles[pc[i + opLength - 1].u.operand]; - ASSERT(profile->m_bytecodeOffset == -1); - profile->m_bytecodeOffset = i; - instructions[i + opLength - 1] = profile; -#endif - break; - } case op_new_object: { - int objectAllocationProfileIndex = pc[i + opLength - 1].u.operand; + int objectAllocationProfileIndex = pc[opLength - 1].u.operand; ObjectAllocationProfile* objectAllocationProfile = &m_objectAllocationProfiles[objectAllocationProfileIndex]; - int inferredInlineCapacity = pc[i + opLength - 2].u.operand; + int inferredInlineCapacity = pc[opLength - 2].u.operand; instructions[i + opLength - 1] = objectAllocationProfile; objectAllocationProfile->initialize(*vm(), @@ -1887,69 +1684,111 @@ CodeBlock::CodeBlock(ScriptExecutable* ownerExecutable, UnlinkedCodeBlock* unlin break; } - case op_get_scoped_var: { -#if ENABLE(DFG_JIT) - ValueProfile* profile = &m_valueProfiles[pc[i + opLength - 1].u.operand]; + case op_call: + case op_call_eval: { + ValueProfile* profile = &m_valueProfiles[pc[opLength - 1].u.operand]; ASSERT(profile->m_bytecodeOffset == -1); profile->m_bytecodeOffset = i; instructions[i + opLength - 1] = profile; -#endif - break; - } - - case op_call: - case op_call_eval: { -#if ENABLE(DFG_JIT) - int arrayProfileIndex = pc[i + opLength - 1].u.operand; + int arrayProfileIndex = pc[opLength - 2].u.operand; m_arrayProfiles[arrayProfileIndex] = ArrayProfile(i); - instructions[i + opLength - 1] = &m_arrayProfiles[arrayProfileIndex]; -#endif -#if ENABLE(LLINT) - instructions[i + 4] = &m_llintCallLinkInfos[pc[i + 4].u.operand]; -#endif + instructions[i + opLength - 2] = &m_arrayProfiles[arrayProfileIndex]; + instructions[i + 5] = &m_llintCallLinkInfos[pc[5].u.operand]; break; } - case op_construct: -#if ENABLE(LLINT) - instructions[i + 4] = &m_llintCallLinkInfos[pc[i + 4].u.operand]; -#endif + case op_construct: { + instructions[i + 5] = &m_llintCallLinkInfos[pc[5].u.operand]; + ValueProfile* profile = &m_valueProfiles[pc[opLength - 1].u.operand]; + ASSERT(profile->m_bytecodeOffset == -1); + profile->m_bytecodeOffset = i; + instructions[i + opLength - 1] = profile; break; + } case op_get_by_id_out_of_line: - case op_get_by_id_self: - case op_get_by_id_proto: - case op_get_by_id_chain: - case op_get_by_id_getter_self: - case op_get_by_id_getter_proto: - case op_get_by_id_getter_chain: - case op_get_by_id_custom_self: - case op_get_by_id_custom_proto: - case op_get_by_id_custom_chain: - case op_get_by_id_generic: case op_get_array_length: - case op_get_string_length: CRASH(); case op_init_global_const_nop: { ASSERT(codeType() == GlobalCode); - Identifier ident = identifier(pc[i + 4].u.operand); - SymbolTableEntry entry = globalObject->symbolTable()->get(ident.impl()); + Identifier ident = identifier(pc[4].u.operand); + SymbolTableEntry entry = m_globalObject->symbolTable()->get(ident.impl()); if (entry.isNull()) break; - if (entry.couldBeWatched()) { - instructions[i + 0] = vm()->interpreter->getOpcode(op_init_global_const_check); - instructions[i + 1] = &globalObject->registerAt(entry.getIndex()); - instructions[i + 3] = entry.addressOfIsWatched(); + instructions[i + 0] = vm()->interpreter->getOpcode(op_init_global_const); + instructions[i + 1] = &m_globalObject->registerAt(entry.getIndex()); + break; + } + + case op_resolve_scope: { + const Identifier& ident = identifier(pc[2].u.operand); + ResolveType type = static_cast(pc[3].u.operand); + + ResolveOp op = JSScope::abstractResolve(m_globalObject->globalExec(), scope, ident, Get, type); + instructions[i + 3].u.operand = op.type; + instructions[i + 4].u.operand = op.depth; + if (op.activation) + instructions[i + 5].u.activation.set(*vm(), ownerExecutable, op.activation); + break; + } + + case op_get_from_scope: { + ValueProfile* profile = &m_valueProfiles[pc[opLength - 1].u.operand]; + ASSERT(profile->m_bytecodeOffset == -1); + profile->m_bytecodeOffset = i; + instructions[i + opLength - 1] = profile; + + // get_from_scope dst, scope, id, ResolveModeAndType, Structure, Operand + const Identifier& ident = identifier(pc[3].u.operand); + ResolveModeAndType modeAndType = ResolveModeAndType(pc[4].u.operand); + ResolveOp op = JSScope::abstractResolve(m_globalObject->globalExec(), scope, ident, Get, modeAndType.type()); + + instructions[i + 4].u.operand = ResolveModeAndType(modeAndType.mode(), op.type).operand(); + if (op.type == GlobalVar || op.type == GlobalVarWithVarInjectionChecks) + instructions[i + 5].u.watchpointSet = op.watchpointSet; + else if (op.structure) + instructions[i + 5].u.structure.set(*vm(), ownerExecutable, op.structure); + instructions[i + 6].u.pointer = reinterpret_cast(op.operand); + break; + } + + case op_put_to_scope: { + // put_to_scope scope, id, value, ResolveModeAndType, Structure, Operand + const Identifier& ident = identifier(pc[2].u.operand); + ResolveModeAndType modeAndType = ResolveModeAndType(pc[4].u.operand); + ResolveOp op = JSScope::abstractResolve(m_globalObject->globalExec(), scope, ident, Put, modeAndType.type()); + + instructions[i + 4].u.operand = ResolveModeAndType(modeAndType.mode(), op.type).operand(); + if (op.type == GlobalVar || op.type == GlobalVarWithVarInjectionChecks) + instructions[i + 5].u.watchpointSet = op.watchpointSet; + else if (op.type == ClosureVar || op.type == ClosureVarWithVarInjectionChecks) { + if (op.watchpointSet) + op.watchpointSet->invalidate(); + } else if (op.structure) + instructions[i + 5].u.structure.set(*vm(), ownerExecutable, op.structure); + instructions[i + 6].u.pointer = reinterpret_cast(op.operand); + break; + } + + case op_captured_mov: + case op_new_captured_func: { + if (pc[3].u.index == UINT_MAX) { + instructions[i + 3].u.watchpointSet = 0; break; } - - instructions[i + 0] = vm()->interpreter->getOpcode(op_init_global_const); - instructions[i + 1] = &globalObject->registerAt(entry.getIndex()); + StringImpl* uid = identifier(pc[3].u.index).impl(); + RELEASE_ASSERT(didCloneSymbolTable); + ConcurrentJITLocker locker(m_symbolTable->m_lock); + SymbolTable::Map::iterator iter = m_symbolTable->find(locker, uid); + ASSERT(iter != m_symbolTable->end(locker)); + iter->value.prepareToWatch(symbolTable()); + instructions[i + 3].u.watchpointSet = iter->value.watchpointSet(); break; } case op_debug: { - instructions[i + 4] = columnNumberForBytecodeOffset(i); + if (pc[1].u.index == DidReachBreakpoint) + m_hasDebuggerStatement = true; break; } @@ -1966,9 +1805,16 @@ CodeBlock::CodeBlock(ScriptExecutable* ownerExecutable, UnlinkedCodeBlock* unlin optimizeAfterWarmUp(); jitAfterWarmUp(); + // If the concurrent thread will want the code block's hash, then compute it here + // synchronously. + if (Options::alwaysComputeHash()) + hash(); + if (Options::dumpGeneratedBytecodes()) dumpBytecode(); - m_vm->finishedCompiling(this); + + m_heap->m_codeBlocks.add(this); + m_heap->reportExtraMemoryCost(sizeof(CodeBlock) + m_instructions.size() * sizeof(Instruction)); } CodeBlock::~CodeBlock() @@ -1976,20 +1822,11 @@ CodeBlock::~CodeBlock() if (m_vm->m_perBytecodeProfiler) m_vm->m_perBytecodeProfiler->notifyDestruction(this); -#if ENABLE(DFG_JIT) - // Remove myself from the set of DFG code blocks. Note that I may not be in this set - // (because I'm not a DFG code block), in which case this is a no-op anyway. - m_vm->heap.m_dfgCodeBlocks.m_set.remove(this); -#endif - #if ENABLE(VERBOSE_VALUE_PROFILE) dumpValueProfiles(); #endif - -#if ENABLE(LLINT) while (m_incomingLLIntCalls.begin() != m_incomingLLIntCalls.end()) m_incomingLLIntCalls.begin()->remove(); -#endif // ENABLE(LLINT) #if ENABLE(JIT) // We may be destroyed before any CodeBlocks that refer to us are destroyed. // Consider that two CodeBlocks become unreachable at the same time. There @@ -2004,66 +1841,16 @@ CodeBlock::~CodeBlock() // m_incomingCalls linked lists through the execution of the ~CallLinkInfo // destructors. - for (size_t size = m_structureStubInfos.size(), i = 0; i < size; ++i) - m_structureStubInfos[i].deref(); + for (Bag::iterator iter = m_stubInfos.begin(); !!iter; ++iter) + (*iter)->deref(); #endif // ENABLE(JIT) - -#if DUMP_CODE_BLOCK_STATISTICS - liveCodeBlockSet.remove(this); -#endif } void CodeBlock::setNumParameters(int newValue) { m_numParameters = newValue; -#if ENABLE(VALUE_PROFILER) m_argumentValueProfiles.resizeToFit(newValue); -#endif -} - -void CodeBlock::visitStructures(SlotVisitor& visitor, Instruction* vPC) -{ - Interpreter* interpreter = m_vm->interpreter; - - if (vPC[0].u.opcode == interpreter->getOpcode(op_get_by_id) && vPC[4].u.structure) { - visitor.append(&vPC[4].u.structure); - return; - } - - if (vPC[0].u.opcode == interpreter->getOpcode(op_get_by_id_self) || vPC[0].u.opcode == interpreter->getOpcode(op_get_by_id_getter_self) || vPC[0].u.opcode == interpreter->getOpcode(op_get_by_id_custom_self)) { - visitor.append(&vPC[4].u.structure); - return; - } - if (vPC[0].u.opcode == interpreter->getOpcode(op_get_by_id_proto) || vPC[0].u.opcode == interpreter->getOpcode(op_get_by_id_getter_proto) || vPC[0].u.opcode == interpreter->getOpcode(op_get_by_id_custom_proto)) { - visitor.append(&vPC[4].u.structure); - visitor.append(&vPC[5].u.structure); - return; - } - if (vPC[0].u.opcode == interpreter->getOpcode(op_get_by_id_chain) || vPC[0].u.opcode == interpreter->getOpcode(op_get_by_id_getter_chain) || vPC[0].u.opcode == interpreter->getOpcode(op_get_by_id_custom_chain)) { - visitor.append(&vPC[4].u.structure); - if (vPC[5].u.structureChain) - visitor.append(&vPC[5].u.structureChain); - return; - } - if (vPC[0].u.opcode == interpreter->getOpcode(op_put_by_id_transition)) { - visitor.append(&vPC[4].u.structure); - visitor.append(&vPC[5].u.structure); - if (vPC[6].u.structureChain) - visitor.append(&vPC[6].u.structureChain); - return; - } - if (vPC[0].u.opcode == interpreter->getOpcode(op_put_by_id) && vPC[4].u.structure) { - visitor.append(&vPC[4].u.structure); - return; - } - if (vPC[0].u.opcode == interpreter->getOpcode(op_put_by_id_replace)) { - visitor.append(&vPC[4].u.structure); - return; - } - - // These instructions don't ref their Structures. - ASSERT(vPC[0].u.opcode == interpreter->getOpcode(op_get_by_id) || vPC[0].u.opcode == interpreter->getOpcode(op_put_by_id) || vPC[0].u.opcode == interpreter->getOpcode(op_get_by_id_generic) || vPC[0].u.opcode == interpreter->getOpcode(op_put_by_id_generic) || vPC[0].u.opcode == interpreter->getOpcode(op_get_array_length) || vPC[0].u.opcode == interpreter->getOpcode(op_get_string_length)); } void EvalCodeCache::visitAggregate(SlotVisitor& visitor) @@ -2073,36 +1860,60 @@ void EvalCodeCache::visitAggregate(SlotVisitor& visitor) visitor.append(&ptr->value); } +CodeBlock* CodeBlock::specialOSREntryBlockOrNull() +{ +#if ENABLE(FTL_JIT) + if (jitType() != JITCode::DFGJIT) + return 0; + DFG::JITCode* jitCode = m_jitCode->dfg(); + return jitCode->osrEntryBlock.get(); +#else // ENABLE(FTL_JIT) + return 0; +#endif // ENABLE(FTL_JIT) +} + void CodeBlock::visitAggregate(SlotVisitor& visitor) { -#if ENABLE(PARALLEL_GC) && ENABLE(DFG_JIT) - if (!!m_dfgData) { - // I may be asked to scan myself more than once, and it may even happen concurrently. - // To this end, use a CAS loop to check if I've been called already. Only one thread - // may proceed past this point - whichever one wins the CAS race. - unsigned oldValue; - do { - oldValue = m_dfgData->visitAggregateHasBeenCalled; - if (oldValue) { - // Looks like someone else won! Return immediately to ensure that we don't - // trace the same CodeBlock concurrently. Doing so is hazardous since we will - // be mutating the state of ValueProfiles, which contain JSValues, which can - // have word-tearing on 32-bit, leading to awesome timing-dependent crashes - // that are nearly impossible to track down. - - // Also note that it must be safe to return early as soon as we see the - // value true (well, (unsigned)1), since once a GC thread is in this method - // and has won the CAS race (i.e. was responsible for setting the value true) - // it will definitely complete the rest of this method before declaring - // termination. - return; - } - } while (!WTF::weakCompareAndSwap(&m_dfgData->visitAggregateHasBeenCalled, 0, 1)); - } -#endif // ENABLE(PARALLEL_GC) && ENABLE(DFG_JIT) +#if ENABLE(PARALLEL_GC) + // I may be asked to scan myself more than once, and it may even happen concurrently. + // To this end, use a CAS loop to check if I've been called already. Only one thread + // may proceed past this point - whichever one wins the CAS race. + unsigned oldValue; + do { + oldValue = m_visitAggregateHasBeenCalled; + if (oldValue) { + // Looks like someone else won! Return immediately to ensure that we don't + // trace the same CodeBlock concurrently. Doing so is hazardous since we will + // be mutating the state of ValueProfiles, which contain JSValues, which can + // have word-tearing on 32-bit, leading to awesome timing-dependent crashes + // that are nearly impossible to track down. + + // Also note that it must be safe to return early as soon as we see the + // value true (well, (unsigned)1), since once a GC thread is in this method + // and has won the CAS race (i.e. was responsible for setting the value true) + // it will definitely complete the rest of this method before declaring + // termination. + return; + } + } while (!WTF::weakCompareAndSwap(&m_visitAggregateHasBeenCalled, 0, 1)); +#endif // ENABLE(PARALLEL_GC) if (!!m_alternative) m_alternative->visitAggregate(visitor); + + if (CodeBlock* otherBlock = specialOSREntryBlockOrNull()) + otherBlock->visitAggregate(visitor); + + visitor.reportExtraMemoryUsage(ownerExecutable(), sizeof(CodeBlock)); + if (m_jitCode) + visitor.reportExtraMemoryUsage(ownerExecutable(), m_jitCode->size()); + if (m_instructions.size()) { + // Divide by refCount() because m_instructions points to something that is shared + // by multiple CodeBlocks, and we only want to count it towards the heap size once. + // Having each CodeBlock report only its proportional share of the size is one way + // of accomplishing this. + visitor.reportExtraMemoryUsage(ownerExecutable(), m_instructions.size() * sizeof(Instruction) / m_instructions.refCount()); + } visitor.append(&m_unlinkedCode); @@ -2112,13 +1923,21 @@ void CodeBlock::visitAggregate(SlotVisitor& visitor) // and when it runs, it figures out whether it has any work to do. visitor.addUnconditionalFinalizer(this); + m_allTransitionsHaveBeenMarked = false; + if (shouldImmediatelyAssumeLivenessDuringScan()) { // This code block is live, so scan all references strongly and return. stronglyVisitStrongReferences(visitor); stronglyVisitWeakReferences(visitor); + propagateTransitions(visitor); return; } + // There are two things that we use weak reference harvesters for: DFG fixpoint for + // jettisoning, and trying to find structures that would be live based on some + // inline cache. So it makes sense to register them regardless. + visitor.addWeakReferenceHarvester(this); + #if ENABLE(DFG_JIT) // We get here if we're live in the sense that our owner executable is live, // but we're not yet live for sure in another sense: we may yet decide that this @@ -2129,34 +1948,138 @@ void CodeBlock::visitAggregate(SlotVisitor& visitor) // other reasons, that this iteration should run again; it will notify us of this // decision by calling harvestWeakReferences(). - m_dfgData->livenessHasBeenProved = false; - m_dfgData->allTransitionsHaveBeenMarked = false; - - performTracingFixpointIteration(visitor); - - // GC doesn't have enough information yet for us to decide whether to keep our DFG - // data, so we need to register a handler to run again at the end of GC, when more - // information is available. - if (!(m_dfgData->livenessHasBeenProved && m_dfgData->allTransitionsHaveBeenMarked)) - visitor.addWeakReferenceHarvester(this); + m_jitCode->dfgCommon()->livenessHasBeenProved = false; + propagateTransitions(visitor); + determineLiveness(visitor); #else // ENABLE(DFG_JIT) RELEASE_ASSERT_NOT_REACHED(); #endif // ENABLE(DFG_JIT) } -void CodeBlock::performTracingFixpointIteration(SlotVisitor& visitor) +bool CodeBlock::shouldImmediatelyAssumeLivenessDuringScan() +{ +#if ENABLE(DFG_JIT) + // Interpreter and Baseline JIT CodeBlocks don't need to be jettisoned when + // their weak references go stale. So if a basline JIT CodeBlock gets + // scanned, we can assume that this means that it's live. + if (!JITCode::isOptimizingJIT(jitType())) + return true; + + // For simplicity, we don't attempt to jettison code blocks during GC if + // they are executing. Instead we strongly mark their weak references to + // allow them to continue to execute soundly. + if (m_mayBeExecuting) + return true; + + if (Options::forceDFGCodeBlockLiveness()) + return true; + + return false; +#else + return true; +#endif +} + +bool CodeBlock::isKnownToBeLiveDuringGC() +{ +#if ENABLE(DFG_JIT) + // This should return true for: + // - Code blocks that behave like normal objects - i.e. if they are referenced then they + // are live. + // - Code blocks that were running on the stack. + // - Code blocks that survived the last GC if the current GC is an Eden GC. This is + // because either livenessHasBeenProved would have survived as true or m_mayBeExecuting + // would survive as true. + // - Code blocks that don't have any dead weak references. + + return shouldImmediatelyAssumeLivenessDuringScan() + || m_jitCode->dfgCommon()->livenessHasBeenProved; +#else + return true; +#endif +} + +void CodeBlock::propagateTransitions(SlotVisitor& visitor) { UNUSED_PARAM(visitor); + + if (m_allTransitionsHaveBeenMarked) + return; + + bool allAreMarkedSoFar = true; + + Interpreter* interpreter = m_vm->interpreter; + if (jitType() == JITCode::InterpreterThunk) { + const Vector& propertyAccessInstructions = m_unlinkedCode->propertyAccessInstructions(); + for (size_t i = 0; i < propertyAccessInstructions.size(); ++i) { + Instruction* instruction = &instructions()[propertyAccessInstructions[i]]; + switch (interpreter->getOpcodeID(instruction[0].u.opcode)) { + case op_put_by_id_transition_direct: + case op_put_by_id_transition_normal: + case op_put_by_id_transition_direct_out_of_line: + case op_put_by_id_transition_normal_out_of_line: { + if (Heap::isMarked(instruction[4].u.structure.get())) + visitor.append(&instruction[6].u.structure); + else + allAreMarkedSoFar = false; + break; + } + default: + break; + } + } + } + +#if ENABLE(JIT) + if (JITCode::isJIT(jitType())) { + for (Bag::iterator iter = m_stubInfos.begin(); !!iter; ++iter) { + StructureStubInfo& stubInfo = **iter; + switch (stubInfo.accessType) { + case access_put_by_id_transition_normal: + case access_put_by_id_transition_direct: { + JSCell* origin = stubInfo.codeOrigin.codeOriginOwner(); + if ((!origin || Heap::isMarked(origin)) + && Heap::isMarked(stubInfo.u.putByIdTransition.previousStructure.get())) + visitor.append(&stubInfo.u.putByIdTransition.structure); + else + allAreMarkedSoFar = false; + break; + } + + case access_put_by_id_list: { + PolymorphicPutByIdList* list = stubInfo.u.putByIdList.list; + JSCell* origin = stubInfo.codeOrigin.codeOriginOwner(); + if (origin && !Heap::isMarked(origin)) { + allAreMarkedSoFar = false; + break; + } + for (unsigned j = list->size(); j--;) { + PutByIdAccess& access = list->m_list[j]; + if (!access.isTransition()) + continue; + if (Heap::isMarked(access.oldStructure())) + visitor.append(&access.m_newStructure); + else + allAreMarkedSoFar = false; + } + break; + } + + default: + break; + } + } + } +#endif // ENABLE(JIT) #if ENABLE(DFG_JIT) - // Evaluate our weak reference transitions, if there are still some to evaluate. - if (!m_dfgData->allTransitionsHaveBeenMarked) { - bool allAreMarkedSoFar = true; - for (unsigned i = 0; i < m_dfgData->transitions.size(); ++i) { - if ((!m_dfgData->transitions[i].m_codeOrigin - || Heap::isMarked(m_dfgData->transitions[i].m_codeOrigin.get())) - && Heap::isMarked(m_dfgData->transitions[i].m_from.get())) { + if (JITCode::isOptimizingJIT(jitType())) { + DFG::CommonData* dfgCommon = m_jitCode->dfgCommon(); + for (unsigned i = 0; i < dfgCommon->transitions.size(); ++i) { + if ((!dfgCommon->transitions[i].m_codeOrigin + || Heap::isMarked(dfgCommon->transitions[i].m_codeOrigin.get())) + && Heap::isMarked(dfgCommon->transitions[i].m_from.get())) { // If the following three things are live, then the target of the // transition is also live: // - This code block. We know it's live already because otherwise @@ -2168,25 +2091,36 @@ void CodeBlock::performTracingFixpointIteration(SlotVisitor& visitor) // - The source of the transition. The transition checks if some // heap location holds the source, and if so, stores the target. // Hence the source must be live for the transition to be live. - visitor.append(&m_dfgData->transitions[i].m_to); + visitor.append(&dfgCommon->transitions[i].m_to); } else allAreMarkedSoFar = false; } - - if (allAreMarkedSoFar) - m_dfgData->allTransitionsHaveBeenMarked = true; } +#endif // ENABLE(DFG_JIT) + + if (allAreMarkedSoFar) + m_allTransitionsHaveBeenMarked = true; +} + +void CodeBlock::determineLiveness(SlotVisitor& visitor) +{ + UNUSED_PARAM(visitor); + if (shouldImmediatelyAssumeLivenessDuringScan()) + return; + +#if ENABLE(DFG_JIT) // Check if we have any remaining work to do. - if (m_dfgData->livenessHasBeenProved) + DFG::CommonData* dfgCommon = m_jitCode->dfgCommon(); + if (dfgCommon->livenessHasBeenProved) return; // Now check all of our weak references. If all of them are live, then we // have proved liveness and so we scan our strong references. If at end of // GC we still have not proved liveness, then this code block is toast. bool allAreLiveSoFar = true; - for (unsigned i = 0; i < m_dfgData->weakReferences.size(); ++i) { - if (!Heap::isMarked(m_dfgData->weakReferences[i].get())) { + for (unsigned i = 0; i < dfgCommon->weakReferences.size(); ++i) { + if (!Heap::isMarked(dfgCommon->weakReferences[i].get())) { allAreLiveSoFar = false; break; } @@ -2199,27 +2133,21 @@ void CodeBlock::performTracingFixpointIteration(SlotVisitor& visitor) // All weak references are live. Record this information so we don't // come back here again, and scan the strong references. - m_dfgData->livenessHasBeenProved = true; + dfgCommon->livenessHasBeenProved = true; stronglyVisitStrongReferences(visitor); #endif // ENABLE(DFG_JIT) } void CodeBlock::visitWeakReferences(SlotVisitor& visitor) { - performTracingFixpointIteration(visitor); + propagateTransitions(visitor); + determineLiveness(visitor); } -#if ENABLE(JIT_VERBOSE_OSR) -static const bool verboseUnlinking = true; -#else -static const bool verboseUnlinking = false; -#endif - void CodeBlock::finalizeUnconditionally() { -#if ENABLE(LLINT) Interpreter* interpreter = m_vm->interpreter; - if (!!numberOfInstructions()) { + if (JITCode::couldBeInterpreted(jitType())) { const Vector& propertyAccessInstructions = m_unlinkedCode->propertyAccessInstructions(); for (size_t size = propertyAccessInstructions.size(), i = 0; i < size; ++i) { Instruction* curInstruction = &instructions()[propertyAccessInstructions[i]]; @@ -2230,7 +2158,7 @@ void CodeBlock::finalizeUnconditionally() case op_put_by_id_out_of_line: if (!curInstruction[4].u.structure || Heap::isMarked(curInstruction[4].u.structure.get())) break; - if (verboseUnlinking) + if (Options::verboseOSR()) dataLogF("Clearing LLInt property access with structure %p.\n", curInstruction[4].u.structure.get()); curInstruction[4].u.structure.clear(); curInstruction[5].u.operand = 0; @@ -2243,7 +2171,7 @@ void CodeBlock::finalizeUnconditionally() && Heap::isMarked(curInstruction[6].u.structure.get()) && Heap::isMarked(curInstruction[7].u.structureChain.get())) break; - if (verboseUnlinking) { + if (Options::verboseOSR()) { dataLogF("Clearing LLInt put transition with structures %p -> %p, chain %p.\n", curInstruction[4].u.structure.get(), curInstruction[6].u.structure.get(), @@ -2256,6 +2184,43 @@ void CodeBlock::finalizeUnconditionally() break; case op_get_array_length: break; + case op_to_this: + if (!curInstruction[2].u.structure || Heap::isMarked(curInstruction[2].u.structure.get())) + break; + if (Options::verboseOSR()) + dataLogF("Clearing LLInt to_this with structure %p.\n", curInstruction[2].u.structure.get()); + curInstruction[2].u.structure.clear(); + break; + case op_get_callee: + if (!curInstruction[2].u.jsCell || Heap::isMarked(curInstruction[2].u.jsCell.get())) + break; + if (Options::verboseOSR()) + dataLogF("Clearing LLInt get callee with function %p.\n", curInstruction[2].u.jsCell.get()); + curInstruction[2].u.jsCell.clear(); + break; + case op_resolve_scope: { + WriteBarrierBase& activation = curInstruction[5].u.activation; + if (!activation || Heap::isMarked(activation.get())) + break; + if (Options::verboseOSR()) + dataLogF("Clearing dead activation %p.\n", activation.get()); + activation.clear(); + break; + } + case op_get_from_scope: + case op_put_to_scope: { + ResolveModeAndType modeAndType = + ResolveModeAndType(curInstruction[4].u.operand); + if (modeAndType.type() == GlobalVar || modeAndType.type() == GlobalVarWithVarInjectionChecks) + continue; + WriteBarrierBase& structure = curInstruction[5].u.structure; + if (!structure || Heap::isMarked(structure.get())) + break; + if (Options::verboseOSR()) + dataLogF("Clearing scope access with structure %p.\n", structure.get()); + structure.clear(); + break; + } default: RELEASE_ASSERT_NOT_REACHED(); } @@ -2263,7 +2228,7 @@ void CodeBlock::finalizeUnconditionally() for (unsigned i = 0; i < m_llintCallLinkInfos.size(); ++i) { if (m_llintCallLinkInfos[i].isLinked() && !Heap::isMarked(m_llintCallLinkInfos[i].callee.get())) { - if (verboseUnlinking) + if (Options::verboseOSR()) dataLog("Clearing LLInt call from ", *this, "\n"); m_llintCallLinkInfos[i].unlink(); } @@ -2271,97 +2236,50 @@ void CodeBlock::finalizeUnconditionally() m_llintCallLinkInfos[i].lastSeenCallee.clear(); } } -#endif // ENABLE(LLINT) #if ENABLE(DFG_JIT) // Check if we're not live. If we are, then jettison. - if (!(shouldImmediatelyAssumeLivenessDuringScan() || m_dfgData->livenessHasBeenProved)) { - if (verboseUnlinking) + if (!isKnownToBeLiveDuringGC()) { + if (Options::verboseOSR()) dataLog(*this, " has dead weak references, jettisoning during GC.\n"); if (DFG::shouldShowDisassembly()) { dataLog(*this, " will be jettisoned because of the following dead references:\n"); - for (unsigned i = 0; i < m_dfgData->transitions.size(); ++i) { - WeakReferenceTransition& transition = m_dfgData->transitions[i]; + DFG::CommonData* dfgCommon = m_jitCode->dfgCommon(); + for (unsigned i = 0; i < dfgCommon->transitions.size(); ++i) { + DFG::WeakReferenceTransition& transition = dfgCommon->transitions[i]; JSCell* origin = transition.m_codeOrigin.get(); JSCell* from = transition.m_from.get(); JSCell* to = transition.m_to.get(); if ((!origin || Heap::isMarked(origin)) && Heap::isMarked(from)) continue; - dataLog(" Transition under ", JSValue(origin), ", ", JSValue(from), " -> ", JSValue(to), ".\n"); + dataLog(" Transition under ", RawPointer(origin), ", ", RawPointer(from), " -> ", RawPointer(to), ".\n"); } - for (unsigned i = 0; i < m_dfgData->weakReferences.size(); ++i) { - JSCell* weak = m_dfgData->weakReferences[i].get(); + for (unsigned i = 0; i < dfgCommon->weakReferences.size(); ++i) { + JSCell* weak = dfgCommon->weakReferences[i].get(); if (Heap::isMarked(weak)) continue; - dataLog(" Weak reference ", JSValue(weak), ".\n"); + dataLog(" Weak reference ", RawPointer(weak), ".\n"); } } - jettison(); + jettison(Profiler::JettisonDueToWeakReference); return; } #endif // ENABLE(DFG_JIT) - for (size_t size = m_putToBaseOperations.size(), i = 0; i < size; ++i) { - if (m_putToBaseOperations[i].m_structure && !Heap::isMarked(m_putToBaseOperations[i].m_structure.get())) { - if (verboseUnlinking) - dataLog("Clearing putToBase info in ", *this, "\n"); - m_putToBaseOperations[i].m_structure.clear(); - } - } - for (size_t size = m_resolveOperations.size(), i = 0; i < size; ++i) { - if (m_resolveOperations[i].isEmpty()) - continue; -#ifndef NDEBUG - for (size_t insnSize = m_resolveOperations[i].size() - 1, k = 0; k < insnSize; ++k) - ASSERT(!m_resolveOperations[i][k].m_structure); -#endif - m_resolveOperations[i].last().m_structure.clear(); - if (m_resolveOperations[i].last().m_structure && !Heap::isMarked(m_resolveOperations[i].last().m_structure.get())) { - if (verboseUnlinking) - dataLog("Clearing resolve info in ", *this, "\n"); - m_resolveOperations[i].last().m_structure.clear(); - } - } - #if ENABLE(JIT) // Handle inline caches. - if (!!getJITCode()) { + if (!!jitCode()) { RepatchBuffer repatchBuffer(this); - for (unsigned i = 0; i < numberOfCallLinkInfos(); ++i) { - if (callLinkInfo(i).isLinked()) { - if (ClosureCallStubRoutine* stub = callLinkInfo(i).stub.get()) { - if (!Heap::isMarked(stub->structure()) - || !Heap::isMarked(stub->executable())) { - if (verboseUnlinking) { - dataLog( - "Clearing closure call from ", *this, " to ", - stub->executable()->hashFor(callLinkInfo(i).specializationKind()), - ", stub routine ", RawPointer(stub), ".\n"); - } - callLinkInfo(i).unlink(*m_vm, repatchBuffer); - } - } else if (!Heap::isMarked(callLinkInfo(i).callee.get())) { - if (verboseUnlinking) { - dataLog( - "Clearing call from ", *this, " to ", - RawPointer(callLinkInfo(i).callee.get()), " (", - callLinkInfo(i).callee.get()->executable()->hashFor( - callLinkInfo(i).specializationKind()), - ").\n"); - } - callLinkInfo(i).unlink(*m_vm, repatchBuffer); - } - } - if (!!callLinkInfo(i).lastSeenCallee - && !Heap::isMarked(callLinkInfo(i).lastSeenCallee.get())) - callLinkInfo(i).lastSeenCallee.clear(); - } - for (size_t size = m_structureStubInfos.size(), i = 0; i < size; ++i) { - StructureStubInfo& stubInfo = m_structureStubInfos[i]; + + for (auto iter = callLinkInfosBegin(); !!iter; ++iter) + (*iter)->visitWeak(repatchBuffer); + + for (Bag::iterator iter = m_stubInfos.begin(); !!iter; ++iter) { + StructureStubInfo& stubInfo = **iter; - if (stubInfo.visitWeakReferences()) + if (stubInfo.visitWeakReferences(repatchBuffer)) continue; resetStubDuringGCInternal(repatchBuffer, stubInfo); @@ -2370,12 +2288,56 @@ void CodeBlock::finalizeUnconditionally() #endif } +void CodeBlock::getStubInfoMap(const ConcurrentJITLocker&, StubInfoMap& result) +{ +#if ENABLE(JIT) + toHashMap(m_stubInfos, getStructureStubInfoCodeOrigin, result); +#else + UNUSED_PARAM(result); +#endif +} + +void CodeBlock::getStubInfoMap(StubInfoMap& result) +{ + ConcurrentJITLocker locker(m_lock); + getStubInfoMap(locker, result); +} + +void CodeBlock::getCallLinkInfoMap(const ConcurrentJITLocker&, CallLinkInfoMap& result) +{ +#if ENABLE(JIT) + toHashMap(m_callLinkInfos, getCallLinkInfoCodeOrigin, result); +#else + UNUSED_PARAM(result); +#endif +} + +void CodeBlock::getCallLinkInfoMap(CallLinkInfoMap& result) +{ + ConcurrentJITLocker locker(m_lock); + getCallLinkInfoMap(locker, result); +} + #if ENABLE(JIT) +StructureStubInfo* CodeBlock::addStubInfo() +{ + ConcurrentJITLocker locker(m_lock); + return m_stubInfos.add(); +} + +CallLinkInfo* CodeBlock::addCallLinkInfo() +{ + ConcurrentJITLocker locker(m_lock); + return m_callLinkInfos.add(); +} + void CodeBlock::resetStub(StructureStubInfo& stubInfo) { if (stubInfo.accessType == access_unset) return; + ConcurrentJITLocker locker(m_lock); + RepatchBuffer repatchBuffer(this); resetStubInternal(repatchBuffer, stubInfo); } @@ -2384,20 +2346,21 @@ void CodeBlock::resetStubInternal(RepatchBuffer& repatchBuffer, StructureStubInf { AccessType accessType = static_cast(stubInfo.accessType); - if (verboseUnlinking) - dataLog("Clearing structure cache (kind ", static_cast(stubInfo.accessType), ") in ", *this, ".\n"); + if (Options::verboseOSR()) { + // This can be called from GC destructor calls, so we don't try to do a full dump + // of the CodeBlock. + dataLog("Clearing structure cache (kind ", static_cast(stubInfo.accessType), ") in ", RawPointer(this), ".\n"); + } - if (isGetByIdAccess(accessType)) { - if (getJITCode().jitType() == JITCode::DFGJIT) - DFG::dfgResetGetByID(repatchBuffer, stubInfo); - else - JIT::resetPatchGetById(repatchBuffer, &stubInfo); - } else { - ASSERT(isPutByIdAccess(accessType)); - if (getJITCode().jitType() == JITCode::DFGJIT) - DFG::dfgResetPutByID(repatchBuffer, stubInfo); - else - JIT::resetPatchPutById(repatchBuffer, &stubInfo); + RELEASE_ASSERT(JITCode::isJIT(jitType())); + + if (isGetByIdAccess(accessType)) + resetGetByID(repatchBuffer, stubInfo); + else if (isPutByIdAccess(accessType)) + resetPutByID(repatchBuffer, stubInfo); + else { + RELEASE_ASSERT(isInAccess(accessType)); + resetIn(repatchBuffer, stubInfo); } stubInfo.reset(); @@ -2408,12 +2371,22 @@ void CodeBlock::resetStubDuringGCInternal(RepatchBuffer& repatchBuffer, Structur resetStubInternal(repatchBuffer, stubInfo); stubInfo.resetByGC = true; } + +CallLinkInfo* CodeBlock::getCallLinkInfoForBytecodeIndex(unsigned index) +{ + for (auto iter = m_callLinkInfos.begin(); !!iter; ++iter) { + if ((*iter)->codeOrigin == CodeOrigin(index)) + return *iter; + } + return nullptr; +} #endif void CodeBlock::stronglyVisitStrongReferences(SlotVisitor& visitor) { visitor.append(&m_globalObject); visitor.append(&m_ownerExecutable); + visitor.append(&m_symbolTable); visitor.append(&m_unlinkedCode); if (m_rareData) m_rareData->m_evalCodeCache.visitAggregate(visitor); @@ -2425,7 +2398,15 @@ void CodeBlock::stronglyVisitStrongReferences(SlotVisitor& visitor) for (unsigned i = 0; i < m_objectAllocationProfiles.size(); ++i) m_objectAllocationProfiles[i].visitAggregate(visitor); - updateAllPredictions(Collection); +#if ENABLE(DFG_JIT) + if (JITCode::isOptimizingJIT(jitType())) { + DFG::CommonData* dfgCommon = m_jitCode->dfgCommon(); + if (dfgCommon->inlineCallFrames.get()) + dfgCommon->inlineCallFrames->visitAggregate(visitor); + } +#endif + + updateAllPredictions(); } void CodeBlock::stronglyVisitWeakReferences(SlotVisitor& visitor) @@ -2433,21 +2414,125 @@ void CodeBlock::stronglyVisitWeakReferences(SlotVisitor& visitor) UNUSED_PARAM(visitor); #if ENABLE(DFG_JIT) - if (!m_dfgData) + if (!JITCode::isOptimizingJIT(jitType())) return; + + DFG::CommonData* dfgCommon = m_jitCode->dfgCommon(); - for (unsigned i = 0; i < m_dfgData->transitions.size(); ++i) { - if (!!m_dfgData->transitions[i].m_codeOrigin) - visitor.append(&m_dfgData->transitions[i].m_codeOrigin); // Almost certainly not necessary, since the code origin should also be a weak reference. Better to be safe, though. - visitor.append(&m_dfgData->transitions[i].m_from); - visitor.append(&m_dfgData->transitions[i].m_to); + for (unsigned i = 0; i < dfgCommon->transitions.size(); ++i) { + if (!!dfgCommon->transitions[i].m_codeOrigin) + visitor.append(&dfgCommon->transitions[i].m_codeOrigin); // Almost certainly not necessary, since the code origin should also be a weak reference. Better to be safe, though. + visitor.append(&dfgCommon->transitions[i].m_from); + visitor.append(&dfgCommon->transitions[i].m_to); } - for (unsigned i = 0; i < m_dfgData->weakReferences.size(); ++i) - visitor.append(&m_dfgData->weakReferences[i]); + for (unsigned i = 0; i < dfgCommon->weakReferences.size(); ++i) + visitor.append(&dfgCommon->weakReferences[i]); #endif } +CodeBlock* CodeBlock::baselineAlternative() +{ +#if ENABLE(JIT) + CodeBlock* result = this; + while (result->alternative()) + result = result->alternative(); + RELEASE_ASSERT(result); + RELEASE_ASSERT(JITCode::isBaselineCode(result->jitType()) || result->jitType() == JITCode::None); + return result; +#else + return this; +#endif +} + +CodeBlock* CodeBlock::baselineVersion() +{ +#if ENABLE(JIT) + if (JITCode::isBaselineCode(jitType())) + return this; + CodeBlock* result = replacement(); + if (!result) { + // This can happen if we're creating the original CodeBlock for an executable. + // Assume that we're the baseline CodeBlock. + RELEASE_ASSERT(jitType() == JITCode::None); + return this; + } + result = result->baselineAlternative(); + return result; +#else + return this; +#endif +} + +#if ENABLE(JIT) +bool CodeBlock::hasOptimizedReplacement(JITCode::JITType typeToReplace) +{ + return JITCode::isHigherTier(replacement()->jitType(), typeToReplace); +} + +bool CodeBlock::hasOptimizedReplacement() +{ + return hasOptimizedReplacement(jitType()); +} +#endif + +bool CodeBlock::isCaptured(VirtualRegister operand, InlineCallFrame* inlineCallFrame) const +{ + if (operand.isArgument()) + return operand.toArgument() && usesArguments(); + + if (inlineCallFrame) + return inlineCallFrame->capturedVars.get(operand.toLocal()); + + // The activation object isn't in the captured region, but it's "captured" + // in the sense that stores to its location can be observed indirectly. + if (needsActivation() && operand == activationRegister()) + return true; + + // Ditto for the arguments object. + if (usesArguments() && operand == argumentsRegister()) + return true; + if (usesArguments() && operand == unmodifiedArgumentsRegister(argumentsRegister())) + return true; + + // We're in global code so there are no locals to capture + if (!symbolTable()) + return false; + + return symbolTable()->isCaptured(operand.offset()); +} + +int CodeBlock::framePointerOffsetToGetActivationRegisters(int machineCaptureStart) +{ + // We'll be adding this to the stack pointer to get a registers pointer that looks + // like it would have looked in the baseline engine. For example, if bytecode would + // have put the first captured variable at offset -5 but we put it at offset -1, then + // we'll have an offset of 4. + int32_t offset = 0; + + // Compute where we put the captured variables. This offset will point the registers + // pointer directly at the first captured var. + offset += machineCaptureStart; + + // Now compute the offset needed to make the runtime see the captured variables at the + // same offset that the bytecode would have used. + offset -= symbolTable()->captureStart(); + + return offset; +} + +int CodeBlock::framePointerOffsetToGetActivationRegisters() +{ + if (!JITCode::isOptimizingJIT(jitType())) + return 0; +#if ENABLE(DFG_JIT) + return framePointerOffsetToGetActivationRegisters(jitCode()->dfgCommon()->machineCaptureStart); +#else + RELEASE_ASSERT_NOT_REACHED(); + return 0; +#endif +} + HandlerInfo* CodeBlock::handlerForBytecodeOffset(unsigned bytecodeOffset) { RELEASE_ASSERT(bytecodeOffset < instructions().size()); @@ -2491,72 +2576,61 @@ void CodeBlock::expressionRangeForBytecodeOffset(unsigned bytecodeOffset, int& d line += m_ownerExecutable->lineNo(); } +bool CodeBlock::hasOpDebugForLineAndColumn(unsigned line, unsigned column) +{ + Interpreter* interpreter = vm()->interpreter; + const Instruction* begin = instructions().begin(); + const Instruction* end = instructions().end(); + for (const Instruction* it = begin; it != end;) { + OpcodeID opcodeID = interpreter->getOpcodeID(it->u.opcode); + if (opcodeID == op_debug) { + unsigned bytecodeOffset = it - begin; + int unused; + unsigned opDebugLine; + unsigned opDebugColumn; + expressionRangeForBytecodeOffset(bytecodeOffset, unused, unused, unused, opDebugLine, opDebugColumn); + if (line == opDebugLine && (column == Breakpoint::unspecifiedColumn || column == opDebugColumn)) + return true; + } + it += opcodeLengths[opcodeID]; + } + return false; +} + void CodeBlock::shrinkToFit(ShrinkMode shrinkMode) { -#if ENABLE(LLINT) - m_llintCallLinkInfos.shrinkToFit(); -#endif -#if ENABLE(JIT) - m_structureStubInfos.shrinkToFit(); - m_callLinkInfos.shrinkToFit(); -#endif -#if ENABLE(VALUE_PROFILER) m_rareCaseProfiles.shrinkToFit(); m_specialFastCaseProfiles.shrinkToFit(); -#endif if (shrinkMode == EarlyShrink) { - m_identifiers.shrinkToFit(); - m_functionDecls.shrinkToFit(); - m_functionExprs.shrinkToFit(); m_constantRegisters.shrinkToFit(); + + if (m_rareData) { + m_rareData->m_switchJumpTables.shrinkToFit(); + m_rareData->m_stringSwitchJumpTables.shrinkToFit(); + } } // else don't shrink these, because we would have already pointed pointers into these tables. - - if (m_rareData) { - m_rareData->m_exceptionHandlers.shrinkToFit(); - m_rareData->m_immediateSwitchJumpTables.shrinkToFit(); - m_rareData->m_characterSwitchJumpTables.shrinkToFit(); - m_rareData->m_stringSwitchJumpTables.shrinkToFit(); -#if ENABLE(JIT) - m_rareData->m_callReturnIndexVector.shrinkToFit(); -#endif -#if ENABLE(DFG_JIT) - m_rareData->m_inlineCallFrames.shrinkToFit(); - m_rareData->m_codeOrigins.shrinkToFit(); -#endif - } - -#if ENABLE(DFG_JIT) - if (m_dfgData) { - m_dfgData->osrEntry.shrinkToFit(); - m_dfgData->osrExit.shrinkToFit(); - m_dfgData->speculationRecovery.shrinkToFit(); - m_dfgData->weakReferences.shrinkToFit(); - m_dfgData->transitions.shrinkToFit(); - m_dfgData->minifiedDFG.prepareAndShrink(); - m_dfgData->variableEventStream.shrinkToFit(); - } -#endif } -void CodeBlock::createActivation(CallFrame* callFrame) +unsigned CodeBlock::addOrFindConstant(JSValue v) { - ASSERT(codeType() == FunctionCode); - ASSERT(needsFullScopeChain()); - ASSERT(!callFrame->uncheckedR(activationRegister()).jsValue()); - JSActivation* activation = JSActivation::create(callFrame->vm(), callFrame, this); - callFrame->uncheckedR(activationRegister()) = JSValue(activation); - callFrame->setScope(activation); + unsigned result; + if (findConstant(v, result)) + return result; + return addConstant(v); } -unsigned CodeBlock::addOrFindConstant(JSValue v) +bool CodeBlock::findConstant(JSValue v, unsigned& index) { unsigned numberOfConstants = numberOfConstantRegisters(); for (unsigned i = 0; i < numberOfConstants; ++i) { - if (getConstant(FirstConstantRegisterIndex + i) == v) - return i; + if (getConstant(FirstConstantRegisterIndex + i) == v) { + index = i; + return true; + } } - return addConstant(v); + index = numberOfConstants; + return false; } #if ENABLE(JIT) @@ -2564,378 +2638,268 @@ void CodeBlock::unlinkCalls() { if (!!m_alternative) m_alternative->unlinkCalls(); -#if ENABLE(LLINT) for (size_t i = 0; i < m_llintCallLinkInfos.size(); ++i) { if (m_llintCallLinkInfos[i].isLinked()) m_llintCallLinkInfos[i].unlink(); } -#endif - if (!m_callLinkInfos.size()) + if (m_callLinkInfos.isEmpty()) return; if (!m_vm->canUseJIT()) return; RepatchBuffer repatchBuffer(this); - for (size_t i = 0; i < m_callLinkInfos.size(); i++) { - if (!m_callLinkInfos[i].isLinked()) + for (auto iter = m_callLinkInfos.begin(); !!iter; ++iter) { + CallLinkInfo& info = **iter; + if (!info.isLinked()) continue; - m_callLinkInfos[i].unlink(*m_vm, repatchBuffer); + info.unlink(repatchBuffer); } } +void CodeBlock::linkIncomingCall(ExecState* callerFrame, CallLinkInfo* incoming) +{ + noticeIncomingCall(callerFrame); + m_incomingCalls.push(incoming); +} +#endif // ENABLE(JIT) + void CodeBlock::unlinkIncomingCalls() { -#if ENABLE(LLINT) while (m_incomingLLIntCalls.begin() != m_incomingLLIntCalls.end()) m_incomingLLIntCalls.begin()->unlink(); -#endif +#if ENABLE(JIT) if (m_incomingCalls.isEmpty()) return; RepatchBuffer repatchBuffer(this); while (m_incomingCalls.begin() != m_incomingCalls.end()) - m_incomingCalls.begin()->unlink(*m_vm, repatchBuffer); -} -#endif // ENABLE(JIT) - -#if ENABLE(LLINT) -Instruction* CodeBlock::adjustPCIfAtCallSite(Instruction* potentialReturnPC) -{ - ASSERT(potentialReturnPC); - - unsigned returnPCOffset = potentialReturnPC - instructions().begin(); - Instruction* adjustedPC; - unsigned opcodeLength; - - // If we are at a callsite, the LLInt stores the PC after the call - // instruction rather than the PC of the call instruction. This requires - // some correcting. If so, we can rely on the fact that the preceding - // instruction must be one of the call instructions, so either it's a - // call_varargs or it's a call, construct, or eval. - // - // If we are not at a call site, then we need to guard against the - // possibility of peeking past the start of the bytecode range for this - // codeBlock. Hence, we do a bounds check before we peek at the - // potential "preceding" instruction. - // The bounds check is done by comparing the offset of the potential - // returnPC with the length of the opcode. If there is room for a call - // instruction before the returnPC, then the offset of the returnPC must - // be greater than the size of the call opcode we're looking for. - - // The determination of the call instruction present (if we are at a - // callsite) depends on the following assumptions. So, assert that - // they are still true: - ASSERT(OPCODE_LENGTH(op_call_varargs) <= OPCODE_LENGTH(op_call)); - ASSERT(OPCODE_LENGTH(op_call) == OPCODE_LENGTH(op_construct)); - ASSERT(OPCODE_LENGTH(op_call) == OPCODE_LENGTH(op_call_eval)); - - // Check for the case of a preceeding op_call_varargs: - opcodeLength = OPCODE_LENGTH(op_call_varargs); - adjustedPC = potentialReturnPC - opcodeLength; - if ((returnPCOffset >= opcodeLength) - && (adjustedPC->u.pointer == LLInt::getCodePtr(llint_op_call_varargs))) { - return adjustedPC; - } - - // Check for the case of the other 3 call instructions: - opcodeLength = OPCODE_LENGTH(op_call); - adjustedPC = potentialReturnPC - opcodeLength; - if ((returnPCOffset >= opcodeLength) - && (adjustedPC->u.pointer == LLInt::getCodePtr(llint_op_call) - || adjustedPC->u.pointer == LLInt::getCodePtr(llint_op_construct) - || adjustedPC->u.pointer == LLInt::getCodePtr(llint_op_call_eval))) { - return adjustedPC; - } - - // Not a call site. No need to adjust PC. Just return the original. - return potentialReturnPC; -} -#endif // ENABLE(LLINT) - -#if ENABLE(JIT) -ClosureCallStubRoutine* CodeBlock::findClosureCallForReturnPC(ReturnAddressPtr returnAddress) -{ - for (unsigned i = m_callLinkInfos.size(); i--;) { - CallLinkInfo& info = m_callLinkInfos[i]; - if (!info.stub) - continue; - if (!info.stub->code().executableMemory()->contains(returnAddress.value())) - continue; - - RELEASE_ASSERT(info.stub->codeOrigin().bytecodeIndex < CodeOrigin::maximumBytecodeIndex); - return info.stub.get(); - } - - // The stub routine may have been jettisoned. This is rare, but we have to handle it. - const JITStubRoutineSet& set = m_vm->heap.jitStubRoutines(); - for (unsigned i = set.size(); i--;) { - GCAwareJITStubRoutine* genericStub = set.at(i); - if (!genericStub->isClosureCall()) - continue; - ClosureCallStubRoutine* stub = static_cast(genericStub); - if (!stub->code().executableMemory()->contains(returnAddress.value())) - continue; - RELEASE_ASSERT(stub->codeOrigin().bytecodeIndex < CodeOrigin::maximumBytecodeIndex); - return stub; - } - - return 0; -} -#endif - -unsigned CodeBlock::bytecodeOffset(ExecState* exec, ReturnAddressPtr returnAddress) -{ - UNUSED_PARAM(exec); - UNUSED_PARAM(returnAddress); -#if ENABLE(LLINT) -#if !ENABLE(LLINT_C_LOOP) - // When using the JIT, we could have addresses that are not bytecode - // addresses. We check if the return address is in the LLint glue and - // opcode handlers range here to ensure that we are looking at bytecode - // before attempting to convert the return address into a bytecode offset. - // - // In the case of the C Loop LLInt, the JIT is disabled, and the only - // valid return addresses should be bytecode PCs. So, we can and need to - // forego this check because when we do not ENABLE(COMPUTED_GOTO_OPCODES), - // then the bytecode "PC"s are actually the opcodeIDs and are not bounded - // by llint_begin and llint_end. - if (returnAddress.value() >= LLInt::getCodePtr(llint_begin) - && returnAddress.value() <= LLInt::getCodePtr(llint_end)) -#endif - { - RELEASE_ASSERT(exec->codeBlock()); - RELEASE_ASSERT(exec->codeBlock() == this); - RELEASE_ASSERT(JITCode::isBaselineCode(getJITType())); - Instruction* instruction = exec->currentVPC(); - RELEASE_ASSERT(instruction); - - instruction = adjustPCIfAtCallSite(instruction); - return bytecodeOffset(instruction); - } -#endif // !ENABLE(LLINT) - -#if ENABLE(JIT) - if (!m_rareData) - return 1; - Vector& callIndices = m_rareData->m_callReturnIndexVector; - if (!callIndices.size()) - return 1; - - if (getJITCode().getExecutableMemory()->contains(returnAddress.value())) { - unsigned callReturnOffset = getJITCode().offsetOf(returnAddress.value()); - CallReturnOffsetToBytecodeOffset* result = - binarySearch( - callIndices, callIndices.size(), callReturnOffset, getCallReturnOffset); - RELEASE_ASSERT(result->callReturnOffset == callReturnOffset); - RELEASE_ASSERT(result->bytecodeOffset < instructionCount()); - return result->bytecodeOffset; - } - ClosureCallStubRoutine* closureInfo = findClosureCallForReturnPC(returnAddress); - CodeOrigin origin = closureInfo->codeOrigin(); - while (InlineCallFrame* inlineCallFrame = origin.inlineCallFrame) { - if (inlineCallFrame->baselineCodeBlock() == this) - break; - origin = inlineCallFrame->caller; - RELEASE_ASSERT(origin.bytecodeIndex < CodeOrigin::maximumBytecodeIndex); - } - RELEASE_ASSERT(origin.bytecodeIndex < CodeOrigin::maximumBytecodeIndex); - unsigned bytecodeIndex = origin.bytecodeIndex; - RELEASE_ASSERT(bytecodeIndex < instructionCount()); - return bytecodeIndex; -#endif // ENABLE(JIT) - -#if !ENABLE(LLINT) && !ENABLE(JIT) - return 1; -#endif + m_incomingCalls.begin()->unlink(repatchBuffer); +#endif // ENABLE(JIT) } -#if ENABLE(DFG_JIT) -bool CodeBlock::codeOriginForReturn(ReturnAddressPtr returnAddress, CodeOrigin& codeOrigin) +void CodeBlock::linkIncomingCall(ExecState* callerFrame, LLIntCallLinkInfo* incoming) { - if (!hasCodeOrigins()) - return false; - - if (!getJITCode().getExecutableMemory()->contains(returnAddress.value())) { - ClosureCallStubRoutine* stub = findClosureCallForReturnPC(returnAddress); - ASSERT(stub); - if (!stub) - return false; - codeOrigin = stub->codeOrigin(); - return true; - } - - unsigned offset = getJITCode().offsetOf(returnAddress.value()); - CodeOriginAtCallReturnOffset* entry = - tryBinarySearch( - codeOrigins(), codeOrigins().size(), offset, - getCallReturnOffsetForCodeOrigin); - if (!entry) - return false; - codeOrigin = entry->codeOrigin; - return true; + noticeIncomingCall(callerFrame); + m_incomingLLIntCalls.push(incoming); } -#endif // ENABLE(DFG_JIT) void CodeBlock::clearEvalCache() { if (!!m_alternative) m_alternative->clearEvalCache(); + if (CodeBlock* otherBlock = specialOSREntryBlockOrNull()) + otherBlock->clearEvalCache(); if (!m_rareData) return; m_rareData->m_evalCodeCache.clear(); } -template -inline void replaceExistingEntries(Vector& target, Vector& source) +void CodeBlock::install() { - ASSERT(target.size() <= source.size()); - for (size_t i = 0; i < target.size(); ++i) - target[i] = source[i]; + ownerExecutable()->installCode(this); } -void CodeBlock::copyPostParseDataFrom(CodeBlock* alternative) +PassRefPtr CodeBlock::newReplacement() { - if (!alternative) - return; - - replaceExistingEntries(m_constantRegisters, alternative->m_constantRegisters); - replaceExistingEntries(m_functionDecls, alternative->m_functionDecls); - replaceExistingEntries(m_functionExprs, alternative->m_functionExprs); - if (!!m_rareData && !!alternative->m_rareData) - replaceExistingEntries(m_rareData->m_constantBuffers, alternative->m_rareData->m_constantBuffers); + return ownerExecutable()->newReplacementCodeBlockFor(specializationKind()); } -void CodeBlock::copyPostParseDataFromAlternative() +const SlowArgument* CodeBlock::machineSlowArguments() { - copyPostParseDataFrom(m_alternative.get()); + if (!JITCode::isOptimizingJIT(jitType())) + return symbolTable()->slowArguments(); + +#if ENABLE(DFG_JIT) + return jitCode()->dfgCommon()->slowArguments.get(); +#else // ENABLE(DFG_JIT) + return 0; +#endif // ENABLE(DFG_JIT) } #if ENABLE(JIT) -void CodeBlock::reoptimize() -{ - ASSERT(replacement() != this); - ASSERT(replacement()->alternative() == this); - if (DFG::shouldShowDisassembly()) - dataLog(*replacement(), " will be jettisoned due to reoptimization of ", *this, ".\n"); - replacement()->jettison(); - countReoptimization(); -} - CodeBlock* ProgramCodeBlock::replacement() { - return &static_cast(ownerExecutable())->generatedBytecode(); + return jsCast(ownerExecutable())->codeBlock(); } CodeBlock* EvalCodeBlock::replacement() { - return &static_cast(ownerExecutable())->generatedBytecode(); + return jsCast(ownerExecutable())->codeBlock(); } CodeBlock* FunctionCodeBlock::replacement() { - return &static_cast(ownerExecutable())->generatedBytecodeFor(m_isConstructor ? CodeForConstruct : CodeForCall); -} - -JSObject* ProgramCodeBlock::compileOptimized(ExecState* exec, JSScope* scope, unsigned bytecodeIndex) -{ - if (replacement()->getJITType() == JITCode::nextTierJIT(getJITType())) - return 0; - JSObject* error = static_cast(ownerExecutable())->compileOptimized(exec, scope, bytecodeIndex); - return error; -} - -JSObject* EvalCodeBlock::compileOptimized(ExecState* exec, JSScope* scope, unsigned bytecodeIndex) -{ - if (replacement()->getJITType() == JITCode::nextTierJIT(getJITType())) - return 0; - JSObject* error = static_cast(ownerExecutable())->compileOptimized(exec, scope, bytecodeIndex); - return error; -} - -JSObject* FunctionCodeBlock::compileOptimized(ExecState* exec, JSScope* scope, unsigned bytecodeIndex) -{ - if (replacement()->getJITType() == JITCode::nextTierJIT(getJITType())) - return 0; - JSObject* error = static_cast(ownerExecutable())->compileOptimizedFor(exec, scope, bytecodeIndex, m_isConstructor ? CodeForConstruct : CodeForCall); - return error; + return jsCast(ownerExecutable())->codeBlockFor(m_isConstructor ? CodeForConstruct : CodeForCall); } -DFG::CapabilityLevel ProgramCodeBlock::canCompileWithDFGInternal() +DFG::CapabilityLevel ProgramCodeBlock::capabilityLevelInternal() { - return DFG::canCompileProgram(this); + return DFG::programCapabilityLevel(this); } -DFG::CapabilityLevel EvalCodeBlock::canCompileWithDFGInternal() +DFG::CapabilityLevel EvalCodeBlock::capabilityLevelInternal() { - return DFG::canCompileEval(this); + return DFG::evalCapabilityLevel(this); } -DFG::CapabilityLevel FunctionCodeBlock::canCompileWithDFGInternal() +DFG::CapabilityLevel FunctionCodeBlock::capabilityLevelInternal() { if (m_isConstructor) - return DFG::canCompileFunctionForConstruct(this); - return DFG::canCompileFunctionForCall(this); + return DFG::functionForConstructCapabilityLevel(this); + return DFG::functionForCallCapabilityLevel(this); } +#endif -void CodeBlock::jettison() +void CodeBlock::jettison(Profiler::JettisonReason reason, ReoptimizationMode mode) { - ASSERT(JITCode::isOptimizingJIT(getJITType())); - ASSERT(this == replacement()); + RELEASE_ASSERT(reason != Profiler::NotJettisoned); + +#if ENABLE(DFG_JIT) + if (DFG::shouldShowDisassembly()) { + dataLog("Jettisoning ", *this); + if (mode == CountReoptimization) + dataLog(" and counting reoptimization"); + dataLog(" due to ", reason, ".\n"); + } + + DeferGCForAWhile deferGC(*m_heap); + RELEASE_ASSERT(JITCode::isOptimizingJIT(jitType())); + + if (Profiler::Compilation* compilation = jitCode()->dfgCommon()->compilation.get()) + compilation->setJettisonReason(reason); + + // We want to accomplish two things here: + // 1) Make sure that if this CodeBlock is on the stack right now, then if we return to it + // we should OSR exit at the top of the next bytecode instruction after the return. + // 2) Make sure that if we call the owner executable, then we shouldn't call this CodeBlock. + + // This accomplishes the OSR-exit-on-return part, and does its own book-keeping about + // whether the invalidation has already happened. + if (!jitCode()->dfgCommon()->invalidate()) { + // Nothing to do since we've already been invalidated. That means that we cannot be + // the optimized replacement. + RELEASE_ASSERT(this != replacement()); + return; + } + + if (DFG::shouldShowDisassembly()) + dataLog(" Did invalidate ", *this, "\n"); + + // Count the reoptimization if that's what the user wanted. + if (mode == CountReoptimization) { + // FIXME: Maybe this should call alternative(). + // https://bugs.webkit.org/show_bug.cgi?id=123677 + baselineAlternative()->countReoptimization(); + if (DFG::shouldShowDisassembly()) + dataLog(" Did count reoptimization for ", *this, "\n"); + } + + // Now take care of the entrypoint. + if (this != replacement()) { + // This means that we were never the entrypoint. This can happen for OSR entry code + // blocks. + return; + } alternative()->optimizeAfterWarmUp(); tallyFrequentExitSites(); + alternative()->install(); if (DFG::shouldShowDisassembly()) - dataLog("Jettisoning ", *this, ".\n"); - jettisonImpl(); + dataLog(" Did install baseline version of ", *this, "\n"); +#else // ENABLE(DFG_JIT) + UNUSED_PARAM(mode); + UNREACHABLE_FOR_PLATFORM(); +#endif // ENABLE(DFG_JIT) } -void ProgramCodeBlock::jettisonImpl() +JSGlobalObject* CodeBlock::globalObjectFor(CodeOrigin codeOrigin) { - static_cast(ownerExecutable())->jettisonOptimizedCode(*vm()); + if (!codeOrigin.inlineCallFrame) + return globalObject(); + return jsCast(codeOrigin.inlineCallFrame->executable.get())->eitherCodeBlock()->globalObject(); } -void EvalCodeBlock::jettisonImpl() +void CodeBlock::noticeIncomingCall(ExecState* callerFrame) { - static_cast(ownerExecutable())->jettisonOptimizedCode(*vm()); -} + CodeBlock* callerCodeBlock = callerFrame->codeBlock(); + + if (Options::verboseCallLink()) + dataLog("Noticing call link from ", *callerCodeBlock, " to ", *this, "\n"); + + if (!m_shouldAlwaysBeInlined) + return; -void FunctionCodeBlock::jettisonImpl() -{ - static_cast(ownerExecutable())->jettisonOptimizedCodeFor(*vm(), m_isConstructor ? CodeForConstruct : CodeForCall); -} +#if ENABLE(DFG_JIT) + if (!hasBaselineJITProfiling()) + return; -bool ProgramCodeBlock::jitCompileImpl(ExecState* exec) -{ - ASSERT(getJITType() == JITCode::InterpreterThunk); - ASSERT(this == replacement()); - return static_cast(ownerExecutable())->jitCompile(exec); -} + if (!DFG::mightInlineFunction(this)) + return; -bool EvalCodeBlock::jitCompileImpl(ExecState* exec) -{ - ASSERT(getJITType() == JITCode::InterpreterThunk); - ASSERT(this == replacement()); - return static_cast(ownerExecutable())->jitCompile(exec); -} + if (!canInline(m_capabilityLevelState)) + return; + + if (!DFG::isSmallEnoughToInlineCodeInto(callerCodeBlock)) { + m_shouldAlwaysBeInlined = false; + if (Options::verboseCallLink()) + dataLog(" Clearing SABI because caller is too large.\n"); + return; + } -bool FunctionCodeBlock::jitCompileImpl(ExecState* exec) -{ - ASSERT(getJITType() == JITCode::InterpreterThunk); - ASSERT(this == replacement()); - return static_cast(ownerExecutable())->jitCompileFor(exec, m_isConstructor ? CodeForConstruct : CodeForCall); -} + if (callerCodeBlock->jitType() == JITCode::InterpreterThunk) { + // If the caller is still in the interpreter, then we can't expect inlining to + // happen anytime soon. Assume it's profitable to optimize it separately. This + // ensures that a function is SABI only if it is called no more frequently than + // any of its callers. + m_shouldAlwaysBeInlined = false; + if (Options::verboseCallLink()) + dataLog(" Clearing SABI because caller is in LLInt.\n"); + return; + } + + if (callerCodeBlock->codeType() != FunctionCode) { + // If the caller is either eval or global code, assume that that won't be + // optimized anytime soon. For eval code this is particularly true since we + // delay eval optimization by a *lot*. + m_shouldAlwaysBeInlined = false; + if (Options::verboseCallLink()) + dataLog(" Clearing SABI because caller is not a function.\n"); + return; + } + + ExecState* frame = callerFrame; + for (unsigned i = Options::maximumInliningDepth(); i--; frame = frame->callerFrame()) { + if (frame->isVMEntrySentinel()) + break; + if (frame->codeBlock() == this) { + // Recursive calls won't be inlined. + if (Options::verboseCallLink()) + dataLog(" Clearing SABI because recursion was detected.\n"); + m_shouldAlwaysBeInlined = false; + return; + } + } + + RELEASE_ASSERT(callerCodeBlock->m_capabilityLevelState != DFG::CapabilityLevelNotSet); + + if (canCompile(callerCodeBlock->m_capabilityLevelState)) + return; + + if (Options::verboseCallLink()) + dataLog(" Clearing SABI because the caller is not a DFG candidate.\n"); + + m_shouldAlwaysBeInlined = false; #endif - -JSGlobalObject* CodeBlock::globalObjectFor(CodeOrigin codeOrigin) -{ - if (!codeOrigin.inlineCallFrame) - return globalObject(); - return jsCast(codeOrigin.inlineCallFrame->executable.get())->generatedBytecode().globalObject(); } unsigned CodeBlock::reoptimizationRetryCounter() const { +#if ENABLE(JIT) ASSERT(m_reoptimizationRetryCounter <= Options::reoptimizationRetryCounterMax()); return m_reoptimizationRetryCounter; +#else + return 0; +#endif // ENABLE(JIT) } +#if ENABLE(JIT) void CodeBlock::countReoptimization() { m_reoptimizationRetryCounter++; @@ -2943,6 +2907,17 @@ void CodeBlock::countReoptimization() m_reoptimizationRetryCounter = Options::reoptimizationRetryCounterMax(); } +unsigned CodeBlock::numberOfDFGCompiles() +{ + ASSERT(JITCode::isBaselineCode(jitType())); + if (Options::testTheFTL()) { + if (m_didFailFTLCompilation) + return 1000000; + return (m_hasBeenCompiledWithFTL ? 1 : 0) + m_reoptimizationRetryCounter; + } + return (JITCode::isOptimizingJIT(replacement()->jitType()) ? 1 : 0) + m_reoptimizationRetryCounter; +} + int32_t CodeBlock::codeTypeThresholdMultiplier() const { if (codeType() == EvalCode) @@ -3020,10 +2995,16 @@ double CodeBlock::optimizationThresholdScalingFactor() ASSERT(instructionCount); // Make sure this is called only after we have an instruction stream; otherwise it'll just return the value of d, which makes no sense. double result = d + a * sqrt(instructionCount + b) + c * instructionCount; -#if ENABLE(JIT_VERBOSE_OSR) - dataLog(*this, ": instruction count is ", instructionCount, ", scaling execution counter by ", result, " * ", codeTypeThresholdMultiplier(), "\n"); -#endif - return result * codeTypeThresholdMultiplier(); + + result *= codeTypeThresholdMultiplier(); + + if (Options::verboseOSR()) { + dataLog( + *this, ": instruction count is ", instructionCount, + ", scaling execution counter by ", result, " * ", codeTypeThresholdMultiplier(), + "\n"); + } + return result; } static int32_t clipThreshold(double threshold) @@ -3037,64 +3018,131 @@ static int32_t clipThreshold(double threshold) return static_cast(threshold); } -int32_t CodeBlock::counterValueForOptimizeAfterWarmUp() -{ - return clipThreshold( - Options::thresholdForOptimizeAfterWarmUp() * - optimizationThresholdScalingFactor() * - (1 << reoptimizationRetryCounter())); -} - -int32_t CodeBlock::counterValueForOptimizeAfterLongWarmUp() -{ - return clipThreshold( - Options::thresholdForOptimizeAfterLongWarmUp() * - optimizationThresholdScalingFactor() * - (1 << reoptimizationRetryCounter())); -} - -int32_t CodeBlock::counterValueForOptimizeSoon() +int32_t CodeBlock::adjustedCounterValue(int32_t desiredThreshold) { return clipThreshold( - Options::thresholdForOptimizeSoon() * + static_cast(desiredThreshold) * optimizationThresholdScalingFactor() * (1 << reoptimizationRetryCounter())); } bool CodeBlock::checkIfOptimizationThresholdReached() { +#if ENABLE(DFG_JIT) + if (DFG::Worklist* worklist = DFG::existingGlobalDFGWorklistOrNull()) { + if (worklist->compilationState(DFG::CompilationKey(this, DFG::DFGMode)) + == DFG::Worklist::Compiled) { + optimizeNextInvocation(); + return true; + } + } +#endif + return m_jitExecuteCounter.checkIfThresholdCrossedAndSet(this); } void CodeBlock::optimizeNextInvocation() { + if (Options::verboseOSR()) + dataLog(*this, ": Optimizing next invocation.\n"); m_jitExecuteCounter.setNewThreshold(0, this); } void CodeBlock::dontOptimizeAnytimeSoon() { + if (Options::verboseOSR()) + dataLog(*this, ": Not optimizing anytime soon.\n"); m_jitExecuteCounter.deferIndefinitely(); } void CodeBlock::optimizeAfterWarmUp() { - m_jitExecuteCounter.setNewThreshold(counterValueForOptimizeAfterWarmUp(), this); + if (Options::verboseOSR()) + dataLog(*this, ": Optimizing after warm-up.\n"); +#if ENABLE(DFG_JIT) + m_jitExecuteCounter.setNewThreshold( + adjustedCounterValue(Options::thresholdForOptimizeAfterWarmUp()), this); +#endif } void CodeBlock::optimizeAfterLongWarmUp() { - m_jitExecuteCounter.setNewThreshold(counterValueForOptimizeAfterLongWarmUp(), this); + if (Options::verboseOSR()) + dataLog(*this, ": Optimizing after long warm-up.\n"); +#if ENABLE(DFG_JIT) + m_jitExecuteCounter.setNewThreshold( + adjustedCounterValue(Options::thresholdForOptimizeAfterLongWarmUp()), this); +#endif } void CodeBlock::optimizeSoon() { - m_jitExecuteCounter.setNewThreshold(counterValueForOptimizeSoon(), this); + if (Options::verboseOSR()) + dataLog(*this, ": Optimizing soon.\n"); +#if ENABLE(DFG_JIT) + m_jitExecuteCounter.setNewThreshold( + adjustedCounterValue(Options::thresholdForOptimizeSoon()), this); +#endif } -#if ENABLE(JIT) +void CodeBlock::forceOptimizationSlowPathConcurrently() +{ + if (Options::verboseOSR()) + dataLog(*this, ": Forcing slow path concurrently.\n"); + m_jitExecuteCounter.forceSlowPathConcurrently(); +} + +#if ENABLE(DFG_JIT) +void CodeBlock::setOptimizationThresholdBasedOnCompilationResult(CompilationResult result) +{ + JITCode::JITType type = jitType(); + if (type != JITCode::BaselineJIT) { + dataLog(*this, ": expected to have baseline code but have ", type, "\n"); + RELEASE_ASSERT_NOT_REACHED(); + } + + CodeBlock* theReplacement = replacement(); + if ((result == CompilationSuccessful) != (theReplacement != this)) { + dataLog(*this, ": we have result = ", result, " but "); + if (theReplacement == this) + dataLog("we are our own replacement.\n"); + else + dataLog("our replacement is ", pointerDump(theReplacement), "\n"); + RELEASE_ASSERT_NOT_REACHED(); + } + + switch (result) { + case CompilationSuccessful: + RELEASE_ASSERT(JITCode::isOptimizingJIT(replacement()->jitType())); + optimizeNextInvocation(); + return; + case CompilationFailed: + dontOptimizeAnytimeSoon(); + return; + case CompilationDeferred: + // We'd like to do dontOptimizeAnytimeSoon() but we cannot because + // forceOptimizationSlowPathConcurrently() is inherently racy. It won't + // necessarily guarantee anything. So, we make sure that even if that + // function ends up being a no-op, we still eventually retry and realize + // that we have optimized code ready. + optimizeAfterWarmUp(); + return; + case CompilationInvalidated: + // Retry with exponential backoff. + countReoptimization(); + optimizeAfterWarmUp(); + return; + } + + dataLog("Unrecognized result: ", static_cast(result), "\n"); + RELEASE_ASSERT_NOT_REACHED(); +} + +#endif + uint32_t CodeBlock::adjustedExitCountThreshold(uint32_t desiredThreshold) { - ASSERT(getJITType() == JITCode::DFGJIT); + ASSERT(JITCode::isOptimizingJIT(jitType())); // Compute this the lame way so we don't saturate. This is called infrequently // enough that this loop won't hurt us. unsigned result = desiredThreshold; @@ -3128,7 +3176,6 @@ bool CodeBlock::shouldReoptimizeFromLoopNow() } #endif -#if ENABLE(VALUE_PROFILER) ArrayProfile* CodeBlock::getArrayProfile(unsigned bytecodeOffset) { for (unsigned i = 0; i < m_arrayProfiles.size(); ++i) { @@ -3146,9 +3193,10 @@ ArrayProfile* CodeBlock::getOrAddArrayProfile(unsigned bytecodeOffset) return addArrayProfile(bytecodeOffset); } -void CodeBlock::updateAllPredictionsAndCountLiveness( - OperationInProgress operation, unsigned& numberOfLiveNonArgumentValueProfiles, unsigned& numberOfSamplesInProfiles) +void CodeBlock::updateAllPredictionsAndCountLiveness(unsigned& numberOfLiveNonArgumentValueProfiles, unsigned& numberOfSamplesInProfiles) { + ConcurrentJITLocker locker(m_lock); + numberOfLiveNonArgumentValueProfiles = 0; numberOfSamplesInProfiles = 0; // If this divided by ValueProfile::numberOfBuckets equals numberOfValueProfiles() then value profiles are full. for (unsigned i = 0; i < totalNumberOfValueProfiles(); ++i) { @@ -3158,50 +3206,47 @@ void CodeBlock::updateAllPredictionsAndCountLiveness( numSamples = ValueProfile::numberOfBuckets; // We don't want profiles that are extremely hot to be given more weight. numberOfSamplesInProfiles += numSamples; if (profile->m_bytecodeOffset < 0) { - profile->computeUpdatedPrediction(operation); + profile->computeUpdatedPrediction(locker); continue; } if (profile->numberOfSamples() || profile->m_prediction != SpecNone) numberOfLiveNonArgumentValueProfiles++; - profile->computeUpdatedPrediction(operation); + profile->computeUpdatedPrediction(locker); } #if ENABLE(DFG_JIT) - m_lazyOperandValueProfiles.computeUpdatedPredictions(operation); + m_lazyOperandValueProfiles.computeUpdatedPredictions(locker); #endif } -void CodeBlock::updateAllValueProfilePredictions(OperationInProgress operation) +void CodeBlock::updateAllValueProfilePredictions() { unsigned ignoredValue1, ignoredValue2; - updateAllPredictionsAndCountLiveness(operation, ignoredValue1, ignoredValue2); + updateAllPredictionsAndCountLiveness(ignoredValue1, ignoredValue2); } -void CodeBlock::updateAllArrayPredictions(OperationInProgress operation) +void CodeBlock::updateAllArrayPredictions() { + ConcurrentJITLocker locker(m_lock); + for (unsigned i = m_arrayProfiles.size(); i--;) - m_arrayProfiles[i].computeUpdatedPrediction(this, operation); + m_arrayProfiles[i].computeUpdatedPrediction(locker, this); // Don't count these either, for similar reasons. for (unsigned i = m_arrayAllocationProfiles.size(); i--;) m_arrayAllocationProfiles[i].updateIndexingType(); } -void CodeBlock::updateAllPredictions(OperationInProgress operation) +void CodeBlock::updateAllPredictions() { - updateAllValueProfilePredictions(operation); - updateAllArrayPredictions(operation); + updateAllValueProfilePredictions(); + updateAllArrayPredictions(); } bool CodeBlock::shouldOptimizeNow() { -#if ENABLE(JIT_VERBOSE_OSR) - dataLog("Considering optimizing ", *this, "...\n"); -#endif - -#if ENABLE(VERBOSE_VALUE_PROFILE) - dumpValueProfiles(); -#endif + if (Options::verboseOSR()) + dataLog("Considering optimizing ", *this, "...\n"); if (m_optimizationDelayCounter >= Options::maximumOptimizationDelay()) return true; @@ -3210,11 +3255,16 @@ bool CodeBlock::shouldOptimizeNow() unsigned numberOfLiveNonArgumentValueProfiles; unsigned numberOfSamplesInProfiles; - updateAllPredictionsAndCountLiveness(NoOperation, numberOfLiveNonArgumentValueProfiles, numberOfSamplesInProfiles); + updateAllPredictionsAndCountLiveness(numberOfLiveNonArgumentValueProfiles, numberOfSamplesInProfiles); -#if ENABLE(JIT_VERBOSE_OSR) - dataLogF("Profile hotness: %lf (%u / %u), %lf (%u / %u)\n", (double)numberOfLiveNonArgumentValueProfiles / numberOfValueProfiles(), numberOfLiveNonArgumentValueProfiles, numberOfValueProfiles(), (double)numberOfSamplesInProfiles / ValueProfile::numberOfBuckets / numberOfValueProfiles(), numberOfSamplesInProfiles, ValueProfile::numberOfBuckets * numberOfValueProfiles()); -#endif + if (Options::verboseOSR()) { + dataLogF( + "Profile hotness: %lf (%u / %u), %lf (%u / %u)\n", + (double)numberOfLiveNonArgumentValueProfiles / numberOfValueProfiles(), + numberOfLiveNonArgumentValueProfiles, numberOfValueProfiles(), + (double)numberOfSamplesInProfiles / ValueProfile::numberOfBuckets / numberOfValueProfiles(), + numberOfSamplesInProfiles, ValueProfile::numberOfBuckets * numberOfValueProfiles()); + } if ((!numberOfValueProfiles() || (double)numberOfLiveNonArgumentValueProfiles / numberOfValueProfiles() >= Options::desiredProfileLivenessRate()) && (!totalNumberOfValueProfiles() || (double)numberOfSamplesInProfiles / ValueProfile::numberOfBuckets / totalNumberOfValueProfiles() >= Options::desiredProfileFullnessRate()) @@ -3226,26 +3276,46 @@ bool CodeBlock::shouldOptimizeNow() optimizeAfterWarmUp(); return false; } -#endif #if ENABLE(DFG_JIT) void CodeBlock::tallyFrequentExitSites() { - ASSERT(getJITType() == JITCode::DFGJIT); - ASSERT(alternative()->getJITType() == JITCode::BaselineJIT); - ASSERT(!!m_dfgData); + ASSERT(JITCode::isOptimizingJIT(jitType())); + ASSERT(alternative()->jitType() == JITCode::BaselineJIT); CodeBlock* profiledBlock = alternative(); - for (unsigned i = 0; i < m_dfgData->osrExit.size(); ++i) { - DFG::OSRExit& exit = m_dfgData->osrExit[i]; - - if (!exit.considerAddingAsFrequentExitSite(profiledBlock)) - continue; - -#if DFG_ENABLE(DEBUG_VERBOSE) - dataLog("OSR exit #", i, " (bc#", exit.m_codeOrigin.bytecodeIndex, ", ", exit.m_kind, ") for ", *this, " occurred frequently: counting as frequent exit site.\n"); + switch (jitType()) { + case JITCode::DFGJIT: { + DFG::JITCode* jitCode = m_jitCode->dfg(); + for (unsigned i = 0; i < jitCode->osrExit.size(); ++i) { + DFG::OSRExit& exit = jitCode->osrExit[i]; + + if (!exit.considerAddingAsFrequentExitSite(profiledBlock)) + continue; + } + break; + } + +#if ENABLE(FTL_JIT) + case JITCode::FTLJIT: { + // There is no easy way to avoid duplicating this code since the FTL::JITCode::osrExit + // vector contains a totally different type, that just so happens to behave like + // DFG::JITCode::osrExit. + FTL::JITCode* jitCode = m_jitCode->ftl(); + for (unsigned i = 0; i < jitCode->osrExit.size(); ++i) { + FTL::OSRExit& exit = jitCode->osrExit[i]; + + if (!exit.considerAddingAsFrequentExitSite(profiledBlock)) + continue; + } + break; + } #endif + + default: + RELEASE_ASSERT_NOT_REACHED(); + break; } } #endif // ENABLE(DFG_JIT) @@ -3281,6 +3351,34 @@ void CodeBlock::dumpValueProfiles() } #endif // ENABLE(VERBOSE_VALUE_PROFILE) +unsigned CodeBlock::frameRegisterCount() +{ + switch (jitType()) { + case JITCode::InterpreterThunk: + return LLInt::frameRegisterCountFor(this); + +#if ENABLE(JIT) + case JITCode::BaselineJIT: + return JIT::frameRegisterCountFor(this); +#endif // ENABLE(JIT) + +#if ENABLE(DFG_JIT) + case JITCode::DFGJIT: + case JITCode::FTLJIT: + return jitCode()->dfgCommon()->frameRegisterCount; +#endif // ENABLE(DFG_JIT) + + default: + RELEASE_ASSERT_NOT_REACHED(); + return 0; + } +} + +int CodeBlock::stackPointerOffset() +{ + return virtualRegisterForLocal(frameRegisterCount() - 1).offset(); +} + size_t CodeBlock::predictedMachineCodeSize() { // This will be called from CodeBlock::CodeBlock before either m_vm or the @@ -3338,29 +3436,168 @@ bool CodeBlock::usesOpcode(OpcodeID opcodeID) return false; } -String CodeBlock::nameForRegister(int registerNumber) +String CodeBlock::nameForRegister(VirtualRegister virtualRegister) { - SymbolTable::iterator end = symbolTable()->end(); - for (SymbolTable::iterator ptr = symbolTable()->begin(); ptr != end; ++ptr) { - if (ptr->value.getIndex() == registerNumber) + ConcurrentJITLocker locker(symbolTable()->m_lock); + SymbolTable::Map::iterator end = symbolTable()->end(locker); + for (SymbolTable::Map::iterator ptr = symbolTable()->begin(locker); ptr != end; ++ptr) { + if (ptr->value.getIndex() == virtualRegister.offset()) { + // FIXME: This won't work from the compilation thread. + // https://bugs.webkit.org/show_bug.cgi?id=115300 return String(ptr->key); + } } - if (needsActivation() && registerNumber == activationRegister()) + if (needsActivation() && virtualRegister == activationRegister()) return ASCIILiteral("activation"); - if (registerNumber == thisRegister()) + if (virtualRegister == thisRegister()) return ASCIILiteral("this"); if (usesArguments()) { - if (registerNumber == argumentsRegister()) + if (virtualRegister == argumentsRegister()) return ASCIILiteral("arguments"); - if (unmodifiedArgumentsRegister(argumentsRegister()) == registerNumber) + if (unmodifiedArgumentsRegister(argumentsRegister()) == virtualRegister) return ASCIILiteral("real arguments"); } - if (registerNumber < 0) { - int argumentPosition = -registerNumber; - argumentPosition -= JSStack::CallFrameHeaderSize + 1; - return String::format("arguments[%3d]", argumentPosition - 1).impl(); - } + if (virtualRegister.isArgument()) + return String::format("arguments[%3d]", virtualRegister.toArgument()).impl(); + return ""; } +namespace { + +struct VerifyCapturedDef { + void operator()(CodeBlock* codeBlock, Instruction* instruction, OpcodeID opcodeID, int operand) + { + unsigned bytecodeOffset = instruction - codeBlock->instructions().begin(); + + if (codeBlock->isConstantRegisterIndex(operand)) { + codeBlock->beginValidationDidFail(); + dataLog(" At bc#", bytecodeOffset, " encountered a definition of a constant.\n"); + codeBlock->endValidationDidFail(); + return; + } + + switch (opcodeID) { + case op_enter: + case op_captured_mov: + case op_init_lazy_reg: + case op_create_arguments: + case op_new_captured_func: + return; + default: + break; + } + + VirtualRegister virtualReg(operand); + if (!virtualReg.isLocal()) + return; + + if (codeBlock->captureCount() && codeBlock->symbolTable()->isCaptured(operand)) { + codeBlock->beginValidationDidFail(); + dataLog(" At bc#", bytecodeOffset, " encountered invalid assignment to captured variable loc", virtualReg.toLocal(), ".\n"); + codeBlock->endValidationDidFail(); + return; + } + + return; + } +}; + +} // anonymous namespace + +void CodeBlock::validate() +{ + BytecodeLivenessAnalysis liveness(this); // Compute directly from scratch so it doesn't effect CodeBlock footprint. + + FastBitVector liveAtHead = liveness.getLivenessInfoAtBytecodeOffset(0); + + if (liveAtHead.numBits() != static_cast(m_numCalleeRegisters)) { + beginValidationDidFail(); + dataLog(" Wrong number of bits in result!\n"); + dataLog(" Result: ", liveAtHead, "\n"); + dataLog(" Bit count: ", liveAtHead.numBits(), "\n"); + endValidationDidFail(); + } + + for (unsigned i = m_numCalleeRegisters; i--;) { + bool isCaptured = false; + VirtualRegister reg = virtualRegisterForLocal(i); + + if (captureCount()) + isCaptured = reg.offset() <= captureStart() && reg.offset() > captureEnd(); + + if (isCaptured) { + if (!liveAtHead.get(i)) { + beginValidationDidFail(); + dataLog(" Variable loc", i, " is expected to be live because it is captured, but it isn't live.\n"); + dataLog(" Result: ", liveAtHead, "\n"); + endValidationDidFail(); + } + } else { + if (liveAtHead.get(i)) { + beginValidationDidFail(); + dataLog(" Variable loc", i, " is expected to be dead.\n"); + dataLog(" Result: ", liveAtHead, "\n"); + endValidationDidFail(); + } + } + } + + for (unsigned bytecodeOffset = 0; bytecodeOffset < instructions().size();) { + Instruction* currentInstruction = instructions().begin() + bytecodeOffset; + OpcodeID opcodeID = m_vm->interpreter->getOpcodeID(currentInstruction->u.opcode); + + VerifyCapturedDef verifyCapturedDef; + computeDefsForBytecodeOffset(this, bytecodeOffset, verifyCapturedDef); + + bytecodeOffset += opcodeLength(opcodeID); + } +} + +void CodeBlock::beginValidationDidFail() +{ + dataLog("Validation failure in ", *this, ":\n"); + dataLog("\n"); +} + +void CodeBlock::endValidationDidFail() +{ + dataLog("\n"); + dumpBytecode(); + dataLog("\n"); + dataLog("Validation failure.\n"); + RELEASE_ASSERT_NOT_REACHED(); +} + +void CodeBlock::addBreakpoint(unsigned numBreakpoints) +{ + m_numBreakpoints += numBreakpoints; + ASSERT(m_numBreakpoints); + if (JITCode::isOptimizingJIT(jitType())) + jettison(Profiler::JettisonDueToDebuggerBreakpoint); +} + +void CodeBlock::setSteppingMode(CodeBlock::SteppingMode mode) +{ + m_steppingMode = mode; + if (mode == SteppingModeEnabled && JITCode::isOptimizingJIT(jitType())) + jettison(Profiler::JettisonDueToDebuggerStepping); +} + +RareCaseProfile* CodeBlock::rareCaseProfileForBytecodeOffset(int bytecodeOffset) +{ + return tryBinarySearch( + m_rareCaseProfiles, m_rareCaseProfiles.size(), bytecodeOffset, + getRareCaseProfileBytecodeOffset); +} + +#if ENABLE(JIT) +DFG::CapabilityLevel CodeBlock::capabilityLevel() +{ + DFG::CapabilityLevel result = capabilityLevelInternal(); + m_capabilityLevelState = result; + return result; +} +#endif + } // namespace JSC