[jdk11u-dev] RFR: 8299254: Support dealing with standard assert macro [v4]

[Antonio Vieiro]

On Fri, 27 Sep 2024 09:48:54 GMT, Severin Gehwolf <sgehwolf at openjdk.org> wrote:

>> Antonio Vieiro has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. The pull request contains three additional commits since the last revision:
>> 
>>  - Merge branch 'master' of github.com:openjdk/jdk11u-dev into backports/JDK-8299254-macos12
>>  - Backport 89dd23f2fab0d98879e68f817923656e113087e3
>>  - 8340671: GHA: Bump macOS and Xcode versions to macos-12 and XCode 13.4.1
>
> test/hotspot/gtest/gc/shared/test_memset_with_concurrent_readers.cpp line 2:
> 
>> 1: /*
>> 2:  * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
> 
> Suggestion:
> 
>  * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
> 
> 
> So as to match the JDK 17u version of the patch.

Updated in new commit.

> test/hotspot/gtest/jfr/test_networkUtilization.cpp line 2:
> 
>> 1: /*
>> 2:  * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
> 
> Suggestion:
> 
>  * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.

Updated in new commit.

> test/hotspot/gtest/unittest.hpp line 2:
> 
>> 1: /*
>> 2:  * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
> 
> This copyright update isn't in the JDK 17u version of the patch, please remove.
> 
> https://github.com/openjdk/jdk17u/commit/89dd23f2fab0d98879e68f817923656e113087e3#diff-ff1dd449619fcf441d7a63b01c6c4b6bf3e6fd5dc1149ffa48f38d5e6d82e5ba
> 
> For backports we try to avoid copyright updates, only use what was done in the backports of newer code-lines.

Ah, good to know! Updated in new commit.

> test/hotspot/gtest/unittest.hpp line 36:
> 
>> 34: #include "utilities/vmassert_reinstall.hpp"
>> 35: 
>> 36: // gtest/gtest.h includes assert.h which will define the assert macro, but hotspot has its
> 
> This was removed in the 17u version. Why not here as well?

Updated in new commit.

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

PR Review Comment: https://git.openjdk.org/jdk11u-dev/pull/2937#discussion_r1780483368
PR Review Comment: https://git.openjdk.org/jdk11u-dev/pull/2937#discussion_r1780483601
PR Review Comment: https://git.openjdk.org/jdk11u-dev/pull/2937#discussion_r1780483791
PR Review Comment: https://git.openjdk.org/jdk11u-dev/pull/2937#discussion_r1780483920