refactored isMultiplication Change-Id: Idf8c9bf836bea1d22b200fce733b092e58817a4e
diff --git a/src/test/testbase/java/com/android/tools/r8/utils/codeinspector/CfInstructionSubject.java b/src/test/testbase/java/com/android/tools/r8/utils/codeinspector/CfInstructionSubject.java index da7f955..fa51760 100644 --- a/src/test/testbase/java/com/android/tools/r8/utils/codeinspector/CfInstructionSubject.java +++ b/src/test/testbase/java/com/android/tools/r8/utils/codeinspector/CfInstructionSubject.java
@@ -382,11 +382,8 @@ @Override public boolean isMultiplication() { - if (!(instruction instanceof CfArithmeticBinop)) { - return false; - } - int opcode = ((CfArithmeticBinop) instruction).getAsmOpcode(); - return Opcodes.IMUL <= opcode && opcode <= Opcodes.DMUL; + return instruction instanceof CfArithmeticBinop + && ((CfArithmeticBinop) instruction).getOpcode() == CfArithmeticBinop.Opcode.Mul; } @Override