commit 38a062eb7390f07ee0a318517f71d9b56491a5f7
author Vladimir Marko <vmarko@google.com> Fri Aug 02 13:59:27 2019 +0100
committer Treehugger Robot <treehugger-gerrit@google.com> Mon Aug 05 19:27:58 2019 +0000
tree 67204f1fbc785b888f9d5718e31cf22de6b2d727
parent e80ecf31e0d58a90d6b2a1d65ec090c03abc86dc

Weaken 2 DCHECK()s in reflection.

Reflection can be used on classes that are being initialized
rather than just classes that are already initialized as we
were previously asserting.

Test: Additional tests in 100-reflect2.
Change-Id: I072c28533e9248856b49fddb4bc46109448ee8a9

runtime/native/java_lang_reflect_Field.cc

diff --git a/runtime/native/java_lang_reflect_Field.cc b/runtime/native/java_lang_reflect_Field.cc
index f21ded9..31734a4 100644
--- a/runtime/native/java_lang_reflect_Field.cc
+++ b/runtime/native/java_lang_reflect_Field.cc
@@ -256,7 +256,7 @@
                                                bool allow_references,
                                                const JValue& new_value)
     REQUIRES_SHARED(Locks::mutator_lock_) {
-  DCHECK(f->GetDeclaringClass()->IsInitialized());
+  DCHECK(f->GetDeclaringClass()->IsInitializing());
   MemberOffset offset(f->GetOffset());
   const bool is_volatile = f->IsVolatile();
   switch (field_type) {