Mercurial > hg > graal-compiler

changeset 15755:05826e450e3e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix NPE in CallSiteHolder
author Lukas Stadler <lukas.stadler@oracle.com>
date Mon, 19 May 2014 13:58:16 +0200
parents 45285c8eccbd
children 10830a8ab30d ce5b2557396a
files graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/CallsiteHolder.java
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/CallsiteHolder.java	Mon May 19 11:19:07 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/CallsiteHolder.java	Mon May 19 13:58:16 2014 +0200
@@ -85,7 +85,7 @@
      * Gets the method associated with the {@linkplain #graph() graph} represented by this object.
      */
     public ResolvedJavaMethod method() {
-        return graph.method();
+        return graph == null ? null : graph.method();
     }
 
     public boolean hasRemainingInvokes() {