From 05005f7442f5de7be7caf31733c6a920f6cf56b2 Mon Sep 17 00:00:00 2001
From: Mathieu Chartier <mathieuc@google.com>
Date: Mon, 6 Jun 2016 13:10:50 -0700
Subject: [PATCH] Revert "Revert "Revert "Temporarily disable dex cache array
 emptyness DCHECK"""

Bug: 29083330

This reverts commit 46d46993cc0f11c2ac1b7ac8ffd55d78111faf48.

Change-Id: Iba55937de9c4f963ed084093c047d1550f994742
---
 runtime/class_linker.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index 0a5874b6d..15cc6343e 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -2092,8 +2092,7 @@ mirror::DexCache* ClassLinker::AllocDexCache(Thread* self,
       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);
-- 
2.11.0