From d8a83f4a02ba64018cdd065f208238c883cb2477 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sat, 15 Oct 2022 02:16:25 -0700 Subject: [PATCH] openjdk9-bootstrap: fix build with gcc12 --- .../fix-pointer-comparison-gcc12.patch | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 srcpkgs/openjdk9-bootstrap/patches/fix-pointer-comparison-gcc12.patch diff --git a/srcpkgs/openjdk9-bootstrap/patches/fix-pointer-comparison-gcc12.patch b/srcpkgs/openjdk9-bootstrap/patches/fix-pointer-comparison-gcc12.patch new file mode 100644 index 000000000000..19b0a58e50a8 --- /dev/null +++ b/srcpkgs/openjdk9-bootstrap/patches/fix-pointer-comparison-gcc12.patch @@ -0,0 +1,22 @@ +--- a/hotspot/src/share/vm/opto/lcm.cpp ++++ b/hotspot/src/share/vm/opto/lcm.cpp +@@ -60,7 +60,7 @@ + // Check whether val is not-null-decoded compressed oop, + // i.e. will grab into the base of the heap if it represents NULL. + static bool accesses_heap_base_zone(Node *val) { +- if (Universe::narrow_oop_base() > 0) { // Implies UseCompressedOops. ++ if (Universe::narrow_oop_base() > (address)0) { // Implies UseCompressedOops. + if (val && val->is_Mach()) { + if (val->as_Mach()->ideal_Opcode() == Op_DecodeN) { + // This assumes all Decodes with TypePtr::NotNull are matched to nodes that +--- a/hotspot/src/share/vm/memory/virtualspace.cpp ++++ b/hotspot/src/share/vm/memory/virtualspace.cpp +@@ -581,7 +581,7 @@ ReservedHeapSpace::ReservedHeapSpace(siz + assert(markOopDesc::encode_pointer_as_mark(&_base[size])->decode_pointer() == &_base[size], + "area must be distinguishable from marks for mark-sweep"); + +- if (base() > 0) { ++ if (base() > (char*)0) { + MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap); + } + }