From 3f5881fda3606b27e30bf903052c73b03910f90b Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Wed, 8 Apr 2015 10:26:16 -0700 Subject: ART: IRT refactor IRT creation might fail. Add a path that allows to bypass the aborts and instead signal validity. Hide this path with a private constructor, rewrite users to use a static Create method. Bug: 20110201 Change-Id: I440499c3372cd7557eb970b70ce2c4543da520e4 --- runtime/jni_env_ext.cc | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'runtime/jni_env_ext.cc') diff --git a/runtime/jni_env_ext.cc b/runtime/jni_env_ext.cc index b2d3835405..84fc404b46 100644 --- a/runtime/jni_env_ext.cc +++ b/runtime/jni_env_ext.cc @@ -28,11 +28,29 @@ static constexpr size_t kMonitorsMax = 4096; // Arbitrary sanity check. static constexpr size_t kLocalsInitial = 64; // Arbitrary. +// Checking "locals" requires the mutator lock, but at creation time we're really only interested +// in validity, which isn't changing. To avoid grabbing the mutator lock, factored out and tagged +// with NO_THREAD_SAFETY_ANALYSIS. +static bool CheckLocalsValid(JNIEnvExt* in) NO_THREAD_SAFETY_ANALYSIS { + if (in == nullptr) { + return false; + } + return in->locals.IsValid(); +} + +JNIEnvExt* JNIEnvExt::Create(Thread* self_in, JavaVMExt* vm_in) { + std::unique_ptr ret(new JNIEnvExt(self_in, vm_in)); + if (CheckLocalsValid(ret.get())) { + return ret.release(); + } + return nullptr; +} + JNIEnvExt::JNIEnvExt(Thread* self_in, JavaVMExt* vm_in) : self(self_in), vm(vm_in), local_ref_cookie(IRT_FIRST_SEGMENT), - locals(kLocalsInitial, kLocalsMax, kLocal), + locals(kLocalsInitial, kLocalsMax, kLocal, false), check_jni(false), critical(0), monitors("monitors", kMonitorsInitial, kMonitorsMax) { -- cgit v1.2.3