Revert "Inlining setters that return one of their arguments."
Bug: 13817614
This reverts commit 8e40c3e662d852da87b6bcfe79355f96ab9e91c7.
Change-Id: Ia7ed2d933514781150b2e0b9855244e383c60187
diff --git a/runtime/quick/inline_method_analyser.h b/runtime/quick/inline_method_analyser.h
index 277a01e..8e1a408 100644
--- a/runtime/quick/inline_method_analyser.h
+++ b/runtime/quick/inline_method_analyser.h
@@ -98,10 +98,10 @@
// opcode-Instruction::IPUT for IPUTs. This is because the runtime
// doesn't know the OpSize enumeration.
uint16_t op_variant : 3;
- uint16_t method_is_static : 1;
uint16_t object_arg : 4;
uint16_t src_arg : 4; // iput only
- uint16_t return_arg_plus1 : 4; // iput only, method argument to return + 1, 0 = return void.
+ uint16_t method_is_static : 1;
+ uint16_t reserved : 4;
uint16_t field_idx;
uint32_t is_volatile : 1;
uint32_t field_offset : 31;