From e401d146407d61eeb99f8d6176b2ac13c4df1e33 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Wed, 22 Apr 2015 13:56:20 -0700 Subject: Move mirror::ArtMethod to native Optimizing + quick tests are passing, devices boot. TODO: Test and fix bugs in mips64. Saves 16 bytes per most ArtMethod, 7.5MB reduction in system PSS. Some of the savings are from removal of virtual methods and direct methods object arrays. Bug: 19264997 Change-Id: I622469a0cfa0e7082a2119f3d6a9491eb61e3f3d --- compiler/optimizing/nodes.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'compiler/optimizing/nodes.h') diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h index 6c2506e454..6c8098bbe1 100644 --- a/compiler/optimizing/nodes.h +++ b/compiler/optimizing/nodes.h @@ -126,6 +126,7 @@ class HGraph : public ArenaObject { const DexFile& dex_file, uint32_t method_idx, bool should_generate_constructor_barrier, + InstructionSet instruction_set, InvokeType invoke_type = kInvalidInvokeType, bool debuggable = false, int start_instruction_id = 0) @@ -147,6 +148,7 @@ class HGraph : public ArenaObject { invoke_type_(invoke_type), in_ssa_form_(false), should_generate_constructor_barrier_(should_generate_constructor_barrier), + instruction_set_(instruction_set), cached_null_constant_(nullptr), cached_int_constants_(std::less(), arena->Adapter()), cached_float_constants_(std::less(), arena->Adapter()), @@ -399,6 +401,8 @@ class HGraph : public ArenaObject { const bool should_generate_constructor_barrier_; + const InstructionSet instruction_set_; + // Cached constants. HNullConstant* cached_null_constant_; ArenaSafeMap cached_int_constants_; @@ -1873,7 +1877,7 @@ class HDeoptimize : public HTemplateInstruction<1> { // instructions that work with the dex cache. class HCurrentMethod : public HExpression<0> { public: - HCurrentMethod() : HExpression(Primitive::kPrimNot, SideEffects::None()) {} + explicit HCurrentMethod(Primitive::Type type) : HExpression(type, SideEffects::None()) {} DECLARE_INSTRUCTION(CurrentMethod); -- cgit v1.2.3-59-g8ed1b