diff options
Diffstat (limited to 'compiler/optimizing/nodes.h')
-rw-r--r-- | compiler/optimizing/nodes.h | 38 |
1 files changed, 2 insertions, 36 deletions
diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h index 16e26dc7bc..6ef29bf93e 100644 --- a/compiler/optimizing/nodes.h +++ b/compiler/optimizing/nodes.h @@ -21,7 +21,6 @@ #include <array> #include <type_traits> -#include "art_method.h" #include "base/arena_allocator.h" #include "base/arena_bit_vector.h" #include "base/arena_containers.h" @@ -33,6 +32,7 @@ #include "base/quasi_atomic.h" #include "base/stl_util.h" #include "base/transform_array_ref.h" +#include "art_method.h" #include "block_namer.h" #include "class_root.h" #include "compilation_kind.h" @@ -680,7 +680,7 @@ class HGraph : public ArenaObject<kArenaAllocGraph> { } bool HasShouldDeoptimizeFlag() const { - return number_of_cha_guards_ != 0 || debuggable_; + return number_of_cha_guards_ != 0; } bool HasTryCatch() const { return has_try_catch_; } @@ -1530,8 +1530,6 @@ class HLoopInformationOutwardIterator : public ValueObject { M(LongConstant, Constant) \ M(Max, Instruction) \ M(MemoryBarrier, Instruction) \ - M(MethodEntryHook, Instruction) \ - M(MethodExitHook, Instruction) \ M(Min, BinaryOperation) \ M(MonitorOperation, Instruction) \ M(Mul, BinaryOperation) \ @@ -2996,38 +2994,6 @@ class HExpression<0> : public HInstruction { friend class SsaBuilder; }; -class HMethodEntryHook : public HExpression<0> { - public: - explicit HMethodEntryHook(uint32_t dex_pc) - : HExpression(kMethodEntryHook, SideEffects::All(), dex_pc) {} - - bool NeedsEnvironment() const override { - return true; - } - - DECLARE_INSTRUCTION(MethodEntryHook); - - protected: - DEFAULT_COPY_CONSTRUCTOR(MethodEntryHook); -}; - -class HMethodExitHook : public HExpression<1> { - public: - HMethodExitHook(HInstruction* value, uint32_t dex_pc) - : HExpression(kMethodExitHook, SideEffects::All(), dex_pc) { - SetRawInputAt(0, value); - } - - bool NeedsEnvironment() const override { - return true; - } - - DECLARE_INSTRUCTION(MethodExitHook); - - protected: - DEFAULT_COPY_CONSTRUCTOR(MethodExitHook); -}; - // Represents dex's RETURN_VOID opcode. A HReturnVoid is a control flow // instruction that branches to the exit block. class HReturnVoid final : public HExpression<0> { |