summaryrefslogtreecommitdiffstats
path: root/dex2oat
diff options
context:
space:
mode:
authorSebastien Hertz <shertz@google.com>2014-06-24 14:35:40 +0200
committerSebastien Hertz <shertz@google.com>2014-07-10 17:03:15 +0200
commit4e99b3d8955131f3fc71aa113f0fa71f0092cb6f (patch)
treebcaf4e5119a74c836d8598e064a20cdead757efb /dex2oat
parent5fa647d5f663033e4ed3d398aece1f8211d7f460 (diff)
downloadart-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 'dex2oat')
-rw-r--r--dex2oat/dex2oat.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc
index 80e7724..72c34b4 100644
--- a/dex2oat/dex2oat.cc
+++ b/dex2oat/dex2oat.cc
@@ -467,6 +467,7 @@ class Dex2Oat {
}
}
runtime->GetClassLinker()->FixupDexCaches(runtime->GetResolutionMethod());
+ runtime->GetClassLinker()->RunRootClinits();
runtime_ = runtime;
return true;
}