commit 1dc7e3eaf922b79f08dafde5656ad6a9928106b2
author jeffhao <jeffhao@google.com> Fri Aug 03 17:52:00 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 03 17:52:00 2012 -0700
tree 09f7e668186cc37869b392586683ca9a5d5c9986
parent 626aaa987b171c0addab75d7d300a91c24f9a5cc
parent eb31113ad46fbf31ca8a0b3ebe94310be9bb20d4

Merge "Primitive type mismatches are now hard failures in the verifier." into dalvik-dev

src/verifier/register_line.cc

diff --git a/src/verifier/register_line.cc b/src/verifier/register_line.cc
index d6aca98..1d4366f 100644
--- a/src/verifier/register_line.cc
+++ b/src/verifier/register_line.cc
@@ -98,14 +98,18 @@
   // Verify the src register type against the check type refining the type of the register
   const RegType& src_type = GetRegisterType(vsrc);
   if (!check_type.IsAssignableFrom(src_type)) {
-    verifier_->Fail(VERIFY_ERROR_BAD_CLASS_SOFT) << "register v" << vsrc << " has type " << src_type
-                                                 << " but expected " << check_type;
+    // Hard fail if one of the types is primitive, since they are concretely known.
+    enum VerifyError fail_type = (!check_type.IsNonZeroReferenceTypes() ||
+                                  !src_type.IsNonZeroReferenceTypes()) ?
+                                  VERIFY_ERROR_BAD_CLASS_HARD : VERIFY_ERROR_BAD_CLASS_SOFT;
+    verifier_->Fail(fail_type) << "register v" << vsrc << " has type " << src_type
+                               << " but expected " << check_type;
     return false;
   }
   if (check_type.IsLowHalf()) {
     const RegType& src_type_h = GetRegisterType(vsrc + 1);
     if (!src_type.CheckWidePair(src_type_h)) {
-      verifier_->Fail(VERIFY_ERROR_BAD_CLASS_SOFT) << "wide register v" << vsrc << " has type "
+      verifier_->Fail(VERIFY_ERROR_BAD_CLASS_HARD) << "wide register v" << vsrc << " has type "
                                                    << src_type << "/" << src_type_h;
       return false;
     }