# HG changeset patch # User Lukas Stadler # Date 1400500696 -7200 # Node ID 05826e450e3eab87c607acd830d4fa255722f972 # Parent 45285c8eccbd1aaf61038c1b93a86fa32c2a4d8b fix NPE in CallSiteHolder diff -r 45285c8eccbd -r 05826e450e3e graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/CallsiteHolder.java --- 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() {