commit 681c58c6eab2bc8dab561cb6ac5bcabe89676730
author Bill Buzbee <buzbee@google.com> Mon Jun 06 16:48:43 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 06 16:48:43 2016 +0000
tree 61d43314c583985c119c87e69ee8dd59076854f2
parent 1798c6ad3d045b58a65af1bbd3aa73bf6838bfbc
parent 020b18a4b211f451516a92dfd33454de3911daef

Merge "ART: Improve JitProfiling perf in mips/mips64 mterp."

runtime/class_linker.cc

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index fe6b14c..e789db6 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -2092,7 +2092,8 @@
       reinterpret_cast<ArtMethod**>(raw_arrays + layout.MethodsOffset());
   ArtField** fields = (dex_file.NumFieldIds() == 0u) ? nullptr :
       reinterpret_cast<ArtField**>(raw_arrays + layout.FieldsOffset());
-  if (kIsDebugBuild) {
+  // Temporarily disabled since the JIT may hit this case. b/29083330
+  if (kIsDebugBuild && (false)) {
     // 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);