diff options
| author | Sebastien Hertz <shertz@google.com> | 2014-06-24 14:35:40 +0200 |
|---|---|---|
| committer | Sebastien Hertz <shertz@google.com> | 2014-07-10 17:03:15 +0200 |
| commit | 4e99b3d8955131f3fc71aa113f0fa71f0092cb6f (patch) | |
| tree | bcaf4e5119a74c836d8598e064a20cdead757efb /runtime/interpreter/interpreter.cc | |
| parent | 5fa647d5f663033e4ed3d398aece1f8211d7f460 (diff) | |
| download | art-4e99b3d8955131f3fc71aa113f0fa71f0092cb6f.zip art-4e99b3d8955131f3fc71aa113f0fa71f0092cb6f.tar.gz art-4e99b3d8955131f3fc71aa113f0fa71f0092cb6f.tar.bz2 | |
Add missing class initialization during compilation and tests
Adds missing class initialization during compilation and tests, especially
java.lang.Class. Otherwise, we'd be able to execute code while the referring
class is not initialized or initializing.
Also adds mirror::Class::AssertInitializedOrInitializingInThread method to
check class initialization when entering the interpreter: the called method's
declaring class must either be initialized or be initializing by the current
thread (other threads must be waiting for the class initialization to complete
holding its lock). Note we only do this check in debug build.
Bump oat version to force compilation.
Bug: 15899971
Change-Id: I9a4edd3739a3ca4cf1c4929dcbb44cdf7a1ca1fe
Diffstat (limited to 'runtime/interpreter/interpreter.cc')
| -rw-r--r-- | runtime/interpreter/interpreter.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/interpreter/interpreter.cc b/runtime/interpreter/interpreter.cc index cb4d444..9cc1441 100644 --- a/runtime/interpreter/interpreter.cc +++ b/runtime/interpreter/interpreter.cc @@ -354,6 +354,7 @@ static inline JValue Execute(Thread* self, MethodHelper& mh, const DexFile::Code shadow_frame.GetMethod()->GetDeclaringClass()->IsProxyClass()); DCHECK(!shadow_frame.GetMethod()->IsAbstract()); DCHECK(!shadow_frame.GetMethod()->IsNative()); + shadow_frame.GetMethod()->GetDeclaringClass()->AssertInitializedOrInitializingInThread(self); bool transaction_active = Runtime::Current()->IsActiveTransaction(); if (LIKELY(shadow_frame.GetMethod()->IsPreverified())) { |