RFR: JDK-8301223: Replace NULL with nullptr in share/gc/g1/ [v2]

Johan Sjölen jsjolen at openjdk.org
Tue Apr 18 14:51:46 UTC 2023


On Tue, 18 Apr 2023 11:41:53 GMT, Johan Sjölen <jsjolen at openjdk.org> wrote:

>> Hi, this PR changes all occurrences of NULL to nullptr for the subdirectory share/gc/g1/. Unfortunately the script that does the change isn't perfect, and so we
>> need to comb through these manually to make sure nothing has gone wrong. I also review these changes but things slip past my eyes sometimes.
>> 
>> Here are some typical things to look out for:
>> 
>> 1. No changes but copyright header changed (probably because I reverted some changes but forgot the copyright).
>> 2. Macros having their NULL changed to nullptr, these are added to the script when I find them. They should be NULL.
>> 3. nullptr in comments and logs. We try to use lower case "null" in these cases as it reads better. An exception is made when code expressions are in a comment.
>> 
>> An example of this:
>> 
>> ```c++
>> // This function returns null
>> void* ret_null();
>> // This function returns true if *x == nullptr
>> bool is_nullptr(void** x);
>> 
>> 
>> Note how `nullptr` participates in a code expression here, we really are talking about the specific value `nullptr`.
>> 
>> Thanks!
>
> Johan Sjölen has updated the pull request incrementally with one additional commit since the last revision:
> 
>   Missed fix

Hm, got some funny errors:



=== Output from failing command(s) repeated here ===
* For target hotspot_variant-server_libjvm_objs_filemap.o:
/home/runner/work/jdk/jdk/src/hotspot/share/cds/filemap.cpp: In member function 'void FileMapInfo::seek_to_position(size_t)':
/home/runner/work/jdk/jdk/src/hotspot/share/cds/filemap.cpp:1429:50: error: format '%ld' expects argument of type 'long int', but argument 2 has type 'size_t' {aka 'unsigned int'} [-Werror=format=]
 1429 |     log_error(cds)("Unable to seek to position %ld", pos);
      |                                                ~~^   ~~~
      |                                                  |   |
      |                                                  |   size_t {aka unsigned int}
      |                                                  long int
      |                                                %d
cc1plus: all warnings being treated as errors


I'll have to look into the merge and see if I messed that up. Worst case, I'll re-apply the nullptr conversion to origin/master.

-------------

PR Comment: https://git.openjdk.org/jdk/pull/12248#issuecomment-1513291230


More information about the hotspot-dev mailing list