From 0fb5af1c8287b1ec85c55c306a1c43820c38a337 Mon Sep 17 00:00:00 2001 From: Orion Hodson Date: Wed, 11 Jan 2017 18:58:15 +0000 Subject: Revert "ART: Compiler support for invoke-polymorphic." This reverts commit 02e3092f8d98f339588e48691db77f227b48ac1e. Reasons for revert: - Breaks MIPS/MIPS64 build. - Fails under GCStress test on x64. - Different x64 build configuration doesn't like relocation. Change-Id: I512555b38165d05f8a07e8aed528f00302061001 --- compiler/optimizing/nodes.h | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'compiler/optimizing/nodes.h') diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h index 27881922ac..db1b277990 100644 --- a/compiler/optimizing/nodes.h +++ b/compiler/optimizing/nodes.h @@ -1291,7 +1291,6 @@ class HLoopInformationOutwardIterator : public ValueObject { M(InvokeInterface, Invoke) \ M(InvokeStaticOrDirect, Invoke) \ M(InvokeVirtual, Invoke) \ - M(InvokePolymorphic, Invoke) \ M(LessThan, Condition) \ M(LessThanOrEqual, Condition) \ M(LoadClass, Instruction) \ @@ -3984,28 +3983,6 @@ class HInvokeUnresolved FINAL : public HInvoke { DISALLOW_COPY_AND_ASSIGN(HInvokeUnresolved); }; -class HInvokePolymorphic FINAL : public HInvoke { - public: - HInvokePolymorphic(ArenaAllocator* arena, - uint32_t number_of_arguments, - Primitive::Type return_type, - uint32_t dex_pc, - uint32_t dex_method_index) - : HInvoke(arena, - number_of_arguments, - 0u /* number_of_other_inputs */, - return_type, - dex_pc, - dex_method_index, - nullptr, - kVirtual) {} - - DECLARE_INSTRUCTION(InvokePolymorphic); - - private: - DISALLOW_COPY_AND_ASSIGN(HInvokePolymorphic); -}; - class HInvokeStaticOrDirect FINAL : public HInvoke { public: // Requirements of this method call regarding the class -- cgit v1.2.3-59-g8ed1b