Mercurial > hg > graal-jvmci-8
changeset 5349:077ec9468516
rename CiKind.toUnboxedJavaClass to toBoxedJavaClass
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Fri, 27 Apr 2012 13:13:06 +0200 |
parents | 158a230b4331 |
children | de571c017f61 |
files | graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/BoxingEliminationPhase.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotCompiledMethod.java graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiKind.java |
diffstat | 3 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/BoxingEliminationPhase.java Fri Apr 27 12:14:47 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/BoxingEliminationPhase.java Fri Apr 27 13:13:06 2012 +0200 @@ -68,7 +68,7 @@ PhiNode result = null; if (phiNode.stamp().nonNull()) { RiResolvedType exactType = phiNode.stamp().exactType(); - if (exactType != null && exactType.toJava() == kind.toUnboxedJavaClass()) { + if (exactType != null && exactType.toJava() == kind.toBoxedJavaClass()) { StructuredGraph graph = (StructuredGraph) phiNode.graph(); result = graph.add(new PhiNode(kind, phiNode.merge(), PhiType.Value)); phiReplacements.put(phiNode, result);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotCompiledMethod.java Fri Apr 27 12:14:47 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotCompiledMethod.java Fri Apr 27 13:13:06 2012 +0200 @@ -79,7 +79,7 @@ if (arg == null) { assert sig[i].isObject() : CiUtil.format("%H.%n(%p): expected arg ", method) + i + " to be Object, not " + sig[i]; } else if (!sig[i].isObject()) { - assert sig[i].toUnboxedJavaClass() == arg.getClass() : CiUtil.format("%H.%n(%p): expected arg ", method) + i + " to be " + sig[i] + ", not " + arg.getClass(); + assert sig[i].toBoxedJavaClass() == arg.getClass() : CiUtil.format("%H.%n(%p): expected arg ", method) + i + " to be " + sig[i] + ", not " + arg.getClass(); } } return true;
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiKind.java Fri Apr 27 12:14:47 2012 +0200 +++ b/graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiKind.java Fri Apr 27 13:13:06 2012 +0200 @@ -186,7 +186,7 @@ // Checkstyle: resume } - public Class< ? > toUnboxedJavaClass() { + public Class< ? > toBoxedJavaClass() { // Checkstyle: stop switch(this) { case Void: return null;