commit 321b987ef037c44c0ed4e0e82661c88959a6239f
author Vladimir Marko <vmarko@google.com> Mon Nov 24 16:33:51 2014 +0000
committer Vladimir Marko <vmarko@google.com> Mon Nov 24 17:27:42 2014 +0000
tree b333364689dbd22753d9fb543bd0a53541aa632f
parent 8173e4776afac6e8da01c42ddab09b635769415f

Further cleanup using dex_instruction_utils.h.

Change-Id: I85aa9e7d744b37ee3d2531c50470cd3fa87dc864

compiler/dex/vreg_analysis.cc

diff --git a/compiler/dex/vreg_analysis.cc b/compiler/dex/vreg_analysis.cc
index f6c7d52..a541c7d 100644
--- a/compiler/dex/vreg_analysis.cc
+++ b/compiler/dex/vreg_analysis.cc
@@ -276,8 +276,7 @@
       }
       int num_uses = mir->dalvikInsn.vA;
       // If this is a non-static invoke, mark implicit "this"
-      if (((mir->dalvikInsn.opcode != Instruction::INVOKE_STATIC) &&
-          (mir->dalvikInsn.opcode != Instruction::INVOKE_STATIC_RANGE))) {
+      if (!IsInstructionInvokeStatic(mir->dalvikInsn.opcode)) {
         reg_location_[uses[next]].defined = true;
         reg_location_[uses[next]].ref = true;
         type_mismatch |= reg_location_[uses[next]].wide;