# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1338562467 -7200
# Node ID fa979ebe01861dfabd411bc89d25925a91999ed5
# Parent  c9b8994b43d85393e25e0db7520cf684c2ea6fd4# Parent  7a0d58000ae03d08edccefae3e2f1773e1f2cc34
Merge.

diff -r 7a0d58000ae0 -r fa979ebe0186 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java	Fri Jun 01 16:29:04 2012 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java	Fri Jun 01 16:54:27 2012 +0200
@@ -194,11 +194,6 @@
     }
 
     @Override
-    public boolean isExceptionType(RiResolvedType type) {
-        return type.isSubtypeOf((RiResolvedType) compiler.getCompilerToVM().getType(Throwable.class));
-    }
-
-    @Override
     public int sizeOfLockData() {
         // TODO shouldn't be hard coded
         return 8;
@@ -234,16 +229,6 @@
     }
 
     @Override
-    public Class<?> asJavaClass(CiConstant c) {
-        return (Class<?>) c.asObject();
-    }
-
-    @Override
-    public Object asJavaObject(CiConstant c) {
-        return c.asObject();
-    }
-
-    @Override
     public void lower(Node n, CiLoweringTool tool) {
         StructuredGraph graph = (StructuredGraph) n.graph();
 
diff -r 7a0d58000ae0 -r fa979ebe0186 graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiRuntime.java
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiRuntime.java	Fri Jun 01 16:29:04 2012 +0200
+++ b/graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiRuntime.java	Fri Jun 01 16:54:27 2012 +0200
@@ -69,11 +69,6 @@
     RiResolvedType getType(Class<?> clazz);
 
     /**
-     * Returns true if the given type is a subtype of java/lang/Throwable.
-     */
-    boolean isExceptionType(RiResolvedType type);
-
-    /**
      * Used by the canonicalizer to compare objects, since a given runtime might not want to expose the real objects to the compiler.
      *
      * @return true if the two parameters represent the same runtime object, false otherwise
@@ -108,20 +103,6 @@
     int getArrayLength(CiConstant array);
 
     /**
-     * Converts the given CiConstant object to a object.
-     *
-     * @return {@code null} if the conversion is not possible <b>OR</b> {@code c.isNull() == true}
-     */
-    Object asJavaObject(CiConstant c);
-
-    /**
-     * Converts the given CiConstant object to a {@link Class} object.
-     *
-     * @return {@code null} if the conversion is not possible.
-     */
-    Class<?> asJavaClass(CiConstant c);
-
-    /**
      * Performs any runtime-specific conversion on the object used to describe the target of a call.
      */
     Object asCallTarget(Object target);