commit 4b1baf1659581a9c30ee859061101a9842ddd8b3
author Logan Chien <loganchien@google.com> Fri May 18 16:28:36 2012 +0800
committer Shih-wei Liao <sliao@google.com> Fri May 18 12:19:38 2012 -0700
tree f5eb0c88b3037e88b2ae780fb940f69750c1ca5b
parent 6e474f8a2eb5379c74e589a41713c9b26aed2904

Fix filled-new-array to pass CTS.

Don't rely on dex cache when we are compiling the method.
We should determine the array type from the type descriptor,
which is specified in the dex file.

$ cts-tradefed run singleCommand cts --class \
dot.junit.opcodes.filled_new_array_range.JUnit_Test_filled_new_array_range

Change-Id: If99c236c06bc2f1e2576c6deec24e2456fb37dcd

src/compiler_llvm/method_compiler.cc

diff --git a/src/compiler_llvm/method_compiler.cc b/src/compiler_llvm/method_compiler.cc
index 1acb17d..c29e458 100644
--- a/src/compiler_llvm/method_compiler.cc
+++ b/src/compiler_llvm/method_compiler.cc
@@ -1842,11 +1842,14 @@
     EmitAllocNewArray(dex_pc, dec_insn.vA, dec_insn.vB, true);
 
   if (dec_insn.vA > 0) {
-    // Resolve the element type
-    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));
+    // Check for the element type
+    uint32_t type_desc_len = 0;
+    const char* type_desc =
+      dex_file_->StringByTypeIdx(dec_insn.vB, &type_desc_len);
+
+    DCHECK_GE(type_desc_len, 2u); // should be guaranteed by verifier
+    DCHECK_EQ(type_desc[0], '['); // should be guaranteed by verifier
+    bool is_elem_int_ty = (type_desc[1] == 'I');
 
     uint32_t alignment;
     llvm::Constant* elem_size;
@@ -1855,12 +1858,11 @@
     // NOTE: Currently filled-new-array only supports 'L', '[', and 'I'
     // as the element, thus we are only checking 2 cases: primitive int and
     // non-primitive type.
-    if (klass->IsPrimitiveInt()) {
+    if (is_elem_int_ty) {
       alignment = sizeof(int32_t);
       elem_size = irb_.getPtrEquivInt(sizeof(int32_t));
       field_type = irb_.getJIntTy()->getPointerTo();
     } else {
-      CHECK(!klass->IsPrimitive());
       alignment = irb_.getSizeOfPtrEquivInt();
       elem_size = irb_.getSizeOfPtrEquivIntValue();
       field_type = irb_.getJObjectTy()->getPointerTo();
@@ -1885,7 +1887,7 @@
       }
 
       llvm::Value* reg_value;
-      if (klass->IsPrimitiveInt()) {
+      if (is_elem_int_ty) {
         reg_value = EmitLoadDalvikReg(reg_index, kInt, kAccurate);
       } else {
         reg_value = EmitLoadDalvikReg(reg_index, kObject, kAccurate);