# HG changeset patch
# User Gilles Duboscq <duboscq@ssw.jku.at>
# Date 1335525186 -7200
# Node ID 077ec9468516d89c90b30709eedbda6907583f41
# Parent  158a230b4331ac62c9609f3eeb0c78cd7fbe3a50
rename CiKind.toUnboxedJavaClass to toBoxedJavaClass

diff -r 158a230b4331 -r 077ec9468516 graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/BoxingEliminationPhase.java
--- 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);
diff -r 158a230b4331 -r 077ec9468516 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotCompiledMethod.java
--- 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;
diff -r 158a230b4331 -r 077ec9468516 graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiKind.java
--- 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;