Mercurial > hg > graal-compiler
changeset 5394:afb983c25aa0
changed semantics of -G:HIRLowerCheckcast slightly
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Fri, 11 May 2012 16:58:22 +0200 |
parents | 3f9895797ff4 |
children | fc1943f18fef |
files | graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalOptions.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java |
diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalOptions.java Fri May 11 16:02:24 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalOptions.java Fri May 11 16:58:22 2012 +0200 @@ -259,7 +259,7 @@ /** * Use HIR lowering instead of LIR lowering for checkcast instructions. - * Only checkcasts in methods in a class whose name contains this option will be HIR lowered. + * Only checkcasts in methods whose fully qualified name contains this option will be HIR lowered. * TDOD (dnsimon) remove once HIR checkcast lowering works reliably */ public static String HIRLowerCheckcast;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java Fri May 11 16:02:24 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java Fri May 11 16:58:22 2012 +0200 @@ -412,7 +412,7 @@ memoryRead.dependencies().add(tool.createGuard(graph.unique(new NullCheckNode(objectClassNode.object(), false)), RiDeoptReason.NullCheckException, RiDeoptAction.InvalidateReprofile, StructuredGraph.INVALID_GRAPH_ID)); graph.replaceFixed(objectClassNode, memoryRead); } else if (n instanceof CheckCastNode) { - if (GraalOptions.HIRLowerCheckcast != null && graph.method() != null && graph.method().holder().name().contains(GraalOptions.HIRLowerCheckcast)) { + if (GraalOptions.HIRLowerCheckcast != null && graph.method() != null && CiUtil.format("%H.%n", graph.method()).contains(GraalOptions.HIRLowerCheckcast)) { final Map<CiConstant, CiConstant> hintHubsSet = new IdentityHashMap<>(); IsImmutablePredicate immutabilityPredicate = new IsImmutablePredicate() { public boolean apply(CiConstant constant) {