commit 7ff831f63111de69c71bc8c5cb1042d698b72070
author Andreas Gampe <agampe@google.com> Tue Jul 22 05:32:12 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Jul 19 23:20:08 2014 +0000
tree a7151ff738f4b48dd3fdfa59085487366f752e91
parent 0a142c96c50ca9d2edb6ef995107fe368cd0a3fa
parent 2a593a14e8e0df01a50139e0d48c7be46fb057ef

Merge "ART: Check high part of dalvik register pairs on put-wide"

runtime/verifier/method_verifier.cc

diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc
index fbd710c..af4e17e 100644
--- a/runtime/verifier/method_verifier.cc
+++ b/runtime/verifier/method_verifier.cc
@@ -3497,10 +3497,12 @@
     value_compatible = value_type.IsFloatTypes();
   } else if (target_type.IsLong()) {
     instruction_compatible = insn_type.IsLong();
-    value_compatible = value_type.IsLongTypes();
+    const RegType& value_type_hi = work_line_->GetRegisterType(vregA + 1);
+    value_compatible = value_type.IsLongTypes() && value_type.CheckWidePair(value_type_hi);
   } else if (target_type.IsDouble()) {
     instruction_compatible = insn_type.IsLong();  // no put-double, so expect put-long
-    value_compatible = value_type.IsDoubleTypes();
+    const RegType& value_type_hi = work_line_->GetRegisterType(vregA + 1);
+    value_compatible = value_type.IsDoubleTypes() && value_type.CheckWidePair(value_type_hi);
   } else {
     instruction_compatible = false;  // reference with primitive store
     value_compatible = false;  // unused