Commit 272cb785 authored by barraclough@apple.com's avatar barraclough@apple.com

Removed redundant code from BytecodeGenerator.

Rubber stamped by Sam Weinig.

* bytecompiler/BytecodeGenerator.cpp:
* bytecompiler/BytecodeGenerator.h:
    - delete uncalled code missed when reparsing was removed.



git-svn-id: svn://svn.chromium.org/blink/trunk@81153 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent f0a2eb50
2011-03-15 Gavin Barraclough <barraclough@apple.com>
Rubber stamped by Sam Weinig.
Removed redundant code from BytecodeGenerator.
* bytecompiler/BytecodeGenerator.cpp:
* bytecompiler/BytecodeGenerator.h:
- delete uncalled code missed when reparsing was removed.
2011-03-15 Kevin Ollivier <kevino@theolliviers.com> 2011-03-15 Kevin Ollivier <kevino@theolliviers.com>
Reviewed by Darin Adler. Reviewed by Darin Adler.
......
...@@ -224,8 +224,6 @@ BytecodeGenerator::BytecodeGenerator(ProgramNode* programNode, ScopeChainNode* s ...@@ -224,8 +224,6 @@ BytecodeGenerator::BytecodeGenerator(ProgramNode* programNode, ScopeChainNode* s
#endif #endif
, m_stack(m_globalData->stack()) , m_stack(m_globalData->stack())
, m_usesExceptions(false) , m_usesExceptions(false)
, m_regeneratingForExceptionInfo(false)
, m_codeBlockBeingRegeneratedFrom(0)
, m_expressionTooDeep(false) , m_expressionTooDeep(false)
{ {
if (m_shouldEmitDebugHooks) if (m_shouldEmitDebugHooks)
...@@ -325,8 +323,6 @@ BytecodeGenerator::BytecodeGenerator(FunctionBodyNode* functionBody, ScopeChainN ...@@ -325,8 +323,6 @@ BytecodeGenerator::BytecodeGenerator(FunctionBodyNode* functionBody, ScopeChainN
#endif #endif
, m_stack(m_globalData->stack()) , m_stack(m_globalData->stack())
, m_usesExceptions(false) , m_usesExceptions(false)
, m_regeneratingForExceptionInfo(false)
, m_codeBlockBeingRegeneratedFrom(0)
, m_expressionTooDeep(false) , m_expressionTooDeep(false)
{ {
if (m_shouldEmitDebugHooks) if (m_shouldEmitDebugHooks)
...@@ -491,8 +487,6 @@ BytecodeGenerator::BytecodeGenerator(EvalNode* evalNode, ScopeChainNode* scopeCh ...@@ -491,8 +487,6 @@ BytecodeGenerator::BytecodeGenerator(EvalNode* evalNode, ScopeChainNode* scopeCh
#endif #endif
, m_stack(m_globalData->stack()) , m_stack(m_globalData->stack())
, m_usesExceptions(false) , m_usesExceptions(false)
, m_regeneratingForExceptionInfo(false)
, m_codeBlockBeingRegeneratedFrom(0)
, m_expressionTooDeep(false) , m_expressionTooDeep(false)
{ {
if (m_shouldEmitDebugHooks || m_baseScopeDepth) if (m_shouldEmitDebugHooks || m_baseScopeDepth)
...@@ -1201,13 +1195,6 @@ RegisterID* BytecodeGenerator::emitResolve(RegisterID* dst, const Identifier& pr ...@@ -1201,13 +1195,6 @@ RegisterID* BytecodeGenerator::emitResolve(RegisterID* dst, const Identifier& pr
if (globalObject) { if (globalObject) {
bool forceGlobalResolve = false; bool forceGlobalResolve = false;
if (m_regeneratingForExceptionInfo) {
#if ENABLE(JIT)
forceGlobalResolve = m_codeBlockBeingRegeneratedFrom->hasGlobalResolveInfoAtBytecodeOffset(instructions().size());
#else
forceGlobalResolve = m_codeBlockBeingRegeneratedFrom->hasGlobalResolveInstructionAtBytecodeOffset(instructions().size());
#endif
}
if (index != missingSymbolMarker() && !forceGlobalResolve && !requiresDynamicChecks) { if (index != missingSymbolMarker() && !forceGlobalResolve && !requiresDynamicChecks) {
// Directly index the property lookup across multiple scopes. // Directly index the property lookup across multiple scopes.
...@@ -1344,13 +1331,6 @@ RegisterID* BytecodeGenerator::emitResolveWithBase(RegisterID* baseDst, Register ...@@ -1344,13 +1331,6 @@ RegisterID* BytecodeGenerator::emitResolveWithBase(RegisterID* baseDst, Register
} }
bool forceGlobalResolve = false; bool forceGlobalResolve = false;
if (m_regeneratingForExceptionInfo) {
#if ENABLE(JIT)
forceGlobalResolve = m_codeBlockBeingRegeneratedFrom->hasGlobalResolveInfoAtBytecodeOffset(instructions().size());
#else
forceGlobalResolve = m_codeBlockBeingRegeneratedFrom->hasGlobalResolveInstructionAtBytecodeOffset(instructions().size());
#endif
}
// Global object is the base // Global object is the base
emitLoad(baseDst, JSValue(globalObject)); emitLoad(baseDst, JSValue(globalObject));
......
...@@ -396,12 +396,6 @@ namespace JSC { ...@@ -396,12 +396,6 @@ namespace JSC {
CodeType codeType() const { return m_codeType; } CodeType codeType() const { return m_codeType; }
void setRegeneratingForExceptionInfo(CodeBlock* originalCodeBlock)
{
m_regeneratingForExceptionInfo = true;
m_codeBlockBeingRegeneratedFrom = originalCodeBlock;
}
bool shouldEmitProfileHooks() { return m_shouldEmitProfileHooks; } bool shouldEmitProfileHooks() { return m_shouldEmitProfileHooks; }
bool isStrictMode() const { return m_codeBlock->isStrictMode(); } bool isStrictMode() const { return m_codeBlock->isStrictMode(); }
...@@ -577,8 +571,6 @@ namespace JSC { ...@@ -577,8 +571,6 @@ namespace JSC {
StackBounds m_stack; StackBounds m_stack;
bool m_usesExceptions; bool m_usesExceptions;
bool m_regeneratingForExceptionInfo;
CodeBlock* m_codeBlockBeingRegeneratedFrom;
bool m_expressionTooDeep; bool m_expressionTooDeep;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment