commit f7f6c33ed420033a023d2d1dd095d7157ce03d45
author Eric Milles <eric.milles@thomsonreuters.com> Thu Jan 23 12:32:29 2020 -0600
committer Eric Milles <eric.milles@thomsonreuters.com> Thu Jan 23 12:32:29 2020 -0600
tree 7f232546434b77f06364e93e846f75b294324a7f
parent a54966c7bcbb7d756aa2022e777156d7fdc07804

do not add null statement label

src/main/java/org/codehaus/groovy/classgen/ReturnAdder.java

diff --git a/src/main/java/org/codehaus/groovy/classgen/ReturnAdder.java b/src/main/java/org/codehaus/groovy/classgen/ReturnAdder.java
index 866d8cf..0a675f6 100644
--- a/src/main/java/org/codehaus/groovy/classgen/ReturnAdder.java
+++ b/src/main/java/org/codehaus/groovy/classgen/ReturnAdder.java
@@ -40,6 +40,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 
 /**
  * Utility class to add return statements.
@@ -131,7 +132,9 @@
         if (statement instanceof ExpressionStatement) {
             Expression expression = ((ExpressionStatement) statement).getExpression();
             ReturnStatement returnStatement = new ReturnStatement(expression);
-            returnStatement.setStatementLabel(statement.getStatementLabel());
+            Optional.ofNullable(statement.getStatementLabels()).ifPresent(labels -> {
+                labels.forEach(returnStatement::addStatementLabel);
+            });
             returnStatement.setSourcePosition(statement);
             listener.returnStatementAdded(returnStatement);
             return returnStatement;
@@ -191,7 +194,9 @@
             BlockStatement blockStatement = (BlockStatement) statement;
             if (blockStatement.isEmpty()) {
                 ReturnStatement returnStatement = new ReturnStatement(ConstantExpression.NULL);
-                returnStatement.setStatementLabel(blockStatement.getStatementLabel());
+                Optional.ofNullable(blockStatement.getStatementLabels()).ifPresent(labels -> {
+                    labels.forEach(returnStatement::addStatementLabel);
+                });
                 returnStatement.setSourcePosition(blockStatement);
                 listener.returnStatementAdded(returnStatement);
                 return returnStatement;