diff options
Diffstat (limited to 'compiler/optimizing/nodes.h')
| -rw-r--r-- | compiler/optimizing/nodes.h | 6 |
1 files changed, 5 insertions, 1 deletions
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<kArenaAllocMisc> { 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<kArenaAllocMisc> { 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<int32_t>(), arena->Adapter()), cached_float_constants_(std::less<int32_t>(), arena->Adapter()), @@ -399,6 +401,8 @@ class HGraph : public ArenaObject<kArenaAllocMisc> { const bool should_generate_constructor_barrier_; + const InstructionSet instruction_set_; + // Cached constants. HNullConstant* cached_null_constant_; ArenaSafeMap<int32_t, HIntConstant*> 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); |