dex_instruction: k45cc HasVarArgs
Change-Id: I3be92269bb78c96ec41ab533c5792bd369c02178
Test: make test-art-host
bug: 30550796
diff --git a/runtime/dex_instruction-inl.h b/runtime/dex_instruction-inl.h
index 3d0fea0..f6ed1f0 100644
--- a/runtime/dex_instruction-inl.h
+++ b/runtime/dex_instruction-inl.h
@@ -505,11 +505,11 @@
}
inline bool Instruction::HasVarArgs() const {
- return FormatOf(Opcode()) == k35c;
+ return (FormatOf(Opcode()) == k35c) || (FormatOf(Opcode()) == k45cc);
}
inline void Instruction::GetVarArgs(uint32_t arg[kMaxVarArgRegs], uint16_t inst_data) const {
- DCHECK_EQ(FormatOf(Opcode()), k35c);
+ DCHECK(HasVarArgs());
/*
* Note that the fields mentioned in the spec don't appear in