Attachment 224967 Details for Bug 255901 – Fix java/openjdk12 build with clang 12

[patch] Fix java/openjdk12 build with clang 12

java__openjdk12-fix-clang12-build-1.diff (text/plain), 1.98 KB, created by Dimitry Andric on 2021-05-15 14:02:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2021-05-15 14:02:51 UTC

Size: 1.98 KB

patch

obsolete

>diff --git a/java/openjdk12/files/patch-commit-34ae46e2bca b/java/openjdk12/files/patch-commit-34ae46e2bca
>new file mode 100644
>index 000000000000..3b70042a5487
>--- /dev/null
>+++ b/java/openjdk12/files/patch-commit-34ae46e2bca
>@@ -0,0 +1,23 @@
>+commit 34ae46e2bca691f989d4d84129baf545ff8a7469
>+Author: Andrew Haley <aph@openjdk.org>
>+Date:   Thu Mar 19 14:53:57 2020 +0000
>+
>+    8241296: Segfault in JNIHandleBlock::oops_do()
>+    
>+    Reviewed-by: stefank
>+
>+diff --git src/hotspot/share/runtime/thread.cpp src/hotspot/share/runtime/thread.cpp
>+index b93e70a0353..b1571f2d594 100644
>+--- src/hotspot/share/runtime/thread.cpp
>++++ src/hotspot/share/runtime/thread.cpp
>+@@ -888,7 +888,9 @@ bool Thread::claim_par_threads_do(uintx claim_token) {
>+ }
>+ 
>+ void Thread::oops_do(OopClosure* f, CodeBlobClosure* cf) {
>+-  active_handles()->oops_do(f);
>++  if (active_handles() != NULL) {
>++    active_handles()->oops_do(f);
>++  }
>+   // Do oop for ThreadShadow
>+   f->do_oop((oop*)&_pending_exception);
>+   handle_area()->oops_do(f);
>diff --git a/java/openjdk12/files/patch-commit-c484d890428 b/java/openjdk12/files/patch-commit-c484d890428
>new file mode 100644
>index 000000000000..39ac7a7e8e46
>--- /dev/null
>+++ b/java/openjdk12/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();
>+ }
>+

Actions: View | Diff

Attachments on bug 255901: 224967