# HG changeset patch # User sgehwolf # Date 1502101157 -7200 # Node ID 78c11f573795375e395af64fba3e051d7d5381ab # Parent 67dddb025b7baca23b8965b1af0d6f89b81c969c 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 diff -r 67dddb025b7b -r 78c11f573795 src/share/vm/oops/instanceKlass.cpp --- 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 */ diff -r 67dddb025b7b -r 78c11f573795 src/share/vm/services/classLoadingService.cpp --- 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 */