Changeset 38047 in webkit for trunk/JavaScriptCore/VM/CodeGenerator.h

Timestamp:

Oct 31, 2008, 12:59:08 PM (17 years ago)

Author:

[email protected]

Message:

2008-10-30 Geoffrey Garen <​[email protected]>

Reviewed by Oliver Hunt.

Fixed a small bit of ​https://bugs.webkit.org/show_bug.cgi?id=21962
AST uses way too much memory

Removed a word from StatementNode by nixing LabelStack and turning it
into a compile-time data structure managed by CodeGenerator.

v8 tests and SunSpider, run by Gavin, report no change.

• GNUmakefile.am:
• JavaScriptCore.order:
• JavaScriptCore.pri:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• kjs/AllInOneFile.cpp:
• JavaScriptCoreSources.bkl: I sure hope this builds!

• VM/CodeGenerator.cpp: (JSC::CodeGenerator::CodeGenerator): (JSC::CodeGenerator::newLabelScope): (JSC::CodeGenerator::breakTarget): (JSC::CodeGenerator::continueTarget):
• VM/CodeGenerator.h: Nixed the JumpContext system because it depended on a LabelStack in the AST, and it was a little cumbersome on the client side. Replaced with LabelScope, which tracks all break / continue information in the CodeGenerator, just like we track LabelIDs and other stacks of compile-time data.

• kjs/LabelScope.h: Added. (JSC::LabelScope::): (JSC::LabelScope::LabelScope): (JSC::LabelScope::ref): (JSC::LabelScope::deref): (JSC::LabelScope::refCount): (JSC::LabelScope::breakTarget): (JSC::LabelScope::continueTarget): (JSC::LabelScope::type): (JSC::LabelScope::name): (JSC::LabelScope::scopeDepth): Simple abstraction for holding everything you might want to know about a break-able / continue-able scope.

• kjs/LabelStack.cpp: Removed.
• kjs/LabelStack.h: Removed.

• kjs/grammar.y: No need to push labels at parse time -- we don't store LabelStacks in the AST anymore.

• kjs/nodes.cpp: (JSC::DoWhileNode::emitCode): (JSC::WhileNode::emitCode): (JSC::ForNode::emitCode): (JSC::ForInNode::emitCode): (JSC::ContinueNode::emitCode): (JSC::BreakNode::emitCode): (JSC::SwitchNode::emitCode): (JSC::LabelNode::emitCode):
• kjs/nodes.h: (JSC::StatementNode::): (JSC::LabelNode::): Use LabelScope where we used to use JumpContext. Simplified a bunch of code. Touched up label-related error messages a bit.

• kjs/nodes2string.cpp: (JSC::LabelNode::streamTo): Updated for rename.

File:

• trunk/JavaScriptCore/VM/CodeGenerator.h (modified) (6 diffs)

trunk/JavaScriptCore/VM/CodeGenerator.h

@@ -35 +35 @@
 #include "Instruction.h"
 #include "LabelID.h"
+#include "LabelScope.h"
 #include "Machine.h"
 #include "RegisterID.h"
@@ -49 +50 @@
     class ScopeChain;
     class ScopeNode;
-
-    // JumpContexts are used to track entry and exit points for javascript loops and switch statements
-    struct JumpContext {
-        LabelStack* labels;
-        LabelID* continueTarget;
-        LabelID* breakTarget;
-        int scopeDepth;
-        bool isValidUnlabeledBreakTarget;
-    };
 
     struct FinallyContext {
@@ -158 +150 @@
         }
 
+        PassRefPtr<LabelScope> newLabelScope(LabelScope::Type, const Identifier* = 0);
         PassRefPtr<LabelID> newLabel();
 
@@ -310 +303 @@
         void pushFinallyContext(LabelID* target, RegisterID* returnAddrDst);
         void popFinallyContext();
-        bool inContinueContext() { return m_continueDepth > 0; };
-        bool inJumpContext() { return m_jumpContextStack.size() > 0; };
-        void pushJumpContext(LabelStack*, LabelID* continueTarget, LabelID* breakTarget, bool isValidUnlabeledBreakTarget);
-        void popJumpContext();
-        JumpContext* jumpContextForContinue(const Identifier&);
-        JumpContext* jumpContextForBreak(const Identifier&);
+
+        LabelScope* breakTarget(const Identifier&);
+        LabelScope* continueTarget(const Identifier&);
 
         void beginSwitch(RegisterID*, SwitchInfo::SwitchType);
@@ -426 +416 @@
         SegmentedVector<RegisterID, 512> m_parameters;
         SegmentedVector<RegisterID, 512> m_globals;
-        SegmentedVector<LabelID, 512> m_labels;
+        SegmentedVector<LabelScope, 256> m_labelScopes;
+        SegmentedVector<LabelID, 256> m_labels;
         RefPtr<RegisterID> m_lastConstant;
         int m_finallyDepth;
@@ -432 +423 @@
         CodeType m_codeType;
 
-        Vector<JumpContext> m_jumpContextStack;
-        int m_continueDepth;
         Vector<ControlFlowContext> m_scopeContextStack;
         Vector<SwitchInfo> m_switchContextStack;