From e862e8471aa8d2d8bb7f50d281a3832d8eb15e73 Mon Sep 17 00:00:00 2001 From: Alex Tkachman Date: Sun, 4 Sep 2011 08:55:06 +0200 Subject: [PATCH] micro code cleaning --- .../jetbrains/jet/codegen/ClassCodegen.java | 2 +- .../jet/codegen/ExpressionCodegen.java | 26 +++++++++---------- .../codegen/ImplementationBodyCodegen.java | 2 +- .../jet/codegen/intrinsics/Increment.java | 6 ++--- .../jetbrains/jet/codegen/intrinsics/Inv.java | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/idea/src/org/jetbrains/jet/codegen/ClassCodegen.java b/idea/src/org/jetbrains/jet/codegen/ClassCodegen.java index c7d6d88809f..97f0cd3dda7 100644 --- a/idea/src/org/jetbrains/jet/codegen/ClassCodegen.java +++ b/idea/src/org/jetbrains/jet/codegen/ClassCodegen.java @@ -59,7 +59,7 @@ public class ClassCodegen { v.anew(JetTypeMapper.TYPE_TYPEINFO); v.dup(); v.aconst(asmType); - v.aconst(isNullable); + v.iconst(isNullable?1:0); v.invokespecial("jet/typeinfo/TypeInfo", "", "(Ljava/lang/Class;Z)V"); } } diff --git a/idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java b/idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java index 8ac31b4188a..a05c53a0fc8 100644 --- a/idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java +++ b/idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java @@ -395,7 +395,7 @@ public class ExpressionCodegen extends JetVisitor { v.arraylength(); v.store(myLengthVar, Type.INT_TYPE); myIndexVar = myMap.enterTemp(); - v.aconst(0); + v.iconst(0); v.store(myIndexVar, Type.INT_TYPE); } @@ -1178,7 +1178,7 @@ public class ExpressionCodegen extends JetVisitor { Label end = new Label(); v.goTo(end); v.mark(ifFalse); - v.aconst(false); + v.iconst(0); v.mark(end); return StackValue.onStack(Type.BOOLEAN_TYPE); } @@ -1191,7 +1191,7 @@ public class ExpressionCodegen extends JetVisitor { Label end = new Label(); v.goTo(end); v.mark(ifTrue); - v.aconst(true); + v.iconst(1); v.mark(end); return StackValue.onStack(Type.BOOLEAN_TYPE); } @@ -1243,11 +1243,11 @@ public class ExpressionCodegen extends JetVisitor { v.ifnull(bothNull); v.mark(leftNull); v.pop2(); - v.aconst(Boolean.FALSE); + v.iconst(0); v.goTo(end); v.mark(bothNull); v.pop2(); - v.aconst(Boolean.TRUE); + v.iconst(1); v.mark(end); final StackValue onStack = StackValue.onStack(Type.BOOLEAN_TYPE); @@ -1305,7 +1305,7 @@ public class ExpressionCodegen extends JetVisitor { private StackValue compareExpressionsOnStack(IElementType opToken, Type operandType) { if (operandType.getSort() == Type.OBJECT) { v.invokeinterface(CLASS_COMPARABLE, "compareTo", "(Ljava/lang/Object;)I"); - v.aconst(0); + v.iconst(0); operandType = Type.INT_TYPE; } return StackValue.cmp(opToken, operandType); @@ -1438,18 +1438,18 @@ public class ExpressionCodegen extends JetVisitor { value.put(asmType, v); if (asmType == Type.LONG_TYPE) { //noinspection UnnecessaryBoxing - v.aconst(Long.valueOf(increment)); + v.lconst(increment); } else if (asmType == Type.FLOAT_TYPE) { //noinspection UnnecessaryBoxing - v.aconst(Float.valueOf(increment)); + v.fconst(increment); } else if (asmType == Type.DOUBLE_TYPE) { //noinspection UnnecessaryBoxing - v.aconst(Double.valueOf(increment)); + v.dconst(increment); } else { - v.aconst(increment); + v.iconst(increment); } v.add(asmType); value.store(v); @@ -1766,7 +1766,7 @@ public class ExpressionCodegen extends JetVisitor { v.goTo(nextEntry); } else { - v.aconst(!negated); + v.iconst(!negated?1:0); } v.goTo(lblDone); v.mark(lblFail); @@ -1774,7 +1774,7 @@ public class ExpressionCodegen extends JetVisitor { v.goTo(nextEntry); } else { - v.aconst(negated); + v.iconst(negated?1:0); } v.mark(lblDone); return StackValue.onStack(Type.BOOLEAN_TYPE); @@ -1806,7 +1806,7 @@ public class ExpressionCodegen extends JetVisitor { v.goTo(end); v.mark(nope); v.pop(); - v.aconst(1); + v.iconst(1); v.mark(end); } else { diff --git a/idea/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java b/idea/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java index 03e309abad5..7ce0246dccd 100644 --- a/idea/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java +++ b/idea/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java @@ -392,7 +392,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { iv.dup(); iv.aconst(state.getTypeMapper().jvmType(descriptor, OwnerKind.INTERFACE)); - iv.aconst(false); + iv.iconst(0); iv.iconst(typeParamCount); iv.newarray(JetTypeMapper.TYPE_TYPEINFO); diff --git a/idea/src/org/jetbrains/jet/codegen/intrinsics/Increment.java b/idea/src/org/jetbrains/jet/codegen/intrinsics/Increment.java index 29c31db7899..dfb68c2fd42 100644 --- a/idea/src/org/jetbrains/jet/codegen/intrinsics/Increment.java +++ b/idea/src/org/jetbrains/jet/codegen/intrinsics/Increment.java @@ -35,13 +35,13 @@ public class Increment implements IntrinsicMethod { value.dupReceiver(v, 0); value.put(expectedType, v); if (expectedType == Type.LONG_TYPE) { - v.aconst(Long.valueOf(myDelta)); + v.lconst(myDelta); } else if (expectedType == Type.FLOAT_TYPE) { - v.aconst(Float.valueOf(myDelta)); + v.fconst(myDelta); } else if (expectedType == Type.DOUBLE_TYPE) { - v.aconst(Double.valueOf(myDelta)); + v.dconst(myDelta); } else { v.aconst(myDelta); diff --git a/idea/src/org/jetbrains/jet/codegen/intrinsics/Inv.java b/idea/src/org/jetbrains/jet/codegen/intrinsics/Inv.java index 263f480f8ee..fd6a663f964 100644 --- a/idea/src/org/jetbrains/jet/codegen/intrinsics/Inv.java +++ b/idea/src/org/jetbrains/jet/codegen/intrinsics/Inv.java @@ -16,7 +16,7 @@ public class Inv implements IntrinsicMethod { @Override public StackValue generate(ExpressionCodegen codegen, InstructionAdapter v, Type expectedType, PsiElement element, List arguments, StackValue receiver) { receiver.put(expectedType, v); - v.aconst(-1); + v.iconst(-1); v.xor(expectedType); return StackValue.onStack(expectedType); }