diff options
19 files changed, 97 insertions, 97 deletions
diff --git a/jack/src/com/android/jack/backend/dex/rop/CodeItemBuilder.java b/jack/src/com/android/jack/backend/dex/rop/CodeItemBuilder.java index 584bdae..1657175 100644 --- a/jack/src/com/android/jack/backend/dex/rop/CodeItemBuilder.java +++ b/jack/src/com/android/jack/backend/dex/rop/CodeItemBuilder.java @@ -198,7 +198,7 @@ public class CodeItemBuilder implements RunnableSchedulable<JMethod> { ropReg.createRegisterSpec(local); } - if (!method.getType().isSameType(JPrimitiveTypeEnum.VOID.getType())) { + if (method.getType() != JPrimitiveTypeEnum.VOID.getType()) { ropReg.createReturnReg(method.getType()); } @@ -411,8 +411,8 @@ public class CodeItemBuilder implements RunnableSchedulable<JMethod> { paramSize += 1; } for (JParameter param : method.getParams()) { - if (param.getType().isSameType(JPrimitiveTypeEnum.LONG.getType()) - || param.getType().isSameType(JPrimitiveTypeEnum.DOUBLE.getType())) { + if (param.getType() == JPrimitiveTypeEnum.LONG.getType() + || param.getType() == JPrimitiveTypeEnum.DOUBLE.getType()) { paramSize += 2; } else { paramSize += 1; @@ -521,9 +521,9 @@ public class CodeItemBuilder implements RunnableSchedulable<JMethod> { int wordCount = method.isStatic() ? 0 : 1; for (JParameter param : parameters) { JType paramType = param.getType(); - if (paramType.isSameType(JPrimitiveTypeEnum.LONG.getType())) { + if (paramType == JPrimitiveTypeEnum.LONG.getType()) { wordCount += 2; - } else if (paramType.isSameType(JPrimitiveTypeEnum.DOUBLE.getType())) { + } else if (paramType == JPrimitiveTypeEnum.DOUBLE.getType()) { wordCount += 2; } else { wordCount++; diff --git a/jack/src/com/android/jack/backend/dex/rop/RopBuilderVisitor.java b/jack/src/com/android/jack/backend/dex/rop/RopBuilderVisitor.java index 958187a..0264fa9 100644 --- a/jack/src/com/android/jack/backend/dex/rop/RopBuilderVisitor.java +++ b/jack/src/com/android/jack/backend/dex/rop/RopBuilderVisitor.java @@ -266,7 +266,7 @@ class RopBuilderVisitor extends JVisitor { JType elementType = newArray.getArrayType().getElementType(); List<JExpression> initializers = newArray.getInitializers(); if (!initializers.isEmpty() && initializers.size() <= 5 && newArray.getDims().size() == 1 - && elementType.isSameType(JPrimitiveTypeEnum.INT.getType())) { + && elementType == JPrimitiveTypeEnum.INT.getType()) { return true; } return false; @@ -432,7 +432,7 @@ class RopBuilderVisitor extends JVisitor { Rop cmpOp = null; Type dxType = RopHelper.convertTypeToDx(type); - if (type.isSameType(JPrimitiveTypeEnum.LONG.getType())) { + if (type == JPrimitiveTypeEnum.LONG.getType()) { cmpOp = Rops.opCmpl(dxType); } else { cmpOp = getCmpOperatorForFloatDouble(op, dxType); @@ -829,18 +829,18 @@ class RopBuilderVisitor extends JVisitor { * from each group. These two instructions are created by RopCastLegalier. */ - if (((castTo.isSameType(JPrimitiveTypeEnum.BYTE.getType())) - || (castTo.isSameType(JPrimitiveTypeEnum.SHORT.getType())) - || (castTo.isSameType(JPrimitiveTypeEnum.CHAR.getType())) - || (castTo.isSameType(JPrimitiveTypeEnum.INT.getType())) - || (castTo.isSameType(JPrimitiveTypeEnum.BOOLEAN.getType())) + if (((castTo == JPrimitiveTypeEnum.BYTE.getType()) + || (castTo == JPrimitiveTypeEnum.SHORT.getType()) + || (castTo == JPrimitiveTypeEnum.CHAR.getType()) + || (castTo == JPrimitiveTypeEnum.INT.getType()) + || (castTo == JPrimitiveTypeEnum.BOOLEAN.getType()) ) && - ((castedFrom.isSameType(JPrimitiveTypeEnum.INT.getType())) - || (castedFrom.isSameType(JPrimitiveTypeEnum.BYTE.getType())) - || (castedFrom.isSameType(JPrimitiveTypeEnum.CHAR.getType())) - || (castedFrom.isSameType(JPrimitiveTypeEnum.SHORT.getType())) - || (castedFrom.isSameType(JPrimitiveTypeEnum.BOOLEAN.getType())) + ((castedFrom == JPrimitiveTypeEnum.INT.getType()) + || (castedFrom == JPrimitiveTypeEnum.BYTE.getType()) + || (castedFrom == JPrimitiveTypeEnum.CHAR.getType()) + || (castedFrom == JPrimitiveTypeEnum.SHORT.getType()) + || (castedFrom == JPrimitiveTypeEnum.BOOLEAN.getType()) )) { addTruncateIntOrMoveInstruction(sourcePosition, ((JPrimitiveType) castTo).getPrimitiveTypeEnum(), fromReg, destReg); @@ -987,22 +987,22 @@ class RopBuilderVisitor extends JVisitor { switch(unary.getOp()) { case NEG: { - assert unary.getType().isSameType(JPrimitiveTypeEnum.BYTE.getType()) - || unary.getType().isSameType(JPrimitiveTypeEnum.CHAR.getType()) - || unary.getType().isSameType(JPrimitiveTypeEnum.SHORT.getType()) - || unary.getType().isSameType(JPrimitiveTypeEnum.INT.getType()) - || unary.getType().isSameType(JPrimitiveTypeEnum.LONG.getType()) - || unary.getType().isSameType(JPrimitiveTypeEnum.FLOAT.getType()) - || unary.getType().isSameType(JPrimitiveTypeEnum.DOUBLE.getType()); + assert unary.getType() == JPrimitiveTypeEnum.BYTE.getType() + || unary.getType() == JPrimitiveTypeEnum.CHAR.getType() + || unary.getType() == JPrimitiveTypeEnum.SHORT.getType() + || unary.getType() == JPrimitiveTypeEnum.INT.getType() + || unary.getType() == JPrimitiveTypeEnum.LONG.getType() + || unary.getType() == JPrimitiveTypeEnum.FLOAT.getType() + || unary.getType() == JPrimitiveTypeEnum.DOUBLE.getType(); opcode = Rops.opNeg(srcRegisterSpec); break; } case BIT_NOT: { - assert unary.getType().isSameType(JPrimitiveTypeEnum.BYTE.getType()) - || unary.getType().isSameType(JPrimitiveTypeEnum.CHAR.getType()) - || unary.getType().isSameType(JPrimitiveTypeEnum.SHORT.getType()) - || unary.getType().isSameType(JPrimitiveTypeEnum.INT.getType()) - || unary.getType().isSameType(JPrimitiveTypeEnum.LONG.getType()); + assert unary.getType() == JPrimitiveTypeEnum.BYTE.getType() + || unary.getType() == JPrimitiveTypeEnum.CHAR.getType() + || unary.getType() == JPrimitiveTypeEnum.SHORT.getType() + || unary.getType() == JPrimitiveTypeEnum.INT.getType() + || unary.getType() == JPrimitiveTypeEnum.LONG.getType(); opcode = Rops.opNot(srcRegisterSpec); break; } diff --git a/jack/src/com/android/jack/ir/ast/JAsgDivOperation.java b/jack/src/com/android/jack/ir/ast/JAsgDivOperation.java index 911a79e..ea577ac 100644 --- a/jack/src/com/android/jack/ir/ast/JAsgDivOperation.java +++ b/jack/src/com/android/jack/ir/ast/JAsgDivOperation.java @@ -43,11 +43,11 @@ public class JAsgDivOperation extends JAsgBinaryOperation { @Override public boolean canThrow() { - return (getType().isSameType(JPrimitiveTypeEnum.BYTE.getType())) - || (getType().isSameType(JPrimitiveTypeEnum.CHAR.getType())) - || (getType().isSameType(JPrimitiveTypeEnum.SHORT.getType())) - || (getType().isSameType(JPrimitiveTypeEnum.INT.getType())) - || (getType().isSameType(JPrimitiveTypeEnum.LONG.getType())); + return (getType() == JPrimitiveTypeEnum.BYTE.getType()) + || (getType() == JPrimitiveTypeEnum.CHAR.getType()) + || (getType() == JPrimitiveTypeEnum.SHORT.getType()) + || (getType() == JPrimitiveTypeEnum.INT.getType()) + || (getType() == JPrimitiveTypeEnum.LONG.getType()); } @Override diff --git a/jack/src/com/android/jack/ir/ast/JAsgModOperation.java b/jack/src/com/android/jack/ir/ast/JAsgModOperation.java index f2f1cd7..7abd6e8 100644 --- a/jack/src/com/android/jack/ir/ast/JAsgModOperation.java +++ b/jack/src/com/android/jack/ir/ast/JAsgModOperation.java @@ -43,11 +43,11 @@ public class JAsgModOperation extends JAsgBinaryOperation { @Override public boolean canThrow() { - return (getType().isSameType(JPrimitiveTypeEnum.BYTE.getType())) - || (getType().isSameType(JPrimitiveTypeEnum.CHAR.getType())) - || (getType().isSameType(JPrimitiveTypeEnum.SHORT.getType())) - || (getType().isSameType(JPrimitiveTypeEnum.INT.getType())) - || (getType().isSameType(JPrimitiveTypeEnum.LONG.getType())); + return (getType() == JPrimitiveTypeEnum.BYTE.getType()) + || (getType() == JPrimitiveTypeEnum.CHAR.getType()) + || (getType() == JPrimitiveTypeEnum.SHORT.getType()) + || (getType() == JPrimitiveTypeEnum.INT.getType()) + || (getType() == JPrimitiveTypeEnum.LONG.getType()); } @Override diff --git a/jack/src/com/android/jack/ir/ast/JConcatOperation.java b/jack/src/com/android/jack/ir/ast/JConcatOperation.java index d4eb603..c619862 100644 --- a/jack/src/com/android/jack/ir/ast/JConcatOperation.java +++ b/jack/src/com/android/jack/ir/ast/JConcatOperation.java @@ -53,24 +53,24 @@ public class JConcatOperation extends JBinaryOperation { JType rhsType = getRhs().getType(); return (lhsType.isSameType(jlString) && rhsType.isSameType(jlString)) || (lhsType.isSameType(jlString) && - (rhsType.isSameType(JPrimitiveTypeEnum.BOOLEAN.getType()) - || rhsType.isSameType(JPrimitiveTypeEnum.BYTE.getType()) - || rhsType.isSameType(JPrimitiveTypeEnum.CHAR.getType()) - || rhsType.isSameType(JPrimitiveTypeEnum.SHORT.getType()) - || rhsType.isSameType(JPrimitiveTypeEnum.INT.getType()) - || rhsType.isSameType(JPrimitiveTypeEnum.FLOAT.getType()) - || rhsType.isSameType(JPrimitiveTypeEnum.LONG.getType()) - || rhsType.isSameType(JPrimitiveTypeEnum.DOUBLE.getType()) + (rhsType == JPrimitiveTypeEnum.BOOLEAN.getType() + || rhsType == JPrimitiveTypeEnum.BYTE.getType() + || rhsType == JPrimitiveTypeEnum.CHAR.getType() + || rhsType == JPrimitiveTypeEnum.SHORT.getType() + || rhsType == JPrimitiveTypeEnum.INT.getType() + || rhsType == JPrimitiveTypeEnum.FLOAT.getType() + || rhsType == JPrimitiveTypeEnum.LONG.getType() + || rhsType == JPrimitiveTypeEnum.DOUBLE.getType() || rhsType instanceof JReferenceType)) || (rhsType.isSameType(jlString) && - (lhsType.isSameType(JPrimitiveTypeEnum.BOOLEAN.getType()) - || lhsType.isSameType(JPrimitiveTypeEnum.BYTE.getType()) - || lhsType.isSameType(JPrimitiveTypeEnum.CHAR.getType()) - || lhsType.isSameType(JPrimitiveTypeEnum.SHORT.getType()) - || lhsType.isSameType(JPrimitiveTypeEnum.INT.getType()) - || lhsType.isSameType(JPrimitiveTypeEnum.FLOAT.getType()) - || lhsType.isSameType(JPrimitiveTypeEnum.LONG.getType()) - || lhsType.isSameType(JPrimitiveTypeEnum.DOUBLE.getType()) + (lhsType == JPrimitiveTypeEnum.BOOLEAN.getType() + || lhsType == JPrimitiveTypeEnum.BYTE.getType() + || lhsType == JPrimitiveTypeEnum.CHAR.getType() + || lhsType == JPrimitiveTypeEnum.SHORT.getType() + || lhsType == JPrimitiveTypeEnum.INT.getType() + || lhsType == JPrimitiveTypeEnum.FLOAT.getType() + || lhsType == JPrimitiveTypeEnum.LONG.getType() + || lhsType == JPrimitiveTypeEnum.DOUBLE.getType() || lhsType instanceof JReferenceType)); } diff --git a/jack/src/com/android/jack/ir/ast/JConditionalExpression.java b/jack/src/com/android/jack/ir/ast/JConditionalExpression.java index dc8cd95..22f1909 100644 --- a/jack/src/com/android/jack/ir/ast/JConditionalExpression.java +++ b/jack/src/com/android/jack/ir/ast/JConditionalExpression.java @@ -113,18 +113,18 @@ public class JConditionalExpression extends JExpression { } // second sub-bullet - if ((thenType.isSameType(JPrimitiveTypeEnum.BYTE.getType()) - || thenType.isSameType(JPrimitiveTypeEnum.CHAR.getType()) - || thenType.isSameType(JPrimitiveTypeEnum.SHORT.getType())) + if ((thenType == JPrimitiveTypeEnum.BYTE.getType() + || thenType == JPrimitiveTypeEnum.CHAR.getType() + || thenType == JPrimitiveTypeEnum.SHORT.getType()) && ((elseExpr instanceof JIntegralConstant32) && elseType instanceof JIntegralType)) { if (((JIntegralType32) thenType).isValidValue( ((JIntegralConstant32) elseExpr).getIntValue())) { return thenType; } } - if ((elseType.isSameType(JPrimitiveTypeEnum.BYTE.getType()) - || elseType.isSameType(JPrimitiveTypeEnum.CHAR.getType()) - || elseType.isSameType(JPrimitiveTypeEnum.SHORT.getType())) + if ((elseType == JPrimitiveTypeEnum.BYTE.getType() + || elseType == JPrimitiveTypeEnum.CHAR.getType() + || elseType == JPrimitiveTypeEnum.SHORT.getType()) && ((thenExpr instanceof JIntegralConstant32) && thenType instanceof JIntegralType)) { if (((JIntegralType32) elseType).isValidValue( ((JIntegralConstant32) thenExpr).getIntValue())) { diff --git a/jack/src/com/android/jack/ir/ast/JDivOperation.java b/jack/src/com/android/jack/ir/ast/JDivOperation.java index e2a9a36..e444162 100644 --- a/jack/src/com/android/jack/ir/ast/JDivOperation.java +++ b/jack/src/com/android/jack/ir/ast/JDivOperation.java @@ -43,11 +43,11 @@ public class JDivOperation extends JArithmeticBinaryOperation { @Override public boolean canThrow() { - return getType().isSameType(JPrimitiveTypeEnum.BYTE.getType()) - || getType().isSameType(JPrimitiveTypeEnum.CHAR.getType()) - || getType().isSameType(JPrimitiveTypeEnum.SHORT.getType()) - || getType().isSameType(JPrimitiveTypeEnum.INT.getType()) - || getType().isSameType(JPrimitiveTypeEnum.LONG.getType()); + return getType() == JPrimitiveTypeEnum.BYTE.getType() + || getType() == JPrimitiveTypeEnum.CHAR.getType() + || getType() == JPrimitiveTypeEnum.SHORT.getType() + || getType() == JPrimitiveTypeEnum.INT.getType() + || getType() == JPrimitiveTypeEnum.LONG.getType(); } @Override diff --git a/jack/src/com/android/jack/ir/ast/JModOperation.java b/jack/src/com/android/jack/ir/ast/JModOperation.java index ccb05e1..c183122 100644 --- a/jack/src/com/android/jack/ir/ast/JModOperation.java +++ b/jack/src/com/android/jack/ir/ast/JModOperation.java @@ -43,11 +43,11 @@ public class JModOperation extends JArithmeticBinaryOperation { @Override public boolean canThrow() { - return getType().isSameType(JPrimitiveTypeEnum.BYTE.getType()) - || getType().isSameType(JPrimitiveTypeEnum.CHAR.getType()) - || getType().isSameType(JPrimitiveTypeEnum.SHORT.getType()) - || getType().isSameType(JPrimitiveTypeEnum.INT.getType()) - || getType().isSameType(JPrimitiveTypeEnum.LONG.getType()); + return getType() == JPrimitiveTypeEnum.BYTE.getType() + || getType() == JPrimitiveTypeEnum.CHAR.getType() + || getType() == JPrimitiveTypeEnum.SHORT.getType() + || getType() == JPrimitiveTypeEnum.INT.getType() + || getType() == JPrimitiveTypeEnum.LONG.getType(); } @Override diff --git a/jack/src/com/android/jack/ir/ast/JPrimitiveType.java b/jack/src/com/android/jack/ir/ast/JPrimitiveType.java index 0f7fece..8d3a2e2 100644 --- a/jack/src/com/android/jack/ir/ast/JPrimitiveType.java +++ b/jack/src/com/android/jack/ir/ast/JPrimitiveType.java @@ -121,18 +121,18 @@ public abstract class JPrimitiveType extends JNode implements JType { || JPrimitiveTypeEnum.LONG.getType().isEquivalent(rhsType) || JPrimitiveTypeEnum.DOUBLE.getType().isEquivalent(rhsType); - if (lhsType.isSameType(JPrimitiveTypeEnum.DOUBLE.getType()) - || rhsType.isSameType(JPrimitiveTypeEnum.DOUBLE.getType()) + if (lhsType == JPrimitiveTypeEnum.DOUBLE.getType() + || rhsType == JPrimitiveTypeEnum.DOUBLE.getType() || CommonTypes.isCommonType(CommonTypes.JAVA_LANG_DOUBLE, lhsType) || CommonTypes.isCommonType(CommonTypes.JAVA_LANG_DOUBLE, rhsType)) { promotedType = JPrimitiveTypeEnum.DOUBLE.getType(); - } else if (lhsType.isSameType(JPrimitiveTypeEnum.FLOAT.getType()) - || rhsType.isSameType(JPrimitiveTypeEnum.FLOAT.getType()) + } else if (lhsType == JPrimitiveTypeEnum.FLOAT.getType() + || rhsType == JPrimitiveTypeEnum.FLOAT.getType() || CommonTypes.isCommonType(CommonTypes.JAVA_LANG_FLOAT, lhsType) || CommonTypes.isCommonType(CommonTypes.JAVA_LANG_FLOAT, rhsType)) { promotedType = JPrimitiveTypeEnum.FLOAT.getType(); - } else if (lhsType.isSameType(JPrimitiveTypeEnum.LONG.getType()) - || rhsType.isSameType(JPrimitiveTypeEnum.LONG.getType()) + } else if (lhsType == JPrimitiveTypeEnum.LONG.getType() + || rhsType == JPrimitiveTypeEnum.LONG.getType() || CommonTypes.isCommonType(CommonTypes.JAVA_LANG_LONG, lhsType) || CommonTypes.isCommonType(CommonTypes.JAVA_LANG_LONG, rhsType)) { promotedType = JPrimitiveTypeEnum.LONG.getType(); diff --git a/jack/src/com/android/jack/ir/ast/JVariable.java b/jack/src/com/android/jack/ir/ast/JVariable.java index fc65836..2487360 100644 --- a/jack/src/com/android/jack/ir/ast/JVariable.java +++ b/jack/src/com/android/jack/ir/ast/JVariable.java @@ -44,7 +44,7 @@ public abstract class JVariable extends JNode implements HasName, CanBeSetFinal, JVariable(SourceInfo info, @CheckForNull String name, @Nonnull JType type, int modifier) { super(info); assert (type != null); - assert (!type.isSameType(JPrimitiveTypeEnum.VOID.getType())); + assert (type != JPrimitiveTypeEnum.VOID.getType()); this.name = name == null ? null : StringInterner.get().intern(name); this.type = type; this.modifier = modifier; diff --git a/jack/src/com/android/jack/ir/impl/JackIrBuilder.java b/jack/src/com/android/jack/ir/impl/JackIrBuilder.java index 3e08598..f8160bf 100644 --- a/jack/src/com/android/jack/ir/impl/JackIrBuilder.java +++ b/jack/src/com/android/jack/ir/impl/JackIrBuilder.java @@ -2234,7 +2234,7 @@ public class JackIrBuilder { call.addArg(maybeCast(implParams.get(i).getType(), paramRef)); } - if (bridgeMethod.getType().isSameType(JPrimitiveTypeEnum.VOID.getType())) { + if (bridgeMethod.getType() == JPrimitiveTypeEnum.VOID.getType()) { body.getBlock().addStmt(call.makeStatement()); body.getBlock().addStmt(new JReturnStatement(info, null)); } else { diff --git a/jack/src/com/android/jack/transformations/VisibilityBridgeAdder.java b/jack/src/com/android/jack/transformations/VisibilityBridgeAdder.java index 5a21323..b26dcf3 100644 --- a/jack/src/com/android/jack/transformations/VisibilityBridgeAdder.java +++ b/jack/src/com/android/jack/transformations/VisibilityBridgeAdder.java @@ -116,7 +116,7 @@ public class VisibilityBridgeAdder implements RunnableSchedulable<JDefinedClassO callToSuper.addArg(new JParameterRef(sourceInfo, param)); } - if (!method.getType().isSameType(JPrimitiveTypeEnum.VOID.getType())) { + if (method.getType() != JPrimitiveTypeEnum.VOID.getType()) { bodyBlock.addStmt(new JReturnStatement(sourceInfo, callToSuper)); } else { bodyBlock.addStmt(new JExpressionStatement(sourceInfo, callToSuper)); diff --git a/jack/src/com/android/jack/transformations/ast/ExpressionStatementLegalizer.java b/jack/src/com/android/jack/transformations/ast/ExpressionStatementLegalizer.java index 31af378..2ebb105 100644 --- a/jack/src/com/android/jack/transformations/ast/ExpressionStatementLegalizer.java +++ b/jack/src/com/android/jack/transformations/ast/ExpressionStatementLegalizer.java @@ -68,7 +68,7 @@ public class ExpressionStatementLegalizer implements RunnableSchedulable<JMethod } private boolean isLegal(@Nonnull JExpression expr) { - if (expr.getType().isSameType(JPrimitiveTypeEnum.VOID.getType())) { + if (expr.getType() == JPrimitiveTypeEnum.VOID.getType()) { return true; } return (expr instanceof JAsgOperation diff --git a/jack/src/com/android/jack/transformations/ast/IncDecRemover.java b/jack/src/com/android/jack/transformations/ast/IncDecRemover.java index 795417b..2c24bcb 100644 --- a/jack/src/com/android/jack/transformations/ast/IncDecRemover.java +++ b/jack/src/com/android/jack/transformations/ast/IncDecRemover.java @@ -166,9 +166,9 @@ public class IncDecRemover implements RunnableSchedulable<JMethod> { JExpression rhs = JBinaryOperation.create( sourceInfo, newOperator, argCopy, new JIntLiteral(sourceInfo, 1)); JType unaryArgType = unary.getArg().getType(); - if (unaryArgType.isSameType(JPrimitiveTypeEnum.BYTE.getType()) || - unaryArgType.isSameType(JPrimitiveTypeEnum.SHORT.getType()) || - unaryArgType.isSameType(JPrimitiveTypeEnum.CHAR.getType())) { + if (unaryArgType == JPrimitiveTypeEnum.BYTE.getType() || + unaryArgType == JPrimitiveTypeEnum.SHORT.getType() || + unaryArgType == JPrimitiveTypeEnum.CHAR.getType()) { rhs = new JDynamicCastOperation(sourceInfo, unaryArgType, rhs); } JAsgOperation newExpr = new JAsgOperation(sourceInfo, unary.getArg(), rhs); diff --git a/jack/src/com/android/jack/transformations/ast/NumericConversionChecker.java b/jack/src/com/android/jack/transformations/ast/NumericConversionChecker.java index 489322a..b5acc9e 100644 --- a/jack/src/com/android/jack/transformations/ast/NumericConversionChecker.java +++ b/jack/src/com/android/jack/transformations/ast/NumericConversionChecker.java @@ -212,8 +212,8 @@ public class NumericConversionChecker implements RunnableSchedulable<JMethod> { checkUnboxing(rhs); checkCast(lhs, expectedType); checkCast(rhs, expectedType); - } else if (rhsType.isSameType(JPrimitiveTypeEnum.BOOLEAN.getType()) - || lhsType.isSameType(JPrimitiveTypeEnum.BOOLEAN.getType())) { + } else if (rhsType == JPrimitiveTypeEnum.BOOLEAN.getType() + || lhsType == JPrimitiveTypeEnum.BOOLEAN.getType()) { checkUnboxing(lhs); checkUnboxing(rhs); } diff --git a/jack/src/com/android/jack/transformations/ast/TypeLegalizer.java b/jack/src/com/android/jack/transformations/ast/TypeLegalizer.java index a4a6c98..bbd6190 100644 --- a/jack/src/com/android/jack/transformations/ast/TypeLegalizer.java +++ b/jack/src/com/android/jack/transformations/ast/TypeLegalizer.java @@ -219,8 +219,8 @@ public class TypeLegalizer implements RunnableSchedulable<JMethod> { JType expectedType = JPrimitiveType.getBinaryPromotionType(lhsType, rhsType); castIfNeeded(maybeUnbox(lhs), expectedType); castIfNeeded(maybeUnbox(rhs), expectedType); - } else if (rhsType.isSameType(JPrimitiveTypeEnum.BOOLEAN.getType()) - || lhsType.isSameType(JPrimitiveTypeEnum.BOOLEAN.getType())) { + } else if (rhsType == JPrimitiveTypeEnum.BOOLEAN.getType() + || lhsType == JPrimitiveTypeEnum.BOOLEAN.getType()) { maybeUnbox(lhs); maybeUnbox(rhs); } diff --git a/jack/src/com/android/jack/transformations/ast/inner/WrapperMarker.java b/jack/src/com/android/jack/transformations/ast/inner/WrapperMarker.java index 9d82adf..b8d39b1 100644 --- a/jack/src/com/android/jack/transformations/ast/inner/WrapperMarker.java +++ b/jack/src/com/android/jack/transformations/ast/inner/WrapperMarker.java @@ -203,7 +203,7 @@ public class WrapperMarker implements Marker { assert methodCall.getArgs().size() == methodCall.getMethodId().getParamTypes().size(); - if (method.getType().isSameType(JPrimitiveTypeEnum.VOID.getType())) { + if (method.getType() == JPrimitiveTypeEnum.VOID.getType()) { bodyBlock.addStmt(methodCall.makeStatement()); bodyBlock.addStmt(new JReturnStatement(sourceInfo, null)); } else { diff --git a/jack/src/com/android/jack/transformations/rop/cast/RopCastLegalizer.java b/jack/src/com/android/jack/transformations/rop/cast/RopCastLegalizer.java index 176c141..6640cc9 100644 --- a/jack/src/com/android/jack/transformations/rop/cast/RopCastLegalizer.java +++ b/jack/src/com/android/jack/transformations/rop/cast/RopCastLegalizer.java @@ -82,14 +82,14 @@ public class RopCastLegalizer implements RunnableSchedulable<JMethod> { if (castTo instanceof JPrimitiveType) { JType castedFrom = cast.getExpr().getType(); - if (castTo.isSameType(JPrimitiveTypeEnum.BYTE.getType()) - || castTo.isSameType(JPrimitiveTypeEnum.SHORT.getType()) - || castTo.isSameType(JPrimitiveTypeEnum.CHAR.getType())) { + if (castTo == JPrimitiveTypeEnum.BYTE.getType() + || castTo == JPrimitiveTypeEnum.SHORT.getType() + || castTo == JPrimitiveTypeEnum.CHAR.getType()) { - if (castedFrom.isSameType(JPrimitiveTypeEnum.LONG.getType()) - || castedFrom.isSameType(JPrimitiveTypeEnum.FLOAT.getType()) - || castedFrom.isSameType(JPrimitiveTypeEnum.DOUBLE.getType())) { + if (castedFrom == JPrimitiveTypeEnum.LONG.getType() + || castedFrom == JPrimitiveTypeEnum.FLOAT.getType() + || castedFrom == JPrimitiveTypeEnum.DOUBLE.getType()) { /* The cast operation is not supported, lets split it in 2 with a intermediate INT */ JExpression intermediateCastToInt = new JDynamicCastOperation( diff --git a/jack/src/com/android/jack/transformations/threeaddresscode/ThreeAddressCodeBuilder.java b/jack/src/com/android/jack/transformations/threeaddresscode/ThreeAddressCodeBuilder.java index 12ff998..f79b8ee 100644 --- a/jack/src/com/android/jack/transformations/threeaddresscode/ThreeAddressCodeBuilder.java +++ b/jack/src/com/android/jack/transformations/threeaddresscode/ThreeAddressCodeBuilder.java @@ -204,7 +204,7 @@ public class ThreeAddressCodeBuilder implements RunnableSchedulable<JMethod> { } } else { - if ((expr.getType().isSameType(JPrimitiveTypeEnum.VOID.getType()) + if ((expr.getType() == JPrimitiveTypeEnum.VOID.getType() && !(parent instanceof JMultiExpression)) || parent instanceof JExpressionStatement) { return; } else if (parent instanceof JAsgOperation && @@ -222,7 +222,7 @@ public class ThreeAddressCodeBuilder implements RunnableSchedulable<JMethod> { assert insertStatement != null; transformationRequest.append(new AppendBefore(insertStatement, stmt)); } - } else if (expr.getType().isSameType(JPrimitiveTypeEnum.VOID.getType())) { + } else if (expr.getType() == JPrimitiveTypeEnum.VOID.getType()) { // Splits expressions contained into another expression or into a statement JStatement stmt = expr.makeStatement(); stmt.setCatchBlocks(currentCatchBlocks); |