commit fcebe7197d962bfd90701916e0a95e8125921e08
author Shih-wei Liao <sliao@google.com> Wed Apr 11 11:37:30 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 11 11:37:30 2012 -0700
tree 4089f6008976959470831d339340bf5abce81fc7
parent 6a30eab0ad4eb300d1621d1efad48fd1d117fdf2
parent 183cf26458244b649b164536b6839cc5beef1bed

Merge "Fix filled new array bug." into ics-mr1-plus-art

src/compiler_llvm/method_compiler.cc

diff --git a/src/compiler_llvm/method_compiler.cc b/src/compiler_llvm/method_compiler.cc
index fb6cc19..7a47c89 100644
--- a/src/compiler_llvm/method_compiler.cc
+++ b/src/compiler_llvm/method_compiler.cc
@@ -1813,7 +1813,7 @@
 
   if (dec_insn.vA > 0) {
     // Resolve the element type
-    Class* klass = dex_cache_->GetResolvedType(dec_insn.vB);
+    Class* klass = dex_cache_->GetResolvedType(dec_insn.vB)->GetComponentType();
     // TODO: Avoid the usage of the dex_cache_.  Try to figure out a better
     // way to distinguish [I and [L.
     CHECK_NE(klass, static_cast<Class*>(NULL));