commit 9323e6e44060545d6c4f925139572868f65b7fe3
author David Sehr <sehr@google.com> Tue Sep 13 08:58:35 2016 -0700
committer David Sehr <sehr@google.com> Wed Sep 14 08:01:39 2016 -0700
tree 65f3f380605d75f34d49aec49fca494bec26ef5b
parent 58735fbfbb2da0c0a19b3239da07c2353c40767d

Separate annotations from dexfile reading.

Bug: 22322814
Change-Id: I867d66da407dd80394a10d19903ebbc1ec3986ff
Test: test-art

runtime/mirror/class.cc

diff --git a/runtime/mirror/class.cc b/runtime/mirror/class.cc
index c979c28..2132978 100644
--- a/runtime/mirror/class.cc
+++ b/runtime/mirror/class.cc
@@ -23,6 +23,7 @@
 #include "class-inl.h"
 #include "dex_cache.h"
 #include "dex_file-inl.h"
+#include "dex_file_annotations.h"
 #include "gc/accounting/card_table-inl.h"
 #include "handle_scope-inl.h"
 #include "method.h"
@@ -1214,7 +1215,7 @@
     return default_value;
   }
   uint32_t flags;
-  if (!h_this->GetDexFile().GetInnerClassFlags(h_this, &flags)) {
+  if (!annotations::GetInnerClassFlags(h_this, &flags)) {
     return default_value;
   }
   return flags;