From d7cbf8a6629942e7bd315ffae7e1c77b082f3e11 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Thu, 19 Mar 2015 12:43:20 -0700 Subject: Change RETURN_VOID_BARRIER to RETURN_VOID_NO_BARRIER We want to default to having a barrier for the case where we don't dex to dex. Bug: 19762303 Change-Id: I60348d89eaf0b9e1e480298afcecbb5f52e8661b --- runtime/dex_instruction_utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runtime/dex_instruction_utils.h') diff --git a/runtime/dex_instruction_utils.h b/runtime/dex_instruction_utils.h index 1a671c5043..f892f980a1 100644 --- a/runtime/dex_instruction_utils.h +++ b/runtime/dex_instruction_utils.h @@ -55,7 +55,7 @@ constexpr bool IsInstructionReturn(Instruction::Code opcode) { constexpr bool IsInstructionInvoke(Instruction::Code opcode) { return Instruction::INVOKE_VIRTUAL <= opcode && opcode <= Instruction::INVOKE_INTERFACE_RANGE && - opcode != Instruction::RETURN_VOID_BARRIER; + opcode != Instruction::RETURN_VOID_NO_BARRIER; } constexpr bool IsInstructionQuickInvoke(Instruction::Code opcode) { -- cgit v1.2.3