1.1 --- a/src/share/vm/oops/instanceKlass.cpp Wed Sep 25 17:47:51 2013 +0200
1.2 +++ b/src/share/vm/oops/instanceKlass.cpp Thu Sep 26 10:25:02 2013 -0400
1.3 @@ -106,7 +106,7 @@
1.4 len = name->utf8_length(); \
1.5 } \
1.6 HS_DTRACE_PROBE4(hotspot, class__initialization__##type, \
1.7 - data, len, (clss)->class_loader(), thread_type); \
1.8 + data, len, SOLARIS_ONLY((void *))(clss)->class_loader(), thread_type); \
1.9 }
1.10
1.11 #define DTRACE_CLASSINIT_PROBE_WAIT(type, clss, thread_type, wait) \
1.12 @@ -119,7 +119,7 @@
1.13 len = name->utf8_length(); \
1.14 } \
1.15 HS_DTRACE_PROBE5(hotspot, class__initialization__##type, \
1.16 - data, len, (clss)->class_loader(), thread_type, wait); \
1.17 + data, len, SOLARIS_ONLY((void *))(clss)->class_loader(), thread_type, wait); \
1.18 }
1.19 #else /* USDT2 */
1.20
1.21 @@ -2303,7 +2303,7 @@
1.22 }
1.23
1.24 address InstanceKlass::static_field_addr(int offset) {
1.25 - return (address)(offset + InstanceMirrorKlass::offset_of_static_fields() + (intptr_t)java_mirror());
1.26 + return (address)(offset + InstanceMirrorKlass::offset_of_static_fields() + cast_from_oop<intptr_t>(java_mirror()));
1.27 }
1.28
1.29
