Mercurial > hg > truffle
comparison src/share/vm/graal/graalCompilerToVM.cpp @ 16089:8d164bec9807
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 |
comparison
equal
deleted
inserted
replaced
16088:0bd92901891c | 16089:8d164bec9807 |
---|---|
365 if (holder_klass->is_interface()) { | 365 if (holder_klass->is_interface()) { |
366 // do link-time resolution to check all access rules. | 366 // do link-time resolution to check all access rules. |
367 methodHandle resolved_method; | 367 methodHandle resolved_method; |
368 LinkResolver::linktime_resolve_interface_method(resolved_method, holder_klass, method_name, method_signature, caller_klass, true, CHECK_AND_CLEAR_0); | 368 LinkResolver::linktime_resolve_interface_method(resolved_method, holder_klass, method_name, method_signature, caller_klass, true, CHECK_AND_CLEAR_0); |
369 if (resolved_method->is_private()) { | 369 if (resolved_method->is_private()) { |
370 return (jlong) NULL; | 370 return (jlong) (address) NULL; |
371 } | 371 } |
372 assert(recv_klass->is_subtype_of(holder_klass), ""); | 372 assert(recv_klass->is_subtype_of(holder_klass), ""); |
373 // do actual lookup | 373 // do actual lookup |
374 methodHandle sel_method; | 374 methodHandle sel_method; |
375 LinkResolver::lookup_instance_method_in_klasses(sel_method, recv_klass, | 375 LinkResolver::lookup_instance_method_in_klasses(sel_method, recv_klass, |
411 } | 411 } |
412 } | 412 } |
413 return (jlong) (address) selected_method; | 413 return (jlong) (address) selected_method; |
414 } | 414 } |
415 } | 415 } |
416 return (jlong) NULL; | 416 return (jlong) (address) NULL; |
417 C2V_END | 417 C2V_END |
418 | 418 |
419 C2V_VMENTRY(jboolean, hasFinalizableSubclass,(JNIEnv *, jobject, jlong metaspace_klass)) | 419 C2V_VMENTRY(jboolean, hasFinalizableSubclass,(JNIEnv *, jobject, jlong metaspace_klass)) |
420 Klass* klass = (Klass*) metaspace_klass; | 420 Klass* klass = (Klass*) metaspace_klass; |
421 assert(klass != NULL, "method must not be called for primitive types"); | 421 assert(klass != NULL, "method must not be called for primitive types"); |