diff options
| author | Sebastien Hertz <shertz@google.com> | 2014-07-11 14:52:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-10 20:09:49 +0000 |
| commit | 3641ac7de8b51c0853eaaa2ba3a3ab7e65a837c5 (patch) | |
| tree | 425daeee0978d1a551ede86422643da09fbe1f43 /runtime/interpreter/interpreter.cc | |
| parent | eab674a87b32794ae2c5e7d238292e56804de09d (diff) | |
| parent | 4e99b3d8955131f3fc71aa113f0fa71f0092cb6f (diff) | |
| download | art-3641ac7de8b51c0853eaaa2ba3a3ab7e65a837c5.tar.gz art-3641ac7de8b51c0853eaaa2ba3a3ab7e65a837c5.tar.bz2 art-3641ac7de8b51c0853eaaa2ba3a3ab7e65a837c5.zip | |
Merge "Add missing class initialization during compilation and tests"
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 729444e4f..2db62f8ea 100644 --- a/runtime/interpreter/interpreter.cc +++ b/runtime/interpreter/interpreter.cc @@ -356,6 +356,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())) { |