Mercurial > hg > truffle

changeset 10573:ee1b82e8c1f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Doug Simon <doug.simon@oracle.com>
date Fri, 28 Jun 2013 17:33:44 +0200
parents ef7490090dbf (diff) 2f80624df8a2 (current diff)
children 0cad5096735e
files
diffstat 3 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_newarray.java	Fri Jun 28 16:36:27 2013 +0200
+++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_newarray.java	Fri Jun 28 17:33:44 2013 +0200
@@ -30,6 +30,7 @@
  */
 public class BC_newarray extends JTTTest {
 
+    @SuppressWarnings("all")
     public static int test(int a) {
         if (new boolean[3] == null) {
             return -1;
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_newarray.java	Fri Jun 28 16:36:27 2013 +0200
+++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_newarray.java	Fri Jun 28 17:33:44 2013 +0200
@@ -33,6 +33,7 @@
  */
 public class BC_newarray extends JTTTest {
 
+    @SuppressWarnings("all")
     public static int test(int a) {
         if (new boolean[a] == null) {
             return -1;
--- a/src/share/vm/prims/jvm.cpp	Fri Jun 28 16:36:27 2013 +0200
+++ b/src/share/vm/prims/jvm.cpp	Fri Jun 28 17:33:44 2013 +0200
@@ -671,7 +671,7 @@
   JVMWrapper("JVM_GetCallerClass");
 
   // Pre-JDK 8 and early builds of JDK 8 don't have a CallerSensitive annotation.
-  if (SystemDictionary::reflect_CallerSensitive_klass() == NULL) {
+  if (!JDK_Version::is_gte_jdk18x_version() || SystemDictionary::reflect_CallerSensitive_klass() == NULL) {
     Klass* k = thread->security_get_caller_class(depth);
     return (k == NULL) ? NULL : (jclass) JNIHandles::make_local(env, k->java_mirror());
   } else {