From 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 7 May 2012 11:21:11 +0200 Subject: Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286) --- Source/JavaScriptCore/bytecode/CodeBlock.cpp | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'Source/JavaScriptCore/bytecode/CodeBlock.cpp') diff --git a/Source/JavaScriptCore/bytecode/CodeBlock.cpp b/Source/JavaScriptCore/bytecode/CodeBlock.cpp index 20972cc63..7b828acab 100644 --- a/Source/JavaScriptCore/bytecode/CodeBlock.cpp +++ b/Source/JavaScriptCore/bytecode/CodeBlock.cpp @@ -1248,17 +1248,6 @@ void CodeBlock::dump(ExecState* exec, const Vector::const_iterator& dataLog("[%4d] throw_reference_error\t %s\n", location, constantName(exec, k0, getConstant(k0)).data()); break; } - case op_jsr: { - int retAddrDst = (++it)->u.operand; - int offset = (++it)->u.operand; - dataLog("[%4d] jsr\t\t %s, %d(->%d)\n", location, registerName(exec, retAddrDst).data(), offset, location + offset); - break; - } - case op_sret: { - int retAddrSrc = (++it)->u.operand; - dataLog("[%4d] sret\t\t %s\n", location, registerName(exec, retAddrSrc).data()); - break; - } case op_debug: { int debugHookID = (++it)->u.operand; int firstLine = (++it)->u.operand; @@ -1443,6 +1432,7 @@ CodeBlock::CodeBlock(CopyParsedBlockTag, CodeBlock& other, SymbolTable* symTab) , m_symbolTable(symTab) , m_speculativeSuccessCounter(0) , m_speculativeFailCounter(0) + , m_forcedOSRExitCounter(0) , m_optimizationDelayCounter(0) , m_reoptimizationRetryCounter(0) #if ENABLE(JIT) @@ -1765,7 +1755,7 @@ void CodeBlock::finalizeUnconditionally() Interpreter* interpreter = m_globalData->interpreter; // interpreter->classicEnabled() returns true if the old C++ interpreter is enabled. If that's enabled // then we're not using LLInt. - if (!interpreter->classicEnabled()) { + if (!interpreter->classicEnabled() && !!numberOfInstructions()) { for (size_t size = m_propertyAccessInstructions.size(), i = 0; i < size; ++i) { Instruction* curInstruction = &instructions()[m_propertyAccessInstructions[i]]; switch (interpreter->getOpcodeID(curInstruction[0].u.opcode)) { @@ -1936,7 +1926,7 @@ void CodeBlock::stronglyVisitStrongReferences(SlotVisitor& visitor) for (size_t i = 0; i < m_functionDecls.size(); ++i) visitor.append(&m_functionDecls[i]); #if ENABLE(CLASSIC_INTERPRETER) - if (m_globalData->interpreter->classicEnabled()) { + if (m_globalData->interpreter->classicEnabled() && !!numberOfInstructions()) { for (size_t size = m_propertyAccessInstructions.size(), i = 0; i < size; ++i) visitStructures(visitor, &instructions()[m_propertyAccessInstructions[i]]); for (size_t size = m_globalResolveInstructions.size(), i = 0; i < size; ++i) -- cgit v1.2.1