Mercurial > hg > truffle

changeset 14130:3a30575968cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Andreas Woess <andreas.woess@jku.at>
date Tue, 11 Mar 2014 14:45:35 +0100
parents 9864ae31e1fe (diff) d2030fa96c22 (current diff)
children 2c538e48bb1a 4eac66a9b87d
files graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaslineCompiler.java
diffstat 2 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.api.runtime/src/com/oracle/graal/api/runtime/Graal.java	Mon Mar 10 18:18:55 2014 +0100
+++ b/graal/com.oracle.graal.api.runtime/src/com/oracle/graal/api/runtime/Graal.java	Tue Mar 11 14:45:35 2014 +0100
@@ -34,6 +34,7 @@
 
     public static final java.security.Permission ACCESS_PERMISSION = new ReflectPermission("allowGraalAccess");
 
+    @CallerSensitive
     public static GraalRuntime getRuntime() {
         Class cc = Reflection.getCallerClass();
         if (cc.getClassLoader() != null) {
@@ -53,6 +54,7 @@
         }
     }
 
+    @CallerSensitive
     public static <T> T getRequiredCapability(Class<T> clazz) {
         Class cc = Reflection.getCallerClass();
         if (cc.getClassLoader() != null) {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java	Mon Mar 10 18:18:55 2014 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java	Tue Mar 11 14:45:35 2014 +0100
@@ -59,6 +59,7 @@
     /**
      * Gets the singleton {@link HotSpotGraalRuntime} object.
      */
+    @CallerSensitive
     public static HotSpotGraalRuntime runtime() {
         Class cc = Reflection.getCallerClass();
         if (cc != null && cc.getClassLoader() != null) {