Mercurial > hg > graal-compiler
changeset 7134:3de18d9cd04e
Remove a usasge of getMirrorOrFail
author | Christian Wimmer <christian.wimmer@oracle.com> |
---|---|
date | Tue, 04 Dec 2012 11:02:56 -0800 |
parents | f7e38b3950b3 |
children | c41a958a3923 |
files | graal/com.oracle.graal.snippets.test/src/com/oracle/graal/snippets/WordTest.java graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/Snippet.java graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/SnippetInstaller.java |
diffstat | 3 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.snippets.test/src/com/oracle/graal/snippets/WordTest.java Tue Dec 04 10:53:19 2012 -0800 +++ b/graal/com.oracle.graal.snippets.test/src/com/oracle/graal/snippets/WordTest.java Tue Dec 04 11:02:56 2012 -0800 @@ -116,7 +116,7 @@ @Test public void test_fromObject() { - inliningPolicy.set(new DefaultSnippetInliningPolicy(new BoxingMethodPool(runtime())) { + inliningPolicy.set(new DefaultSnippetInliningPolicy(runtime(), new BoxingMethodPool(runtime())) { @Override public boolean shouldInline(ResolvedJavaMethod method, ResolvedJavaMethod caller) { return super.shouldInline(method, caller) && !method.getName().equals("hashCode");
--- a/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/Snippet.java Tue Dec 04 10:53:19 2012 -0800 +++ b/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/Snippet.java Tue Dec 04 11:02:56 2012 -0800 @@ -22,8 +22,6 @@ */ package com.oracle.graal.snippets; -import static com.oracle.graal.api.meta.MetaUtil.*; - import java.lang.annotation.*; import java.lang.reflect.*; @@ -73,9 +71,11 @@ * </ul> */ public static class DefaultSnippetInliningPolicy implements SnippetInliningPolicy { + private final MetaAccessProvider metaAccess; private final BoxingMethodPool pool; - public DefaultSnippetInliningPolicy(BoxingMethodPool pool) { + public DefaultSnippetInliningPolicy(MetaAccessProvider metaAccess, BoxingMethodPool pool) { + this.metaAccess = metaAccess; this.pool = pool; } @@ -90,7 +90,7 @@ if (method.getAnnotation(NodeIntrinsic.class) != null) { return false; } - if (Throwable.class.isAssignableFrom(getMirrorOrFail(method.getDeclaringClass(), null))) { + if (metaAccess.lookupJavaType(Throwable.class).isAssignableFrom(method.getDeclaringClass())) { if (method.getName().equals("<init>")) { return false; }
--- a/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/SnippetInstaller.java Tue Dec 04 10:53:19 2012 -0800 +++ b/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/SnippetInstaller.java Tue Dec 04 11:02:56 2012 -0800 @@ -130,7 +130,7 @@ policyClass = snippet.inlining(); } if (policyClass == SnippetInliningPolicy.class) { - return new DefaultSnippetInliningPolicy(pool); + return new DefaultSnippetInliningPolicy(runtime, pool); } try { return policyClass.getConstructor().newInstance();