assign more source sections

Author: timfel

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

@@ -49,6 +49,7 @@
 import com.oracle.truffle.api.instrumentation.Tag;
 import com.oracle.truffle.api.nodes.NodeCost;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
+import com.oracle.truffle.api.source.SourceSection;
 
 /**
  * Base class for all expressions. Expressions always return a value.
@@ -141,7 +142,11 @@ public static final class ExpressionWithSideEffects extends ExpressionNode {
         private ExpressionWithSideEffects(ExpressionNode node, StatementNode sideEffect) {
             this.node = node;
             this.sideEffect = sideEffect;
-            this.assignSourceSection(node.getSourceSection());
+            SourceSection sourceSection = node.getSourceSection();
+            if (sourceSection == null) {
+                sourceSection = sideEffect.getSourceSection();
+            }
+            this.assignSourceSection(sourceSection);
         }
 
         @Override

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/PythonTreeTranslator.java

@@ -227,6 +227,7 @@ private SourceSection deriveSourceSection(RuleNode node) {
     public Object visitFile_input(Python3Parser.File_inputContext ctx) {
         environment.enterScope(ctx.scope);
         ExpressionNode file = asExpression(super.visitFile_input(ctx));
+        deriveSourceSection(ctx, file);
         environment.leaveScope();
         return factory.createModuleRoot(name, file, ctx.scope.getFrameDescriptor());
     }
@@ -247,6 +248,7 @@ public Object visitEval_input(Python3Parser.Eval_inputContext ctx) {
     public Object visitSingle_input(Python3Parser.Single_inputContext ctx) {
         environment.enterScope(ctx.scope);
         ExpressionNode body = asExpression(super.visitSingle_input(ctx));
+        deriveSourceSection(ctx, body);
         environment.leaveScope();
         if (isInlineMode) {
             return body;