src/share/vm/oops/instanceKlass.cpp

changeset 5784
190899198332
parent 5755
0f37d1badced
child 5786
36b97be47bde
equal deleted inserted replaced
5783:c1fbf21c7397 5784:190899198332
104 if (name != NULL) { \ 104 if (name != NULL) { \
105 data = (char*)name->bytes(); \ 105 data = (char*)name->bytes(); \
106 len = name->utf8_length(); \ 106 len = name->utf8_length(); \
107 } \ 107 } \
108 HS_DTRACE_PROBE4(hotspot, class__initialization__##type, \ 108 HS_DTRACE_PROBE4(hotspot, class__initialization__##type, \
109 data, len, (clss)->class_loader(), thread_type); \ 109 data, len, SOLARIS_ONLY((void *))(clss)->class_loader(), thread_type); \
110 } 110 }
111 111
112 #define DTRACE_CLASSINIT_PROBE_WAIT(type, clss, thread_type, wait) \ 112 #define DTRACE_CLASSINIT_PROBE_WAIT(type, clss, thread_type, wait) \
113 { \ 113 { \
114 char* data = NULL; \ 114 char* data = NULL; \
117 if (name != NULL) { \ 117 if (name != NULL) { \
118 data = (char*)name->bytes(); \ 118 data = (char*)name->bytes(); \
119 len = name->utf8_length(); \ 119 len = name->utf8_length(); \
120 } \ 120 } \
121 HS_DTRACE_PROBE5(hotspot, class__initialization__##type, \ 121 HS_DTRACE_PROBE5(hotspot, class__initialization__##type, \
122 data, len, (clss)->class_loader(), thread_type, wait); \ 122 data, len, SOLARIS_ONLY((void *))(clss)->class_loader(), thread_type, wait); \
123 } 123 }
124 #else /* USDT2 */ 124 #else /* USDT2 */
125 125
126 #define HOTSPOT_CLASS_INITIALIZATION_required HOTSPOT_CLASS_INITIALIZATION_REQUIRED 126 #define HOTSPOT_CLASS_INITIALIZATION_required HOTSPOT_CLASS_INITIALIZATION_REQUIRED
127 #define HOTSPOT_CLASS_INITIALIZATION_recursive HOTSPOT_CLASS_INITIALIZATION_RECURSIVE 127 #define HOTSPOT_CLASS_INITIALIZATION_recursive HOTSPOT_CLASS_INITIALIZATION_RECURSIVE
2301 _source_debug_extension = sde; 2301 _source_debug_extension = sde;
2302 } 2302 }
2303 } 2303 }
2304 2304
2305 address InstanceKlass::static_field_addr(int offset) { 2305 address InstanceKlass::static_field_addr(int offset) {
2306 return (address)(offset + InstanceMirrorKlass::offset_of_static_fields() + (intptr_t)java_mirror()); 2306 return (address)(offset + InstanceMirrorKlass::offset_of_static_fields() + cast_from_oop<intptr_t>(java_mirror()));
2307 } 2307 }
2308 2308
2309 2309
2310 const char* InstanceKlass::signature_name() const { 2310 const char* InstanceKlass::signature_name() const {
2311 const char* src = (const char*) (name()->as_C_string()); 2311 const char* src = (const char*) (name()->as_C_string());

mercurial