[groovy] 02/02: GROOVY-9459: Line number information for automatically inserted return statements slightly different for 2.5 vs 3.0 (provide fallback)

[pa...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit 5dd38b7207d4703c56b144ca482eb0c5a3621959
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri Mar 27 01:28:07 2020 +1000

    GROOVY-9459: Line number information for automatically inserted return statements slightly different for 2.5 vs 3.0 (provide fallback)
    
    If the approach now taken in 3.0 (which we believe is the preferred approach) would yield no line number info, fall back to the approach used for 2.5
---
 src/main/java/org/codehaus/groovy/classgen/ReturnAdder.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/codehaus/groovy/classgen/ReturnAdder.java b/src/main/java/org/codehaus/groovy/classgen/ReturnAdder.java
index f8f3bf4..b206c16 100644
--- a/src/main/java/org/codehaus/groovy/classgen/ReturnAdder.java
+++ b/src/main/java/org/codehaus/groovy/classgen/ReturnAdder.java
@@ -114,7 +114,7 @@ public class ReturnAdder {
             Expression expression = ((ExpressionStatement) statement).getExpression();
             ReturnStatement returnStatement = new ReturnStatement(expression);
             returnStatement.copyStatementLabels(statement);
-            returnStatement.setSourcePosition(statement);
+            returnStatement.setSourcePosition(statement.getLineNumber() < 0 ? expression : statement);
             listener.returnStatementAdded(returnStatement);
             return returnStatement;
         }