summaryrefslogtreecommitdiff
path: root/runtime/interpreter/interpreter_switch_impl.cc
diff options
context:
space:
mode:
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
commit3641ac7de8b51c0853eaaa2ba3a3ab7e65a837c5 (patch)
tree425daeee0978d1a551ede86422643da09fbe1f43 /runtime/interpreter/interpreter_switch_impl.cc
parenteab674a87b32794ae2c5e7d238292e56804de09d (diff)
parent4e99b3d8955131f3fc71aa113f0fa71f0092cb6f (diff)
Merge "Add missing class initialization during compilation and tests"
Diffstat (limited to 'runtime/interpreter/interpreter_switch_impl.cc')
-rw-r--r--runtime/interpreter/interpreter_switch_impl.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/interpreter/interpreter_switch_impl.cc b/runtime/interpreter/interpreter_switch_impl.cc
index bdf2a20192..c6356485a9 100644
--- a/runtime/interpreter/interpreter_switch_impl.cc
+++ b/runtime/interpreter/interpreter_switch_impl.cc
@@ -449,6 +449,7 @@ JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem
if (UNLIKELY(obj == NULL)) {
HANDLE_PENDING_EXCEPTION();
} else {
+ obj->GetClass()->AssertInitializedOrInitializingInThread(self);
// Don't allow finalizable objects to be allocated during a transaction since these can't
// be finalized without a started runtime.
if (transaction_active && obj->GetClass()->IsFinalizable()) {