Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authoracorn
Mon, 28 Jan 2013 09:33:55 -0800
changeset 15440 513039c8c418
parent 15438 2d1c179e9b5c (current diff)
parent 15439 a72c53517fe7 (diff)
child 15441 b96e139eb20c
child 15442 047acb1184df
child 15444 ab03781780dc
child 15455 c0a94d1e6b59
Merge
--- a/hotspot/make/bsd/makefiles/mapfile-vers-debug	Mon Jan 28 10:34:07 2013 -0500
+++ b/hotspot/make/bsd/makefiles/mapfile-vers-debug	Mon Jan 28 09:33:55 2013 -0800
@@ -188,6 +188,7 @@
                 JVM_IsSilentCompiler;
                 JVM_IsSupportedJNIVersion;
                 JVM_IsThreadAlive;
+                JVM_IsVMGeneratedMethodIx;
                 JVM_LatestUserDefinedLoader;
                 JVM_Listen;
                 JVM_LoadClass0;
--- a/hotspot/make/bsd/makefiles/mapfile-vers-product	Mon Jan 28 10:34:07 2013 -0500
+++ b/hotspot/make/bsd/makefiles/mapfile-vers-product	Mon Jan 28 09:33:55 2013 -0800
@@ -188,6 +188,7 @@
                 JVM_IsSilentCompiler;
                 JVM_IsSupportedJNIVersion;
                 JVM_IsThreadAlive;
+                JVM_IsVMGeneratedMethodIx;
                 JVM_LatestUserDefinedLoader;
                 JVM_Listen;
                 JVM_LoadClass0;
--- a/hotspot/make/linux/makefiles/mapfile-vers-debug	Mon Jan 28 10:34:07 2013 -0500
+++ b/hotspot/make/linux/makefiles/mapfile-vers-debug	Mon Jan 28 09:33:55 2013 -0800
@@ -184,6 +184,7 @@
                 JVM_IsSilentCompiler;
                 JVM_IsSupportedJNIVersion;
                 JVM_IsThreadAlive;
+                JVM_IsVMGeneratedMethodIx;
                 JVM_LatestUserDefinedLoader;
                 JVM_Listen;
                 JVM_LoadClass0;
--- a/hotspot/make/linux/makefiles/mapfile-vers-product	Mon Jan 28 10:34:07 2013 -0500
+++ b/hotspot/make/linux/makefiles/mapfile-vers-product	Mon Jan 28 09:33:55 2013 -0800
@@ -184,6 +184,7 @@
                 JVM_IsSilentCompiler;
                 JVM_IsSupportedJNIVersion;
                 JVM_IsThreadAlive;
+                JVM_IsVMGeneratedMethodIx;
                 JVM_LatestUserDefinedLoader;
                 JVM_Listen;
                 JVM_LoadClass0;
--- a/hotspot/make/solaris/makefiles/mapfile-vers	Mon Jan 28 10:34:07 2013 -0500
+++ b/hotspot/make/solaris/makefiles/mapfile-vers	Mon Jan 28 09:33:55 2013 -0800
@@ -184,6 +184,7 @@
                 JVM_IsSilentCompiler;
                 JVM_IsSupportedJNIVersion;
                 JVM_IsThreadAlive;
+                JVM_IsVMGeneratedMethodIx;
                 JVM_LatestUserDefinedLoader;
                 JVM_Listen;
                 JVM_LoadClass0;
--- a/hotspot/src/share/vm/prims/jvm.cpp	Mon Jan 28 10:34:07 2013 -0500
+++ b/hotspot/src/share/vm/prims/jvm.cpp	Mon Jan 28 09:33:55 2013 -0800
@@ -2302,6 +2302,15 @@
 JVM_END
 
 
+JVM_QUICK_ENTRY(jboolean, JVM_IsVMGeneratedMethodIx(JNIEnv *env, jclass cls, int method_index))
+  JVMWrapper("JVM_IsVMGeneratedMethodIx");
+  ResourceMark rm(THREAD);
+  Klass* k = java_lang_Class::as_Klass(JNIHandles::resolve_non_null(cls));
+  k = JvmtiThreadState::class_to_verify_considering_redefinition(k, thread);
+  Method* method = InstanceKlass::cast(k)->methods()->at(method_index);
+  return method->is_overpass();
+JVM_END
+
 JVM_ENTRY(const char*, JVM_GetMethodIxNameUTF(JNIEnv *env, jclass cls, jint method_index))
   JVMWrapper("JVM_GetMethodIxIxUTF");
   Klass* k = java_lang_Class::as_Klass(JNIHandles::resolve_non_null(cls));
--- a/hotspot/src/share/vm/prims/jvm.h	Mon Jan 28 10:34:07 2013 -0500
+++ b/hotspot/src/share/vm/prims/jvm.h	Mon Jan 28 09:33:55 2013 -0800
@@ -860,6 +860,13 @@
 JVM_IsConstructorIx(JNIEnv *env, jclass cb, int index);
 
 /*
+ * Is the given method generated by the VM.
+ * The method is identified by method_index.
+ */
+JNIEXPORT jboolean JNICALL
+JVM_IsVMGeneratedMethodIx(JNIEnv *env, jclass cb, int index);
+
+/*
  * Returns the name of a given method in UTF format.
  * The result remains valid until JVM_ReleaseUTF is called.
  *
jdk-sandbox