Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8185900: hotspot build failed with gcc version Red Hat 4.4.7-3
authorsgehwolf
Mon, 07 Aug 2017 12:19:17 +0200
changeset 46766 1f26ac73b909
parent 46765 07298ebd9367
child 46767 e2bb2b8ff65a
8185900: hotspot build failed with gcc version Red Hat 4.4.7-3 Summary: Cast to void* within DTRACE_CLASS* macros. Reviewed-by: coleenp, shade
hotspot/src/share/vm/oops/instanceKlass.cpp file | annotate | diff | comparison | revisions
hotspot/src/share/vm/services/classLoadingService.cpp file | annotate | diff | comparison | revisions 
--- a/hotspot/src/share/vm/oops/instanceKlass.cpp	Mon Aug 07 12:34:21 2017 -0700
+++ b/hotspot/src/share/vm/oops/instanceKlass.cpp	Mon Aug 07 12:19:17 2017 +0200
@@ -101,7 +101,7 @@
       len = clss_name->utf8_length();                            \
     }                                                            \
     HOTSPOT_CLASS_INITIALIZATION_##type(                         \
-      data, len, class_loader(), thread_type);                   \
+      data, len, (void*)class_loader(), thread_type);            \
   }
 
 #define DTRACE_CLASSINIT_PROBE_WAIT(type, thread_type, wait)     \
@@ -114,7 +114,7 @@
       len = clss_name->utf8_length();                            \
     }                                                            \
     HOTSPOT_CLASS_INITIALIZATION_##type(                         \
-      data, len, class_loader(), thread_type, wait);             \
+      data, len, (void*)class_loader(), thread_type, wait);      \
   }
 
 #else //  ndef DTRACE_ENABLED
--- a/hotspot/src/share/vm/services/classLoadingService.cpp	Mon Aug 07 12:34:21 2017 -0700
+++ b/hotspot/src/share/vm/services/classLoadingService.cpp	Mon Aug 07 12:19:17 2017 +0200
@@ -53,7 +53,7 @@
       len = name->utf8_length();                    \
     }                                               \
     HOTSPOT_CLASS_##type( /* type = unloaded, loaded */ \
-      data, len, (clss)->class_loader(), (shared)); \
+      data, len, (void*)(clss)->class_loader(), (shared)); \
   }
 
 #else //  ndef DTRACE_ENABLED
jdk-sandbox