commit 0fb5af1c8287b1ec85c55c306a1c43820c38a337
author Orion Hodson <oth@google.com> Wed Jan 11 18:58:15 2017 +0000
committer Orion Hodson <oth@google.com> Wed Jan 11 19:17:33 2017 +0000
tree 66239e7f745fae54e1630e91fb44a859bff615d6
parent 02e3092f8d98f339588e48691db77f227b48ac1e

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

runtime/verifier/method_verifier.cc

diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc
index 25a179b..715b237 100644
--- a/runtime/verifier/method_verifier.cc
+++ b/runtime/verifier/method_verifier.cc
@@ -3106,16 +3106,19 @@
         break;
       }
       const uint32_t proto_idx = (is_range) ? inst->VRegH_4rcc() : inst->VRegH_45cc();
-      const char* return_descriptor =
+      const char* descriptor =
           dex_file_->GetReturnTypeDescriptor(dex_file_->GetProtoId(proto_idx));
       const RegType& return_type =
-          reg_types_.FromDescriptor(GetClassLoader(), return_descriptor, false);
+          reg_types_.FromDescriptor(GetClassLoader(), descriptor, false);
       if (!return_type.IsLowHalf()) {
         work_line_->SetResultRegisterType(this, return_type);
       } else {
         work_line_->SetResultRegisterTypeWide(return_type, return_type.HighHalf(&reg_types_));
       }
-      just_set_result = true;
+      // TODO(oth): remove when compiler support is available.
+      Fail(VERIFY_ERROR_FORCE_INTERPRETER)
+          << "invoke-polymorphic is not supported by compiler";
+      have_pending_experimental_failure_ = true;
       break;
     }
     case Instruction::NEG_INT: