commit 0d0d91a2acd58696366021982279bacc6638b123
author Nicolas Geoffray <ngeoffray@google.com> Thu Oct 14 14:40:09 2021 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Fri Oct 15 13:00:35 2021 +0000
tree 594ef419aacd6d34e18f2812f31f0bd8b8956231
parent fcef77b426e74d726bf87bba6574b097ba5b97aa

Remove unneeded checks.

Test: test.py
Bug: 28313047
Change-Id: I94d19c235c69361bf9611eb6fcf5d1d31bfcdf17

runtime/verifier/method_verifier.cc

diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc
index 4e9697c..1f5e31f 100644
--- a/runtime/verifier/method_verifier.cc
+++ b/runtime/verifier/method_verifier.cc
@@ -4753,17 +4753,13 @@
     if (is_primitive) {
       VerifyPrimitivePut(*field_type, insn_type, vregA);
     } else {
+      DCHECK(insn_type.IsJavaLangObject());
       if (!insn_type.IsAssignableFrom(*field_type, this)) {
-        VerifyError error;
-        if (insn_type.IsUnresolvedTypes() || field_type->IsUnresolvedTypes()) {
-          error = VERIFY_ERROR_UNRESOLVED_TYPE_CHECK;
-        } else {
-          error = VERIFY_ERROR_BAD_CLASS_HARD;
-        }
-        Fail(error) << "expected field " << ArtField::PrettyField(field)
-                    << " to be compatible with type '" << insn_type
-                    << "' but found type '" << *field_type
-                    << "' in put-object";
+        DCHECK(!field_type->IsReferenceTypes());
+        Fail(VERIFY_ERROR_BAD_CLASS_HARD) << "expected field " << ArtField::PrettyField(field)
+                                          << " to be compatible with type '" << insn_type
+                                          << "' but found type '" << *field_type
+                                          << "' in put-object";
         return;
       }
       work_line_->VerifyRegisterType(this, vregA, *field_type);
@@ -4786,20 +4782,13 @@
         return;
       }
     } else {
+      DCHECK(insn_type.IsJavaLangObject());
       if (!insn_type.IsAssignableFrom(*field_type, this)) {
-        VerifyError error;
-        if (insn_type.IsUnresolvedTypes() || field_type->IsUnresolvedTypes()) {
-          error = VERIFY_ERROR_UNRESOLVED_TYPE_CHECK;
-        } else {
-          error = VERIFY_ERROR_BAD_CLASS_HARD;
-        }
-        Fail(error) << "expected field " << ArtField::PrettyField(field)
-                    << " to be compatible with type '" << insn_type
-                    << "' but found type '" << *field_type
-                    << "' in get-object";
-        if (error != VERIFY_ERROR_BAD_CLASS_HARD) {
-          work_line_->SetRegisterType<LockOp::kClear>(vregA, reg_types_.Conflict());
-        }
+        DCHECK(!field_type->IsReferenceTypes());
+        Fail(VERIFY_ERROR_BAD_CLASS_HARD) << "expected field " << ArtField::PrettyField(field)
+                                          << " to be compatible with type '" << insn_type
+                                          << "' but found type '" << *field_type
+                                          << "' in get-object";
         return;
       }
     }