Mercurial > hg > truffle

changeset 13196:e343d4623e47

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
weakened assertion around type profiles to allow array types (GRAAL-618)
author Doug Simon <doug.simon@oracle.com>
date Fri, 29 Nov 2013 20:46:54 +0100
parents bb992a44734e
children 8569b9e047cd
files graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningUtil.java
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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);
                 }