Mercurial > hg > truffle

changeset 7243:4979267ab857

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix warning, Fix overly strong assert (the value of the 'abstract' modifier for array types is unspecified)
author Gilles Duboscq <duboscq@ssw.jku.at>
date Mon, 17 Dec 2012 15:18:38 +0100
parents 80b278b69b5e
children a023cfaeb92e
files graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/ThreadSnippets.java graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningUtil.java
diffstat 2 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/ThreadSnippets.java	Mon Dec 17 14:36:30 2012 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/ThreadSnippets.java	Mon Dec 17 15:18:38 2012 +0100
@@ -38,7 +38,6 @@
     }
 
     @MethodSubstitution(isStatic = false)
-    @SuppressWarnings("unused")
     private static boolean isInterrupted(final Thread thisObject, boolean clearInterrupted) {
         Word rawThread = HotSpotCurrentRawThreadNode.get();
         Thread thread = (Thread) loadObjectFromWord(rawThread, threadObjectOffset());
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningUtil.java	Mon Dec 17 14:36:30 2012 +0100
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningUtil.java	Mon Dec 17 15:18:38 2012 +0100
@@ -798,7 +798,7 @@
         for (int i = 0; i < types.length; i++) {
             ProfiledType ptype = types[i];
             ResolvedJavaType type = ptype.getType();
-            assert !type.isInterface() && !Modifier.isAbstract(type.getModifiers());
+            assert !type.isInterface() && (type.isArray() || !Modifier.isAbstract(type.getModifiers())) : type;
             if (holder.isAssignableFrom(type)) {
                 result.add(ptype);
             }