Mercurial > hg > truffle

changeset 20879:550e422e5483

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed npe in BasicObjectCloneNode
author Doug Simon <doug.simon@oracle.com>
date Thu, 09 Apr 2015 22:03:39 +0200
parents 673e0b242d4d
children 9d58a4cda922
files graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BasicObjectCloneNode.java
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BasicObjectCloneNode.java	Thu Apr 09 22:03:07 2015 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BasicObjectCloneNode.java	Thu Apr 09 22:03:39 2015 +0200
@@ -77,15 +77,14 @@
             return null;
         } else if (objectStamp.isExactType()) {
             return isCloneableType(objectStamp.type(), metaAccess) ? objectStamp.type() : null;
-        } else {
+        } else if (assumptions != null) {
             AssumptionResult<ResolvedJavaType> leafConcreteSubtype = objectStamp.type().findLeafConcreteSubtype();
             if (leafConcreteSubtype != null && isCloneableType(leafConcreteSubtype.getResult(), metaAccess)) {
                 assumptions.record(leafConcreteSubtype);
                 return leafConcreteSubtype.getResult();
-            } else {
-                return null;
             }
         }
+        return null;
     }
 
     @Override