commit 05005f7442f5de7be7caf31733c6a920f6cf56b2
author Mathieu Chartier <mathieuc@google.com> Mon Jun 06 13:10:50 2016 -0700
committer Mathieu Chartier <mathieuc@google.com> Mon Jun 06 13:10:59 2016 -0700
tree 1da34b25819b0a3fb6667e236d327be0afce5256
parent 696632e6113a379f24dc6fe4c38e4dee57a249f8

Revert "Revert "Revert "Temporarily disable dex cache array emptyness DCHECK"""

Bug: 29083330

This reverts commit 46d46993cc0f11c2ac1b7ac8ffd55d78111faf48.

Change-Id: Iba55937de9c4f963ed084093c047d1550f994742

runtime/class_linker.cc

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index 0a5874b..15cc634 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -2092,8 +2092,7 @@
       reinterpret_cast<ArtMethod**>(raw_arrays + layout.MethodsOffset());
   ArtField** fields = (dex_file.NumFieldIds() == 0u) ? nullptr :
       reinterpret_cast<ArtField**>(raw_arrays + layout.FieldsOffset());
-  // Temporarily disabled since the JIT may hit this case. b/29083330
-  if (kIsDebugBuild && (false)) {
+  if (kIsDebugBuild) {
     // Sanity check to make sure all the dex cache arrays are empty. b/28992179
     for (size_t i = 0; i < dex_file.NumStringIds(); ++i) {
       CHECK(strings[i].Read<kWithoutReadBarrier>() == nullptr);