Changeset 36809 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Sep 23, 2008, 11:37:18 AM (17 years ago)

Author:

[email protected]

Message:

2008-09-23 Kevin McCullough <​[email protected]>

Reviewed by Darin.

Bug 21030: The JS debugger breaks on the do of a do-while not the while
(where the conditional statement is)
​https://bugs.webkit.org/show_bug.cgi?id=21030
Now the statementListEmitCode detects if a do-while node is being
emited and emits the debug hook on the last line instead of the first.

This change had no effect on sunspider.

• kjs/nodes.cpp: (JSC::statementListEmitCode):
• kjs/nodes.h: (JSC::StatementNode::isDoWhile): (JSC::DoWhileNode::isDoWhile):

Location:

trunk/JavaScriptCore/kjs

Files:

• nodes.cpp (modified) (1 diff)
• nodes.h (modified) (2 diffs)

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -1085 +1085 @@
     for (StatementVector::iterator it = statements.begin(); it != end; ++it) {
         StatementNode* n = it->get();
-        generator.emitDebugHook(WillExecuteStatement, n->firstLine(), n->lastLine());
+        generator.emitDebugHook(WillExecuteStatement, n->isDoWhile() ? n->lastLine() : n->firstLine(), n->lastLine());
         generator.emitNode(dst, n);
     }

trunk/JavaScriptCore/kjs/nodes.h

@@ -235 +235 @@
 
         virtual bool isBlock() const JSC_FAST_CALL { return false; }
+        virtual bool isDoWhile() const JSC_FAST_CALL { return false; }
     protected:
         LabelStack m_labelStack;
@@ -1937 +1938 @@
         virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
 
+        virtual bool isDoWhile() const JSC_FAST_CALL { return true; }
     private:
         RefPtr<StatementNode> m_statement;