changeset 9168:78c11f573795

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
author sgehwolf
date Mon, 07 Aug 2017 12:19:17 +0200
parents 67dddb025b7b
children b893d11d147f
files src/share/vm/oops/instanceKlass.cpp src/share/vm/services/classLoadingService.cpp
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/oops/instanceKlass.cpp	Tue May 24 12:42:43 2016 -0500
+++ b/src/share/vm/oops/instanceKlass.cpp	Mon Aug 07 12:19:17 2017 +0200
@@ -147,7 +147,7 @@
       len = name->utf8_length();                                 \
     }                                                            \
     HOTSPOT_CLASS_INITIALIZATION_##type(                         \
-      data, len, (clss)->class_loader(), thread_type);           \
+      data, len, (void *)(clss)->class_loader(), thread_type); \
   }
 
 #define DTRACE_CLASSINIT_PROBE_WAIT(type, clss, thread_type, wait) \
@@ -160,7 +160,7 @@
       len = name->utf8_length();                                 \
     }                                                            \
     HOTSPOT_CLASS_INITIALIZATION_##type(                         \
-      data, len, (clss)->class_loader(), thread_type, wait);     \
+      data, len, (void *)(clss)->class_loader(), thread_type, wait); \
   }
 #endif /* USDT2 */
 
--- a/src/share/vm/services/classLoadingService.cpp	Tue May 24 12:42:43 2016 -0500
+++ b/src/share/vm/services/classLoadingService.cpp	Mon Aug 07 12:19:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -69,7 +69,7 @@
       len = name->utf8_length();                    \
     }                                               \
     HOTSPOT_CLASS_##type( /* type = unloaded, loaded */ \
-      data, len, (clss)->class_loader(), (shared)); \
+      data, len, (void *)(clss)->class_loader(), (shared)); \
   }
 
 #endif /* USDT2 */