commit 1cda7c2126d655cc9936c782f9dd33ec37b7f196
author Orion Hodson <oth@google.com> Thu Aug 10 13:06:45 2017 +0100
committer Orion Hodson <oth@google.com> Thu Aug 10 13:06:45 2017 +0100
tree 24ed20c4687f3d92d3f990d688c70b781f18d706
parent 1d2d8b1b6b359f5f476ef78662baa4b8782be530

Revert^2 "ART: Remove workaround in verifer after Jack update."

This reverts commit 7f7a074875114d0376923460948eb94eabaffe29.

Bug: 33099829
Test: art/test.py --host

runtime/verifier/method_verifier.cc

diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc
index 312d8df..b39985e 100644
--- a/runtime/verifier/method_verifier.cc
+++ b/runtime/verifier/method_verifier.cc
@@ -3994,13 +3994,10 @@
   /* caught by static verifier */
   DCHECK(is_range || expected_args <= 5);
 
-  // TODO(oth): Enable this path for invoke-polymorphic when b/33099829 is resolved.
-  if (method_type != METHOD_POLYMORPHIC) {
-    if (expected_args > code_item_->outs_size_) {
-      Fail(VERIFY_ERROR_BAD_CLASS_HARD) << "invalid argument count (" << expected_args
-                                        << ") exceeds outsSize (" << code_item_->outs_size_ << ")";
-      return nullptr;
-    }
+  if (expected_args > code_item_->outs_size_) {
+    Fail(VERIFY_ERROR_BAD_CLASS_HARD) << "invalid argument count (" << expected_args
+                                      << ") exceeds outsSize (" << code_item_->outs_size_ << ")";
+    return nullptr;
   }
 
   /*