| 1 | The following patch prevents build failures due to comparisons between
|
| 2 | a pointer and an integer. It has been adapted from openjdk@10.
|
| 3 |
|
| 4 | diff -u -r openjdk-9.alt/hotspot/src/share/vm/memory/virtualspace.cpp openjdk-9/hotspot/src/share/vm/memory/virtualspace.cpp
|
| 5 | |
| 6 | |
| 7 | @@ -581,7 +581,7 @@
|
| 8 | assert(markOopDesc::encode_pointer_as_mark(&_base[size])->decode_pointer() == &_base[size],
|
| 9 | "area must be distinguishable from marks for mark-sweep");
|
| 10 |
|
| 11 | - if (base() > 0) {
|
| 12 | + if (base() != NULL) {
|
| 13 | MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap);
|
| 14 | }
|
| 15 | }
|
| 16 | diff -u -r openjdk-9.alt/hotspot/src/share/vm/opto/lcm.cpp openjdk-9/hotspot/src/share/vm/opto/lcm.cpp
|
| 17 | |
| 18 | |
| 19 | @@ -39,7 +39,7 @@
|
| 20 | // Check whether val is not-null-decoded compressed oop,
|
| 21 | // i.e. will grab into the base of the heap if it represents NULL.
|
| 22 | static bool accesses_heap_base_zone(Node *val) {
|
| 23 | - if (Universe::narrow_oop_base() > 0) { // Implies UseCompressedOops.
|
| 24 | + if (Universe::narrow_oop_base() != NULL) { // Implies UseCompressedOops.
|
| 25 | if (val && val->is_Mach()) {
|
| 26 | if (val->as_Mach()->ideal_Opcode() == Op_DecodeN) {
|
| 27 | // This assumes all Decodes with TypePtr::NotNull are matched to nodes that
|