diff options
| author | 2017-08-01 00:09:42 +0000 | |
|---|---|---|
| committer | 2017-08-01 00:09:42 +0000 | |
| commit | d90231a8fb0eed0724b136d75b871c7c03e3abe7 (patch) | |
| tree | 788c4ccfbb0953af8b2e58a25caad160f85ef461 /runtime/interpreter/interpreter_common.h | |
| parent | 98d37952eae4175c44fc2f31e414727ae591a421 (diff) | |
| parent | bd208d8e73084b691d9cfbe870120fe53863ce07 (diff) | |
Merge "Read and write constraints for clinit"
Diffstat (limited to 'runtime/interpreter/interpreter_common.h')
| -rw-r--r-- | runtime/interpreter/interpreter_common.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/interpreter/interpreter_common.h b/runtime/interpreter/interpreter_common.h index d293aebc4c..b228e28a22 100644 --- a/runtime/interpreter/interpreter_common.h +++ b/runtime/interpreter/interpreter_common.h @@ -270,7 +270,8 @@ static inline bool DoInvokeVirtualQuick(Thread* self, ShadowFrame& shadow_frame, // Handles iget-XXX and sget-XXX instructions. // Returns true on success, otherwise throws an exception and returns false. -template<FindFieldType find_type, Primitive::Type field_type, bool do_access_check> +template<FindFieldType find_type, Primitive::Type field_type, bool do_access_check, + bool transaction_active = false> bool DoFieldGet(Thread* self, ShadowFrame& shadow_frame, const Instruction* inst, uint16_t inst_data) REQUIRES_SHARED(Locks::mutator_lock_); |