Mercurial > hg > graal-compiler

changeset 9101:cfe822a31f67

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use same type check for varargs and non-varargs parameters
author Christian Wimmer <christian.wimmer@oracle.com>
date Fri, 12 Apr 2013 17:40:53 -0700
parents d24955427b0b
children 908cac5f443c
files graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/NodeIntrinsificationPhase.java
diffstat 1 files changed, 1 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/NodeIntrinsificationPhase.java	Fri Apr 12 16:08:08 2013 -0700
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/NodeIntrinsificationPhase.java	Fri Apr 12 17:40:53 2013 -0700
@@ -184,13 +184,6 @@
         return result;
     }
 
-    private ResolvedJavaType asBoxedType(ResolvedJavaType type) {
-        if (!type.isPrimitive()) {
-            return type;
-        }
-        return runtime.lookupJavaType(type.getKind().toBoxedJavaClass());
-    }
-
     private Node createNodeInstance(ResolvedJavaType nodeClass, ResolvedJavaType[] parameterTypes, ResolvedJavaType returnType, boolean setStampFromReturnType, Constant[] nodeConstructorArguments) {
         ResolvedJavaMethod constructor = null;
         Constant[] arguments = null;
@@ -256,9 +249,8 @@
 
             ResolvedJavaType componentType = signature[fixedArgs].getComponentType();
             assert componentType != null;
-            ResolvedJavaType boxedType = asBoxedType(componentType);
             for (int i = fixedArgs; i < nodeConstructorArguments.length; i++) {
-                if (!boxedType.isAssignableFrom(runtime.lookupJavaType(nodeConstructorArguments[i]))) {
+                if (!parameterTypes[i].equals(componentType)) {
                     return null;
                 }
             }