Skip to content

Commit

Permalink
openjdk9-bootstrap: fix build with gcc12
Browse files Browse the repository at this point in the history
  • Loading branch information
oreo639 committed Oct 15, 2022
1 parent 8b98167 commit d8a83f4
Showing 1 changed file with 22 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -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);
}
}

0 comments on commit d8a83f4

Please sign in to comment.