Mercurial > hg > graal-jvmci-8
changeset 5472:fa979ebe0186
Merge.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Fri, 01 Jun 2012 16:54:27 +0200 |
parents | c9b8994b43d8 (diff) 7a0d58000ae0 (current diff) |
children | af838558e9e5 5134cd2f25ed |
files | graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/TypeCheckSlowPath.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/target/amd64/AMD64TypeCheckSlowPathOp.java |
diffstat | 2 files changed, 0 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- 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();
--- 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);