Hard-fail get-/put-object to a non-reference field.
Bug: 21886894
Change-Id: Iec870c223ce97fd90dcce05ae80c002e2b24cb5d
diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc
index 95b327e..04fe35e 100644
--- a/runtime/verifier/method_verifier.cc
+++ b/runtime/verifier/method_verifier.cc
@@ -4060,10 +4060,15 @@
VerifyPrimitivePut(*field_type, insn_type, vregA);
} else {
if (!insn_type.IsAssignableFrom(*field_type)) {
- Fail(VERIFY_ERROR_BAD_CLASS_SOFT) << "expected field " << PrettyField(field)
- << " to be compatible with type '" << insn_type
- << "' but found type '" << *field_type
- << "' in put-object";
+ // If the field type is not a reference, this is a global failure rather than
+ // a class change failure as the instructions and the descriptors for the type
+ // should have been consistent within the same file at compile time.
+ VerifyError error = field_type->IsReferenceTypes() ? VERIFY_ERROR_BAD_CLASS_SOFT
+ : VERIFY_ERROR_BAD_CLASS_HARD;
+ Fail(error) << "expected field " << 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);
@@ -4087,10 +4092,15 @@
}
} else {
if (!insn_type.IsAssignableFrom(*field_type)) {
- Fail(VERIFY_ERROR_BAD_CLASS_SOFT) << "expected field " << PrettyField(field)
- << " to be compatible with type '" << insn_type
- << "' but found type '" << *field_type
- << "' in get-object";
+ // If the field type is not a reference, this is a global failure rather than
+ // a class change failure as the instructions and the descriptors for the type
+ // should have been consistent within the same file at compile time.
+ VerifyError error = field_type->IsReferenceTypes() ? VERIFY_ERROR_BAD_CLASS_SOFT
+ : VERIFY_ERROR_BAD_CLASS_HARD;
+ Fail(error) << "expected field " << PrettyField(field)
+ << " to be compatible with type '" << insn_type
+ << "' but found type '" << *field_type
+ << "' in get-object";
work_line_->SetRegisterType(this, vregA, reg_types_.Conflict());
return;
}