# HG changeset patch
# User Laurent Daynes <Laurent.Daynes@oracle.com>
# Date 1402643166 -7200
# Node ID 32ddc8096f4c001ad4b0be5b5040249672952709
# Parent  8d164bec9807bbf54a0320a8f6af526c65dfa4f7# Parent  64e17273306181943d7ebe393d0a21b591ecd4cd
Merge

diff -r 64e172733061 -r 32ddc8096f4c graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleExpansionLogger.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleExpansionLogger.java	Thu Jun 12 11:40:33 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleExpansionLogger.java	Fri Jun 13 09:06:06 2014 +0200
@@ -50,7 +50,7 @@
         int sourceMethodBci = callTarget.invoke().bci();
         ResolvedJavaMethod targetMethod = callTarget.targetMethod();
         ResolvedJavaType targetReceiverType = null;
-        if (!sourceMethod.isStatic() && callTarget.receiver().isConstant()) {
+        if (!sourceMethod.isStatic() && callTarget.receiver() != null && callTarget.receiver().isConstant()) {
             targetReceiverType = providers.getMetaAccess().lookupJavaType(callTarget.arguments().first().asConstant());
         }
 
diff -r 64e172733061 -r 32ddc8096f4c src/share/vm/graal/graalCompilerToVM.cpp
--- a/src/share/vm/graal/graalCompilerToVM.cpp	Thu Jun 12 11:40:33 2014 +0200
+++ b/src/share/vm/graal/graalCompilerToVM.cpp	Fri Jun 13 09:06:06 2014 +0200
@@ -367,7 +367,7 @@
       methodHandle resolved_method;
       LinkResolver::linktime_resolve_interface_method(resolved_method, holder_klass, method_name, method_signature, caller_klass, true, CHECK_AND_CLEAR_0);
       if (resolved_method->is_private()) {
-        return (jlong) NULL;
+        return (jlong) (address) NULL;
       }
       assert(recv_klass->is_subtype_of(holder_klass), "");
       // do actual lookup
@@ -413,7 +413,7 @@
       return (jlong) (address) selected_method;
     }
   }
-  return (jlong) NULL;
+  return (jlong) (address) NULL;
 C2V_END
 
 C2V_VMENTRY(jboolean, hasFinalizableSubclass,(JNIEnv *, jobject, jlong metaspace_klass))