# HG changeset patch
# User Andreas Woess <andreas.woess@jku.at>
# Date 1394545535 -3600
# Node ID 3a30575968cdf8efeeaf10fa2f311cdb9b5383be
# Parent  9864ae31e1fe4f73a71469bcec3e073852e8c523# Parent  d2030fa96c228dd16224be324ac11df563b2092a
Merge

diff -r d2030fa96c22 -r 3a30575968cd graal/com.oracle.graal.api.runtime/src/com/oracle/graal/api/runtime/Graal.java
--- 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) {
diff -r d2030fa96c22 -r 3a30575968cd graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java
--- 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) {