Changeset 13304 in webkit for trunk/JavaScriptCore/kjs/nodes.h

Timestamp:

Mar 15, 2006, 2:21:48 AM (19 years ago)

Author:

mjs

Message:

Reviewed by Anders.

• KJS::Node and KJS::StatementNode are bigger than they need to be ​http://bugzilla.opendarwin.org/show_bug.cgi?id=7775

The memory usage of Node was reduced by 2 machine words per node:

• sourceURL was removed and only kept on FunctionBodyNode. The source URL can only be distinct per function or top-level program node, and you always have one.

• refcount was removed and kept in a separate hashtable when greater than 1. newNodes set represents floating nodes with refcount of 0. This helps because almost all nodes have a refcount of 1 for almost all of their lifetime.

• bindings/runtime_method.cpp: (RuntimeMethod::RuntimeMethod): Pass null body, added FIXME.
• kjs/Parser.cpp: (KJS::clearNewNodes): New nodes are tracked in nodes.cpp now, but still clear them at the appropriate time.
• kjs/context.h: (KJS::ContextImp::currentBody): added; used to retrieve source URL and sid for current code. (KJS::ContextImp::pushIteration): moved here from LabelStack (KJS::ContextImp::popIteration): ditto (KJS::ContextImp::inIteration): ditto (KJS::ContextImp::pushSwitch): ditto (KJS::ContextImp::popSwitch): ditto (KJS::ContextImp::inSwitch): ditto
• kjs/function.cpp: (KJS::FunctionImp::FunctionImp): Add FunctionBodyNode* parameter. (KJS::FunctionImp::callAsFunction): Pass body to ContextImp. (KJS::FunctionImp::argumentsGetter): _context renamed to m_context. (KJS::DeclaredFunctionImp::DeclaredFunctionImp): Pass body to superclass constructor. (KJS::GlobalFuncImp::callAsFunction): Pass progNode as body for ContextImp in eval.
• kjs/function.h: Move body field from DeclaredFunctionImp to FunctionImp.
• kjs/grammar.y: Change DBG; statements no longer have a sourceid.
• kjs/internal.cpp: (KJS::ContextImp::ContextImp): Initialize new m_currentBody, m_iterationDepth and m_switchDepth data members. New FunctionBodyNode* parameter - the function body provides source URL and SourceId. (KJS::InterpreterImp::mark): Use exception() function, not _exception directly. (KJS::InterpreterImp::evaluate): Pass progNode to ContextImp constructor to use as the body.
• kjs/internal.h: (KJS::LabelStack::LabelStack): Remove iteration depth and switch depth; statement label stacks don't need these and it bloats their size. Put them in the ContextImp instead.
• kjs/interpreter.cpp: (KJS::ExecState::lexicalInterpreter): Renamed _context to m_context.
• kjs/interpreter.h: (KJS::ExecState::dynamicInterpreter): Renamed _context to m_context. (KJS::ExecState::context): ditto (KJS::ExecState::setException): Renamed _exception to m_exception (KJS::ExecState::clearException): ditto (KJS::ExecState::exception): ditto (KJS::ExecState::hadException): ditto (KJS::ExecState::ExecState): ditto both above renames
• kjs/nodes.cpp: (Node::Node): Removed initialization of line, source URL and refcount. Add to local newNodes set instead of involving parser. (Node::ref): Instead of managing refcount directly, story refcount over 1 in a HashCountedSet, and keep a separate HashSet of "floating" nodes with refcount 0. (Node::deref): ditto (Node::refcount): ditto (Node::clearNewNodes): Destroy anything left in the new nodes set. (currentSourceId): Inline helper to get sourceId from function body via context. (currentSourceURL): ditto for sourceURL. (Node::createErrorCompletion): use new helper (Node::throwError): ditto (Node::setExceptionDetailsIfNeeded): ditto (StatementNode::StatementNode): remove initialization of l0 and sid, rename l1 to m_lastLine. (StatementNode::setLoc): Set own m_lastLine and Node's m_line. (StatementNode::hitStatement): Get sid, first line, last line in the proper new ways. (StatListNode::StatListNode): updated for setLoc changes (BlockNode::BlockNode): ditto (DoWhileNode::execute): excpect iteraton counts on ContextImp, not LabelStack (WhileNode::execute): ditto (ForNode::execute): ditto (ForInNode::execute): ditto (ContinueNode::execute): excpect inIteration on ContextImp, not LabelStack (BreakNode::execute): excpect inIteration and inSwitch on ContextImp, not LabelStack (SwitchNode::execute): expect switch counts on ContextImp, not LabelStack (FunctionBodyNode::FunctionBodyNode): update for new setLoc (FunctionBodyNode::processFuncDecl): reindent (SourceElementsNode::SourceElementsNode): update for new setLoc
• kjs/nodes.h: (KJS::Node::lineNo): Renamed _line to m_line (KJS::StatementNode::firstLine): Use lineNo() (KJS::StatementNode::lastLine): Renamed l1 to m_lastLine (KJS::FunctionBodyNode::sourceId): added (KJS::FunctionBodyNode::sourceURL): added
• kjs/testkjs.cpp:

File:

• trunk/JavaScriptCore/kjs/nodes.h (modified) (5 diffs)

trunk/JavaScriptCore/kjs/nodes.h

@@ -81 +81 @@
     virtual void streamTo(SourceStream &s) const = 0;
     virtual void processVarDecls(ExecState *) {}
-    int lineNo() const { return line; }
-
-    // reference counting mechanism
-    void ref() { ++m_refcount; }
-    void deref() { --m_refcount; if (!m_refcount) delete this; }
-    unsigned int refcount() { return m_refcount; }
+    int lineNo() const { return m_line; }
+
+    void ref();
+    void deref();
+    unsigned int refcount();
+    static void clearNewNodes();
 
     virtual Node *nodeInsideAllParens();
@@ -113 +113 @@
     void setExceptionDetailsIfNeeded(ExecState *);
 
-    int line;
-    UString sourceURL;
-    unsigned int m_refcount;
-    virtual int sourceId() const { return -1; }
-
+    int m_line;
   private:
     // disallow assignment
@@ -127 +123 @@
   public:
     StatementNode();
-    void setLoc(int line0, int line1, int sourceId);
-    int firstLine() const { return l0; }
-    int lastLine() const { return l1; }
-    int sourceId() const { return sid; }
+    void setLoc(int line0, int line1);
+    int firstLine() const { return lineNo(); }
+    int lastLine() const { return m_lastLine; }
     bool hitStatement(ExecState *exec);
     virtual Completion execute(ExecState *exec) = 0;
@@ -139 +134 @@
   private:
     JSValue *evaluate(ExecState */*exec*/) { return jsUndefined(); }
-    int l0, l1;
-    int sid;
+    int m_lastLine;
   };
 
@@ -1054 +1048 @@
   class FunctionBodyNode : public BlockNode {
   public:
-    FunctionBodyNode(SourceElementsNode *s);
-    void processFuncDecl(ExecState *exec);
+    FunctionBodyNode(SourceElementsNode *);
+    virtual void processFuncDecl(ExecState *exec);
+    int sourceId() { return m_sourceId; }
+    const UString& sourceURL() { return m_sourceURL; }
+  private:
+    UString m_sourceURL;
+    int m_sourceId;
   };