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

Timestamp:

Feb 8, 2008, 5:13:46 PM (17 years ago)

Author:

Darin Adler

Message:

JavaScriptCore:

Reviewed by Oliver.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=17247 Labelled continue/break can fail in some cases

Test: fast/js/continue-break-multiple-labels.html

• kjs/nodes.h: (KJS::StatementNode::pushLabel): Made this virtual. (KJS::LabelNode::pushLabel): Forward pushLabel calls to the statement inside.

LayoutTests:

• test for ​http://bugs.webkit.org/show_bug.cgi?id=17247 Labelled continue/break can fail in some cases

• fast/js/continue-break-multiple-labels-expected.txt: Added.
• fast/js/continue-break-multiple-labels.html: Added.

File:

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

trunk/JavaScriptCore/kjs/nodes.h

@@ -215 +215 @@
         int lastLine() const KJS_FAST_CALL { return m_lastLine; }
         virtual JSValue* execute(ExecState *exec) KJS_FAST_CALL = 0;
-        void pushLabel(const Identifier& ident) KJS_FAST_CALL { m_labelStack.push(ident); }
+        virtual void pushLabel(const Identifier& ident) KJS_FAST_CALL { m_labelStack.push(ident); }
         virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
         virtual bool isEmptyStatement() const KJS_FAST_CALL { return false; }
@@ -2568 +2568 @@
             : m_label(label)
             , m_statement(statement)
-    {
-    }
+        {
+        }
 
         virtual void optimizeVariableAccess(const SymbolTable&, const LocalStorage&, NodeStack&) KJS_FAST_CALL;
         virtual JSValue* execute(ExecState*) KJS_FAST_CALL;
         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
+        virtual void pushLabel(const Identifier& ident) KJS_FAST_CALL { m_statement->pushLabel(ident); }
 
     private: