diff options
| -rw-r--r-- | runtime/thread.cc | 4 | ||||
| -rw-r--r-- | runtime/thread.h | 13 |
2 files changed, 11 insertions, 6 deletions
diff --git a/runtime/thread.cc b/runtime/thread.cc index 1283cf0e96..5db8c34d7c 100644 --- a/runtime/thread.cc +++ b/runtime/thread.cc @@ -3175,4 +3175,8 @@ void Thread::SetException(ObjPtr<mirror::Throwable> new_exception) { tlsPtr_.exception = new_exception.Ptr(); } +bool Thread::IsAotCompiler() { + return Runtime::Current()->IsAotCompiler(); +} + } // namespace art diff --git a/runtime/thread.h b/runtime/thread.h index 35226f2230..b80fdc751b 100644 --- a/runtime/thread.h +++ b/runtime/thread.h @@ -33,13 +33,13 @@ #include "base/mutex.h" #include "entrypoints/jni/jni_entrypoints.h" #include "entrypoints/quick/quick_entrypoints.h" +#include "gc_root.h" #include "globals.h" #include "handle_scope.h" #include "instrumentation.h" #include "jvalue.h" #include "object_callbacks.h" #include "offsets.h" -#include "runtime.h" #include "runtime_stats.h" #include "stack.h" #include "thread_state.h" @@ -87,7 +87,6 @@ class FrameIdToShadowFrame; class JavaVMExt; struct JNIEnvExt; class Monitor; -class Runtime; class ScopedObjectAccessAlreadyRunnable; class ShadowFrame; class SingleStepControl; @@ -949,17 +948,17 @@ class Thread { } std::vector<ArtMethod*>* GetStackTraceSample() const { - DCHECK(!Runtime::Current()->IsAotCompiler()); + DCHECK(!IsAotCompiler()); return tlsPtr_.deps_or_stack_trace_sample.stack_trace_sample; } void SetStackTraceSample(std::vector<ArtMethod*>* sample) { - DCHECK(!Runtime::Current()->IsAotCompiler()); + DCHECK(!IsAotCompiler()); tlsPtr_.deps_or_stack_trace_sample.stack_trace_sample = sample; } verifier::VerifierDeps* GetVerifierDeps() const { - DCHECK(Runtime::Current()->IsAotCompiler()); + DCHECK(IsAotCompiler()); return tlsPtr_.deps_or_stack_trace_sample.verifier_deps; } @@ -967,7 +966,7 @@ class Thread { // entry in the thread is cleared before destruction of the actual VerifierDeps // object, or the thread. void SetVerifierDeps(verifier::VerifierDeps* verifier_deps) { - DCHECK(Runtime::Current()->IsAotCompiler()); + DCHECK(IsAotCompiler()); DCHECK(verifier_deps == nullptr || tlsPtr_.deps_or_stack_trace_sample.verifier_deps == nullptr); tlsPtr_.deps_or_stack_trace_sample.verifier_deps = verifier_deps; } @@ -1246,6 +1245,8 @@ class Thread { // Install the protected region for implicit stack checks. void InstallImplicitProtection(); + static bool IsAotCompiler(); + // 32 bits of atomically changed state and flags. Keeping as 32 bits allows and atomic CAS to // change from being Suspended to Runnable without a suspend request occurring. union PACKED(4) StateAndFlags { |