Allow INVOKE_VIRTUAL_RANGE as single invoke
Test: new D8 dexer works
Change-Id: I7480ca3d7a180f76d370de6ebf803ba07c76c5e0
diff --git a/profman/profman.cc b/profman/profman.cc
index f2cec47..0ecc88c 100644
--- a/profman/profman.cc
+++ b/profman/profman.cc
@@ -841,7 +841,8 @@
bool found_invoke = false;
for (const DexInstructionPcPair& inst : CodeItemInstructionAccessor(*dex_file, code_item)) {
- if (inst->Opcode() == Instruction::INVOKE_VIRTUAL) {
+ if (inst->Opcode() == Instruction::INVOKE_VIRTUAL ||
+ inst->Opcode() == Instruction::INVOKE_VIRTUAL_RANGE) {
if (found_invoke) {
LOG(ERROR) << "Multiple invoke INVOKE_VIRTUAL found: "
<< dex_file->PrettyMethod(method_index);
@@ -1314,4 +1315,3 @@
int main(int argc, char **argv) {
return art::profman(argc, argv);
}
-