diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2021-05-15 17:36:21 +0200 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2021-05-29 16:08:19 +0200 |
| commit | 668230eee6bbff5f8b7cfbd95f21b2a6b16ae188 (patch) | |
| tree | 19f120ecba144d3ac464324ac5c85e92175a6169 /java/openjdk15/files/patch-commit-c484d890428 | |
| parent | java/openjdk14: fix build with clang 12 (diff) | |
java/openjdk15: fix build with clang 12
During an exp-run for llvm 12 (see bug 255570), it turned out that at
least openjdk11 and openjdk12 do not build with clang 12.0.0. The
exp-run therefore skipped openjdk15.
Building this manually shows that it results in a compile error:
gmake[4]: Leaving directory '/wrkdirs/usr/ports/java/openjdk15/work/jdk15u-jdk-15.0.2-7-1/make'
/wrkdirs/usr/ports/java/openjdk15/work/jdk15u-jdk-15.0.2-7-1/src/hotspot/cpu/x86/vm_version_ext_x86.cpp:748:3: error: suspicious concatenation of string literals in an array initialization; did you mean to separate the elements with a comma? [-Werror,-Wstring-concatenation]
"",
^
/wrkdirs/usr/ports/java/openjdk15/work/jdk15u-jdk-15.0.2-7-1/src/hotspot/cpu/x86/vm_version_ext_x86.cpp:747:3: note: place parentheses around the string literal to silence warning
"Opteron QC/Phenom" // Barcelona et.al.
^
1 error generated.
This is due to a missing backport of this upstream commit:
commit f8a9602a0a65cdc98eb940aac9529256ded2bf42
Author: Yasumasa Suenaga <ysuenaga@openjdk.org>
Date: Thu Jan 21 06:08:13 2021 +0000
8260025: Missing comma in VM_Version_Ext::_family_id_amd
Reviewed-by: dholmes, stuefe
Even after applying this fix, there is still a possibility of a segfault
during the build, due to another missing backport, of this upstream
commit:
commit c484d8904285652246c3af212a4211b9a8955149
Author: Thomas Stuefe <stuefe@openjdk.org>
Date: Tue Mar 16 05:49:01 2021 +0000
8263557: Possible NULL dereference in Arena::destruct_contents()
Reviewed-by: kbarrett, coleenp
Approved by: maintainer timeout (2 weeks)
PR: 255904
MFH: 2021Q2
Diffstat (limited to 'java/openjdk15/files/patch-commit-c484d890428')
| -rw-r--r-- | java/openjdk15/files/patch-commit-c484d890428 | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/java/openjdk15/files/patch-commit-c484d890428 b/java/openjdk15/files/patch-commit-c484d890428 new file mode 100644 index 000000000000..39ac7a7e8e46 --- /dev/null +++ b/java/openjdk15/files/patch-commit-c484d890428 @@ -0,0 +1,23 @@ +commit c484d8904285652246c3af212a4211b9a8955149 +Author: Thomas Stuefe <stuefe@openjdk.org> +Date: Tue Mar 16 05:49:01 2021 +0000 + + 8263557: Possible NULL dereference in Arena::destruct_contents() + + Reviewed-by: kbarrett, coleenp + +diff --git src/hotspot/share/memory/arena.cpp src/hotspot/share/memory/arena.cpp +index 8388f68c359..16059bed9be 100644 +--- src/hotspot/share/memory/arena.cpp ++++ src/hotspot/share/memory/arena.cpp +@@ -310,7 +310,9 @@ void Arena::destruct_contents() { + // reset size before chop to avoid a rare racing condition + // that can have total arena memory exceed total chunk memory + set_size_in_bytes(0); +- _first->chop(); ++ if (_first != NULL) { ++ _first->chop(); ++ } + reset(); + } + |