diff options
author | 2017-01-11 18:58:15 +0000 | |
---|---|---|
committer | 2017-01-11 19:17:33 +0000 | |
commit | 0fb5af1c8287b1ec85c55c306a1c43820c38a337 (patch) | |
tree | 66239e7f745fae54e1630e91fb44a859bff615d6 /compiler/optimizing/inliner.cc | |
parent | 02e3092f8d98f339588e48691db77f227b48ac1e (diff) |
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
Diffstat (limited to 'compiler/optimizing/inliner.cc')
-rw-r--r-- | compiler/optimizing/inliner.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc index d7da46bbe7..c970e5cbba 100644 --- a/compiler/optimizing/inliner.cc +++ b/compiler/optimizing/inliner.cc @@ -308,10 +308,8 @@ ArtMethod* HInliner::TryCHADevirtualization(ArtMethod* resolved_method) { } bool HInliner::TryInline(HInvoke* invoke_instruction) { - if (invoke_instruction->IsInvokeUnresolved() || - invoke_instruction->IsInvokePolymorphic()) { - return false; // Don't bother to move further if we know the method is unresolved or an - // invoke-polymorphic. + if (invoke_instruction->IsInvokeUnresolved()) { + return false; // Don't bother to move further if we know the method is unresolved. } ScopedObjectAccess soa(Thread::Current()); |