commit 1592bc7fe6fa54de24658f50b0aa7ec8c913de9c
author Ian Rogers <irogers@google.com> Thu Oct 27 20:08:53 2011 -0700
committer Ian Rogers <irogers@google.com> Thu Oct 27 20:08:53 2011 -0700
tree 062ae8a984dd7effb8fa6f95c055bac0b1be2dd1
parent 96a253a184592ace045a384e7b1d51a30a454448

Fix merge of short constants to not give int.

Change-Id: I34a2be26cab72af759ec9fa9f6e7470bb43923eb

src/dex_verifier.cc

diff --git a/src/dex_verifier.cc b/src/dex_verifier.cc
index 72c1da5..6c5a2b9 100644
--- a/src/dex_verifier.cc
+++ b/src/dex_verifier.cc
@@ -229,7 +229,7 @@
           return reg_types->IntConstant();
         }
       } else if (IsConstantShort()) {
-        if (incoming_type.IsShort()) {
+        if (incoming_type.IsConstantShort()) {
           return reg_types->ShortConstant();
         } else {
           return reg_types->IntConstant();