diff options
Diffstat (limited to 'openjdkjvmti/art_jvmti.h')
| -rw-r--r-- | openjdkjvmti/art_jvmti.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/openjdkjvmti/art_jvmti.h b/openjdkjvmti/art_jvmti.h index 083ba6ddf1..bc965a232f 100644 --- a/openjdkjvmti/art_jvmti.h +++ b/openjdkjvmti/art_jvmti.h @@ -47,9 +47,11 @@ #include "base/strlcpy.h" #include "base/mutex.h" #include "events.h" +#include "instrumentation.h" #include "jni/java_vm_ext.h" #include "jni/jni_env_ext.h" #include "jvmti.h" +#include "runtime.h" #include "ti_breakpoint.h" namespace art { @@ -69,6 +71,13 @@ class ObjectTagTable; // This is the value 0x70010200. static constexpr jint kArtTiVersion = JVMTI_VERSION_1_2 | 0x40000000; +// Returns whether we are able to use all jvmti features. +static inline bool IsFullJvmtiAvailable() { + art::Runtime* runtime = art::Runtime::Current(); + return runtime->GetInstrumentation()->IsForcedInterpretOnly() || + runtime->IsJavaDebuggableAtInit(); +} + // A structure that is a jvmtiEnv with additional information for the runtime. struct ArtJvmTiEnv : public jvmtiEnv { art::JavaVMExt* art_vm; @@ -141,7 +150,7 @@ class JvmtiDeleter { explicit JvmtiDeleter(jvmtiEnv* env) : env_(env) {} JvmtiDeleter(JvmtiDeleter&) = default; - JvmtiDeleter(JvmtiDeleter&&) = default; + JvmtiDeleter(JvmtiDeleter&&) noexcept = default; JvmtiDeleter& operator=(const JvmtiDeleter&) = default; void operator()(T* ptr) const { @@ -161,7 +170,7 @@ class JvmtiDeleter<T[]> { explicit JvmtiDeleter(jvmtiEnv* env) : env_(env) {} JvmtiDeleter(JvmtiDeleter&) = default; - JvmtiDeleter(JvmtiDeleter&&) = default; + JvmtiDeleter(JvmtiDeleter&&) noexcept = default; JvmtiDeleter& operator=(const JvmtiDeleter&) = default; template <typename U> |