diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-03-19 12:43:20 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2015-03-19 20:00:50 -0700 |
| commit | d7cbf8a6629942e7bd315ffae7e1c77b082f3e11 (patch) | |
| tree | fc8c3371ed4ddac96bbe90a2f94ef5fb5c5472ee /runtime/dex_instruction_list.h | |
| parent | f5988cf0c47ff935bb19c89ed0398be5fbe44bb6 (diff) | |
| download | android_art-d7cbf8a6629942e7bd315ffae7e1c77b082f3e11.tar.gz android_art-d7cbf8a6629942e7bd315ffae7e1c77b082f3e11.tar.bz2 android_art-d7cbf8a6629942e7bd315ffae7e1c77b082f3e11.zip | |
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
Diffstat (limited to 'runtime/dex_instruction_list.h')
| -rw-r--r-- | runtime/dex_instruction_list.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/dex_instruction_list.h b/runtime/dex_instruction_list.h index a90f424326..f8f85f9911 100644 --- a/runtime/dex_instruction_list.h +++ b/runtime/dex_instruction_list.h @@ -133,7 +133,7 @@ V(0x70, INVOKE_DIRECT, "invoke-direct", k35c, false, kMethodRef, kContinue | kThrow | kInvoke, kVerifyRegBMethod | kVerifyVarArgNonZero) \ V(0x71, INVOKE_STATIC, "invoke-static", k35c, false, kMethodRef, kContinue | kThrow | kInvoke, kVerifyRegBMethod | kVerifyVarArg) \ V(0x72, INVOKE_INTERFACE, "invoke-interface", k35c, false, kMethodRef, kContinue | kThrow | kInvoke, kVerifyRegBMethod | kVerifyVarArgNonZero) \ - V(0x73, RETURN_VOID_BARRIER, "return-void-barrier", k10x, false, kNone, kReturn, kVerifyNone) \ + V(0x73, RETURN_VOID_NO_BARRIER, "return-void-no-barrier", k10x, false, kNone, kReturn, kVerifyNone) \ V(0x74, INVOKE_VIRTUAL_RANGE, "invoke-virtual/range", k3rc, false, kMethodRef, kContinue | kThrow | kInvoke, kVerifyRegBMethod | kVerifyVarArgRangeNonZero) \ V(0x75, INVOKE_SUPER_RANGE, "invoke-super/range", k3rc, false, kMethodRef, kContinue | kThrow | kInvoke, kVerifyRegBMethod | kVerifyVarArgRangeNonZero) \ V(0x76, INVOKE_DIRECT_RANGE, "invoke-direct/range", k3rc, false, kMethodRef, kContinue | kThrow | kInvoke, kVerifyRegBMethod | kVerifyVarArgRangeNonZero) \ |