# HG changeset patch # User Doug Simon # Date 1385754414 -3600 # Node ID e343d4623e47097a2f204beff8f42e9c67e6cb4e # Parent bb992a44734e4e6d6d113a9773e692ae23d86c03 weakened assertion around type profiles to allow array types (GRAAL-618) diff -r bb992a44734e -r e343d4623e47 graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningUtil.java --- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningUtil.java Fri Nov 29 17:40:03 2013 +0100 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningUtil.java Fri Nov 29 20:46:54 2013 +0100 @@ -435,7 +435,7 @@ super(invoke); this.concrete = concrete; this.type = type; - assert !isAbstract(type.getModifiers()) : type; + assert type.isArray() || !isAbstract(type.getModifiers()) : type; } @Override @@ -1139,7 +1139,7 @@ } ResolvedJavaType type = ptypes[0].getType(); - assert !isAbstract(type.getModifiers()); + assert type.isArray() || !isAbstract(type.getModifiers()); ResolvedJavaMethod concrete = type.resolveMethod(targetMethod); if (!checkTargetConditions(data, replacements, invoke, concrete, optimisticOpts)) { return null; @@ -1211,7 +1211,7 @@ if (index == -1) { notRecordedTypeProbability += type.getProbability(); } else { - assert !isAbstract(type.getType().getModifiers()); + assert type.getType().isArray() || !isAbstract(type.getType().getModifiers()) : type + " " + concrete; usedTypes.add(type); typesToConcretes.add(index); }