commit e2c29f4a2717923f190c944a06e02f7d8c3ddcb6
author Andreas Gampe <agampe@google.com> Sat Mar 28 06:20:07 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Mar 28 06:20:07 2015 +0000
tree 303ee0f92f331008abcad400cf5da36845b1e945
parent 86787d0bc2c5ad3b9c3b880b0fe2325d2b8bd672
parent e48856666e2e959687660f3b708e0c6da210ecb2

Merge "ART: Use instrumented Alloc in Class-Linker"

runtime/class_linker.cc

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index e0a7b5b..7521266 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -5316,9 +5316,9 @@
   DCHECK(dex_elements_class->IsArrayClass());
   Handle<mirror::ObjectArray<mirror::Object>> h_dex_elements =
       hs.NewHandle(reinterpret_cast<mirror::ObjectArray<mirror::Object>*>(
-          mirror::Array::Alloc<false>(self, dex_elements_class, dex_files.size(),
-                                      dex_elements_class->GetComponentSizeShift(),
-                                      Runtime::Current()->GetHeap()->GetCurrentAllocator())));
+          mirror::Array::Alloc<true>(self, dex_elements_class, dex_files.size(),
+                                     dex_elements_class->GetComponentSizeShift(),
+                                     Runtime::Current()->GetHeap()->GetCurrentAllocator())));
   Handle<mirror::Class> h_dex_element_class =
       hs.NewHandle(dex_elements_class->GetComponentType());