commit d9df0d5281d1a3cf86de9088cd55cea1000da37b
author Mathieu Chartier <mathieuc@google.com> Fri Jun 03 18:08:20 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 03 18:08:20 2016 +0000
tree 61041640502ca62a89fab56e777f57b0dca8b7b8
parent 926a81c4fefdd187a9bb1dd63f3ea6492718bb08
parent 06cd763b7d2a7511ea4a54b52b2931e57f3522d3

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

runtime/class_linker.cc

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index e789db6..fe6b14c 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);