| 1 | Avoid ordered comparison of pointer with integer to prevent compile error
|
| 2 | with GCC 11.
|
| 3 |
|
| 4 | diff --git a/src/share/vm/opto/lcm.cpp b/src/share/vm/opto/lcm.cpp
|
| 5 | |
| 6 | |
| 7 | @@ -60,7 +60,7 @@
|
| 8 | // Check whether val is not-null-decoded compressed oop,
|
| 9 | // i.e. will grab into the base of the heap if it represents NULL.
|
| 10 | static bool accesses_heap_base_zone(Node *val) {
|
| 11 | - if (Universe::narrow_oop_base() > 0) { // Implies UseCompressedOops.
|
| 12 | + if (Universe::narrow_oop_base() != NULL) { // Implies UseCompressedOops.
|
| 13 | if (val && val->is_Mach()) {
|
| 14 | if (val->as_Mach()->ideal_Opcode() == Op_DecodeN) {
|
| 15 | // This assumes all Decodes with TypePtr::NotNull are matched to nodes that
|
| 16 | diff --git a/src/share/vm/runtime/virtualspace.cpp b/src/share/vm/runtime/virtualspace.cpp
|
| 17 | |
| 18 | |
| 19 | @@ -527,7 +527,7 @@ ReservedHeapSpace::ReservedHeapSpace(size_t size, size_t alignment,
|
| 20 | (UseCompressedOops && (Universe::narrow_oop_base() != NULL) &&
|
| 21 | Universe::narrow_oop_use_implicit_null_checks()) ?
|
| 22 | lcm(os::vm_page_size(), alignment) : 0) {
|
| 23 | - if (base() > 0) {
|
| 24 | + if (base() != NULL) {
|
| 25 | MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap);
|
| 26 | }
|
| 27 |
|
| 28 | @@ -546,7 +546,7 @@ ReservedHeapSpace::ReservedHeapSpace(const size_t prefix_size,
|
| 29 | (UseCompressedOops && (Universe::narrow_oop_base() != NULL) &&
|
| 30 | Universe::narrow_oop_use_implicit_null_checks()) ?
|
| 31 | lcm(os::vm_page_size(), prefix_align) : 0) {
|
| 32 | - if (base() > 0) {
|
| 33 | + if (base() != NULL) {
|
| 34 | MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap);
|
| 35 | }
|
| 36 |
|