Mercurial > hg > truffle

diff src/share/vm/graal/graalCompilerToVM.cpp @ 16089:8d164bec9807

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Changed (jlong) NULL to (jlong) (address) NULL to remove warning that cause build failures on old version of gcc (4.1.2 as used on Oracle Linux Server 5.8).
author Laurent Daynes <Laurent.Daynes@oracle.com>
date Wed, 04 Jun 2014 04:08:02 -0700
parents 66a9286203a2
children 8fde32ece68e
line wrap: on
line diff
--- a/src/share/vm/graal/graalCompilerToVM.cpp	Wed Jun 11 10:38:56 2014 +0200
+++ b/src/share/vm/graal/graalCompilerToVM.cpp	Wed Jun 04 04:08:02 2014 -0700
@@ -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))