You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by em...@apache.org on 2022/02/22 19:29:16 UTC
[groovy] 03/03: remove dead code
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch GROOVY_2_5_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit ba312d394d4f1c00124f4704b629d59ad1c23fd5
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Tue Feb 22 13:25:55 2022 -0600
remove dead code
---
.../org/codehaus/groovy/classgen/ReturnAdder.java | 27 +++-------------------
1 file changed, 3 insertions(+), 24 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/classgen/ReturnAdder.java b/src/main/java/org/codehaus/groovy/classgen/ReturnAdder.java
index 628d0bd..b4abcf3 100644
--- a/src/main/java/org/codehaus/groovy/classgen/ReturnAdder.java
+++ b/src/main/java/org/codehaus/groovy/classgen/ReturnAdder.java
@@ -84,30 +84,9 @@ public class ReturnAdder {
public void visitMethod(MethodNode node) {
Statement statement = node.getCode();
- if (!node.isVoidMethod()) {
- if (statement != null) // it happens with @interface methods
- {
- final Statement code = addReturnsIfNeeded(statement, node.getVariableScope());
- if (doAdd) node.setCode(code);
- }
- } else if (!node.isAbstract() && node.getReturnType().redirect()!=ClassHelper.VOID_TYPE) {
- if (!(statement instanceof BytecodeSequence)) {
- BlockStatement newBlock = new BlockStatement();
- Statement code = node.getCode();
- if (code instanceof BlockStatement) {
- newBlock.setVariableScope(((BlockStatement) code).getVariableScope());
- }
- if (statement instanceof BlockStatement) {
- newBlock.addStatements(((BlockStatement)statement).getStatements());
- } else {
- newBlock.addStatement(statement);
- }
- final ReturnStatement returnStatement = ReturnStatement.RETURN_NULL_OR_VOID;
- listener.returnStatementAdded(returnStatement);
- newBlock.addStatement(returnStatement);
- newBlock.setSourcePosition(statement);
- if (doAdd) node.setCode(newBlock);
- }
+ if (statement != null && !node.isVoidMethod()) {
+ statement = addReturnsIfNeeded(statement, node.getVariableScope());
+ if (doAdd) node.setCode(statement);
}
}