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 2020/01/23 20:06:02 UTC
[groovy] branch if-else-asm updated (1b60511 -> 28625b8)
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a change to branch if-else-asm
in repository https://gitbox.apache.org/repos/asf/groovy.git.
discard 1b60511 remove push/pop for if/else blocks
new 28625b8 remove push/pop for if/else blocks
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (1b60511)
\
N -- N -- N refs/heads/if-else-asm (28625b8)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
[groovy] 01/01: remove push/pop for if/else blocks
Posted by em...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch if-else-asm
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 28625b86d799ba2cbc8fc0fc345aa74499632a94
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Thu Jan 23 10:48:15 2020 -0600
remove push/pop for if/else blocks
if (boolVar) {
}
3 astore_1
4 iconst_0
5 istore_2 [boolVar]
6 iload_2 [boolVar] // excess from pushBooleanExpression()
7 pop // excess from pop()
8 iload_2 [boolVar]
---
.../org/codehaus/groovy/classgen/AsmClassGenerator.java | 7 ++-----
.../org/codehaus/groovy/classgen/asm/StatementWriter.java | 14 ++------------
2 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java b/src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java
index 0888a3b..6b9f4bc 100644
--- a/src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java
+++ b/src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java
@@ -814,12 +814,10 @@ public class AsmClassGenerator extends ClassGenerator {
@Override
public void visitBooleanExpression(final BooleanExpression expression) {
- controller.getCompileStack().pushBooleanExpression();
int mark = controller.getOperandStack().getStackLength();
- Expression inner = expression.getExpression();
- inner.visit(this);
+
+ expression.getExpression().visit(this);
controller.getOperandStack().castToBool(mark, true);
- controller.getCompileStack().pop();
}
@Override
@@ -839,7 +837,6 @@ public class AsmClassGenerator extends ClassGenerator {
@Override
public void visitConstructorCallExpression(final ConstructorCallExpression call) {
onLineNumber(call, "visitConstructorCallExpression: \"" + call.getType().getName() + "\":");
-
if (call.isSpecialCall()) {
controller.getInvocationWriter().writeSpecialConstructorCall(call);
return;
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/StatementWriter.java b/src/main/java/org/codehaus/groovy/classgen/asm/StatementWriter.java
index c40fdf8..d3512bf 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/StatementWriter.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/StatementWriter.java
@@ -36,7 +36,6 @@ import org.codehaus.groovy.ast.stmt.CaseStatement;
import org.codehaus.groovy.ast.stmt.CatchStatement;
import org.codehaus.groovy.ast.stmt.ContinueStatement;
import org.codehaus.groovy.ast.stmt.DoWhileStatement;
-import org.codehaus.groovy.ast.stmt.EmptyStatement;
import org.codehaus.groovy.ast.stmt.ExpressionStatement;
import org.codehaus.groovy.ast.stmt.ForStatement;
import org.codehaus.groovy.ast.stmt.IfStatement;
@@ -310,28 +309,19 @@ public class StatementWriter {
controller.getAcg().onLineNumber(statement, "visitIfElse");
writeStatementLabel(statement);
- MethodVisitor mv = controller.getMethodVisitor();
-
statement.getBooleanExpression().visit(controller.getAcg());
Label l0 = controller.getOperandStack().jump(IFEQ);
-
- // if-else is here handled as a special version
- // of a boolean expression
- controller.getCompileStack().pushBooleanExpression();
statement.getIfBlock().visit(controller.getAcg());
- controller.getCompileStack().pop();
- if (statement.getElseBlock() instanceof EmptyStatement) {
+ MethodVisitor mv = controller.getMethodVisitor();
+ if (statement.getElseBlock().isEmpty()) {
mv.visitLabel(l0);
} else {
Label l1 = new Label();
mv.visitJumpInsn(GOTO, l1);
mv.visitLabel(l0);
- controller.getCompileStack().pushBooleanExpression();
statement.getElseBlock().visit(controller.getAcg());
- controller.getCompileStack().pop();
-
mv.visitLabel(l1);
}
}