Changeset 36270 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Sep 8, 2008, 1:26:20 PM (17 years ago)

Author:

[email protected]

Message:

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

Reviewed by Geoff.

<rdar://problem/6134407> Breakpoints in for loops, while loops or
conditions without curly braces don't break. (19306)
-Statement Lists already emit debug hooks but conditionals without
brackets are not lists.

• kjs/nodes.cpp: (KJS::IfNode::emitCode): (KJS::IfElseNode::emitCode): (KJS::DoWhileNode::emitCode): (KJS::WhileNode::emitCode): (KJS::ForNode::emitCode): (KJS::ForInNode::emitCode):
• kjs/nodes.h: (KJS::StatementNode::): (KJS::BlockNode::):

Location:

trunk/JavaScriptCore/kjs

Files:

• nodes.cpp (modified) (7 diffs)
• nodes.h (modified) (2 diffs)

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -1139 +1139 @@
     generator.emitJumpIfFalse(cond, afterThen.get());
 
+    if (!m_ifBlock->isBlock())
+        generator.emitDebugHook(WillExecuteStatement, m_ifBlock->firstLine(), m_ifBlock->lastLine());
+
     generator.emitNode(dst, m_ifBlock.get());
     generator.emitLabel(afterThen.get());
@@ -1154 +1157 @@
     generator.emitJumpIfFalse(cond, beforeElse.get());
 
+    if (!m_ifBlock->isBlock())
+        generator.emitDebugHook(WillExecuteStatement, m_ifBlock->firstLine(), m_ifBlock->lastLine());
+
     generator.emitNode(dst, m_ifBlock.get());
     generator.emitJump(afterElse.get());
@@ -1172 +1178 @@
     RefPtr<LabelID> topOfLoop = generator.newLabel();
     generator.emitLabel(topOfLoop.get());
+
+    if (!m_statement->isBlock())
+        generator.emitDebugHook(WillExecuteStatement, m_statement->firstLine(), m_statement->lastLine());
 
     RefPtr<LabelID> continueTarget = generator.newLabel();
@@ -1183 +1192 @@
     RegisterID* cond = generator.emitNode(m_expr.get());
     generator.emitJumpIfTrue(cond, topOfLoop.get());
+
     generator.emitLabel(breakTarget.get());
     return result.get();
@@ -1197 +1207 @@
     generator.emitJump(continueTarget.get());
     generator.emitLabel(topOfLoop.get());
+
+    if (!m_statement->isBlock())
+        generator.emitDebugHook(WillExecuteStatement, m_statement->firstLine(), m_statement->lastLine());
     
     generator.pushJumpContext(&m_labelStack, continueTarget.get(), breakTarget.get(), true);
@@ -1240 +1253 @@
         generator.emitJump(topOfLoop.get());
     }
+
+    if (!m_statement->isBlock())
+        generator.emitDebugHook(WillExecuteStatement, m_statement->firstLine(), m_statement->lastLine());
+
     generator.emitLabel(breakTarget.get());
     return result.get();
@@ -1322 +1339 @@
     generator.emitNode(dst, m_statement.get());
     generator.popJumpContext();
+
+    if (!m_statement->isBlock())
+        generator.emitDebugHook(WillExecuteStatement, m_statement->firstLine(), m_statement->lastLine());
 
     generator.emitLabel(continueTarget.get());

trunk/JavaScriptCore/kjs/nodes.h

@@ -234 +234 @@
         virtual bool isEmptyStatement() const JSC_FAST_CALL { return false; }
 
+        virtual bool isBlock() const KJS_FAST_CALL { return false; }
     protected:
         LabelStack m_labelStack;
@@ -1827 +1828 @@
         StatementVector& children() { return m_children; }
 
+        virtual bool isBlock() const KJS_FAST_CALL { return true; }
     protected:
         StatementVector m_children;