Skip to content

Commit dcb85ac

Browse files
committed
fix stepping over ExpressionStatementNodes
1 parent 9370a6e commit dcb85ac

File tree

2 files changed

+2
-18
lines changed

2 files changed

+2
-18
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/expression/ExpressionNode.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ public static final class ExpressionStatementNode extends StatementNode {
6565

6666
private ExpressionStatementNode(ExpressionNode node) {
6767
this.node = node;
68+
this.assignSourceSection(node.getSourceSection());
6869
}
6970

7071
@Override
@@ -89,6 +90,7 @@ public static final class ExpressionWithSideEffects extends ExpressionNode {
8990
private ExpressionWithSideEffects(ExpressionNode node, StatementNode sideEffect) {
9091
this.node = node;
9192
this.sideEffect = sideEffect;
93+
this.assignSourceSection(node.getSourceSection());
9294
}
9395

9496
@Override

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/StatementNode.java

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
package com.oracle.graal.python.nodes.statement;
2727

2828
import com.oracle.graal.python.nodes.PNode;
29-
import com.oracle.graal.python.nodes.expression.ExpressionNode;
3029
import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
3130
import com.oracle.truffle.api.frame.VirtualFrame;
3231
import com.oracle.truffle.api.instrumentation.GenerateWrapper;
@@ -44,23 +43,6 @@ public abstract class StatementNode extends PNode {
4443

4544
public abstract void executeVoid(VirtualFrame frame);
4645

47-
private static final class ExprStatementNode extends StatementNode {
48-
@Child private ExpressionNode expressionNode;
49-
50-
private ExprStatementNode(ExpressionNode expressionNode) {
51-
this.expressionNode = expressionNode;
52-
}
53-
54-
@Override
55-
public void executeVoid(VirtualFrame frame) {
56-
expressionNode.execute(frame);
57-
}
58-
}
59-
60-
public StatementNode createStatementFromExpression(ExpressionNode node) {
61-
return new ExprStatementNode(node);
62-
}
63-
6446
public void markAsTryBlock() {
6547
isTryBlock = true;
6648
}

0 commit comments

Comments
 (0)