From 1aab04df52529d3cabe28fd9f0cb008bf8180a56 Mon Sep 17 00:00:00 2001 From: Orion Hodson Date: Thu, 8 Dec 2016 10:29:53 +0000 Subject: [PATCH] ART: Remove workaround in verifer after Jack update. Bug: 33099829,30550796 Test: m test-art-host Change-Id: I812809e7f043ec2a9651f22e970312e094b78966 --- runtime/verifier/method_verifier.cc | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc index ebecc85a3..c40609e75 100644 --- a/runtime/verifier/method_verifier.cc +++ b/runtime/verifier/method_verifier.cc @@ -3936,13 +3936,10 @@ ArtMethod* MethodVerifier::VerifyInvocationArgsFromIterator( /* 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; } /* -- 2.11.0