/hg/release/icedtea7-forest-2.3/jdk: Fix merge issues caused by ...

[andrew at icedtea.classpath.org]

changeset 6f1a1e26f521 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=6f1a1e26f521
author: andrew
date: Thu Aug 08 01:48:56 2013 +0100

	Fix merge issues caused by faulty AOT 8010118 patch.


diffstat:

 src/share/classes/sun/reflect/misc/ReflectUtil.java |  8 --------
 src/share/native/sun/reflect/Reflection.c           |  4 +---
 2 files changed, 1 insertions(+), 11 deletions(-)

diffs (32 lines):

diff -r 64c0a3fb78cd -r 6f1a1e26f521 src/share/classes/sun/reflect/misc/ReflectUtil.java
--- a/src/share/classes/sun/reflect/misc/ReflectUtil.java	Tue Jul 02 13:23:35 2013 -0700
+++ b/src/share/classes/sun/reflect/misc/ReflectUtil.java	Thu Aug 08 01:48:56 2013 +0100
@@ -47,14 +47,6 @@
         return cls.newInstance();
     }
 
-    public static void ensureClassAccess(Class clazz)
-           throws IllegalAccessException
-    {
-        int mod = clazz.getModifiers();
-        if ( ! Modifier.isPublic(mod) ){
-            throw new IllegalAccessException("Class is not public and can't be instantiated");
-        }
-    }
     /*
      * Reflection.ensureMemberAccess is overly-restrictive
      * due to a bug. We awkwardly work around it for now.
diff -r 64c0a3fb78cd -r 6f1a1e26f521 src/share/native/sun/reflect/Reflection.c
--- a/src/share/native/sun/reflect/Reflection.c	Tue Jul 02 13:23:35 2013 -0700
+++ b/src/share/native/sun/reflect/Reflection.c	Thu Aug 08 01:48:56 2013 +0100
@@ -37,9 +37,7 @@
 JNIEXPORT jclass JNICALL Java_sun_reflect_Reflection_getCallerClass0
 (JNIEnv *env, jclass unused, jint depth)
 {
-    // Until there is hotspot @CallerSensitive support,
-    // depth must always be 2 to get the immediate caller
-    return JVM_GetCallerClass(env, 2);
+    return JVM_GetCallerClass(env, depth);
 }
 
 JNIEXPORT jint JNICALL Java_sun_reflect_Reflection_getClassAccessFlags