8185900: hotspot build failed with gcc version Red Hat 4.4.7-3

Mon, 07 Aug 2017 12:19:17 +0200

author
sgehwolf
date
Mon, 07 Aug 2017 12:19:17 +0200
changeset 9721
78c11f573795
parent 9720
67dddb025b7b
child 9722
b893d11d147f

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

src/share/vm/oops/instanceKlass.cpp file | annotate | diff | comparison | revisions
src/share/vm/services/classLoadingService.cpp file | annotate | diff | comparison | revisions
     1.1 --- a/src/share/vm/oops/instanceKlass.cpp	Tue May 24 12:42:43 2016 -0500
     1.2 +++ b/src/share/vm/oops/instanceKlass.cpp	Mon Aug 07 12:19:17 2017 +0200
     1.3 @@ -147,7 +147,7 @@
     1.4        len = name->utf8_length();                                 \
     1.5      }                                                            \
     1.6      HOTSPOT_CLASS_INITIALIZATION_##type(                         \
     1.7 -      data, len, (clss)->class_loader(), thread_type);           \
     1.8 +      data, len, (void *)(clss)->class_loader(), thread_type); \
     1.9    }
    1.10  
    1.11  #define DTRACE_CLASSINIT_PROBE_WAIT(type, clss, thread_type, wait) \
    1.12 @@ -160,7 +160,7 @@
    1.13        len = name->utf8_length();                                 \
    1.14      }                                                            \
    1.15      HOTSPOT_CLASS_INITIALIZATION_##type(                         \
    1.16 -      data, len, (clss)->class_loader(), thread_type, wait);     \
    1.17 +      data, len, (void *)(clss)->class_loader(), thread_type, wait); \
    1.18    }
    1.19  #endif /* USDT2 */
    1.20  
     2.1 --- a/src/share/vm/services/classLoadingService.cpp	Tue May 24 12:42:43 2016 -0500
     2.2 +++ b/src/share/vm/services/classLoadingService.cpp	Mon Aug 07 12:19:17 2017 +0200
     2.3 @@ -1,5 +1,5 @@
     2.4  /*
     2.5 - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
     2.6 + * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
     2.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8   *
     2.9   * This code is free software; you can redistribute it and/or modify it
    2.10 @@ -69,7 +69,7 @@
    2.11        len = name->utf8_length();                    \
    2.12      }                                               \
    2.13      HOTSPOT_CLASS_##type( /* type = unloaded, loaded */ \
    2.14 -      data, len, (clss)->class_loader(), (shared)); \
    2.15 +      data, len, (void *)(clss)->class_loader(), (shared)); \
    2.16    }
    2.17  
    2.18  #endif /* USDT2 */

mercurial