diff options
Diffstat (limited to 'java/openjdk8/files')
| -rw-r--r-- | java/openjdk8/files/patch-hotspot_src_share_vm_opto_lcm.cpp | 11 | ||||
| -rw-r--r-- | java/openjdk8/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp | 11 |
2 files changed, 22 insertions, 0 deletions
diff --git a/java/openjdk8/files/patch-hotspot_src_share_vm_opto_lcm.cpp b/java/openjdk8/files/patch-hotspot_src_share_vm_opto_lcm.cpp new file mode 100644 index 000000000000..f0db95303152 --- /dev/null +++ b/java/openjdk8/files/patch-hotspot_src_share_vm_opto_lcm.cpp @@ -0,0 +1,11 @@ +--- hotspot/src/share/vm/opto/lcm.cpp.orig ++++ hotspot/src/share/vm/opto/lcm.cpp +@@ -49,7 +49,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() != NULL) { // 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 diff --git a/java/openjdk8/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp b/java/openjdk8/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp new file mode 100644 index 000000000000..3f527642d742 --- /dev/null +++ b/java/openjdk8/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp @@ -0,0 +1,11 @@ +--- hotspot/src/share/vm/runtime/virtualspace.cpp.orig ++++ hotspot/src/share/vm/runtime/virtualspace.cpp +@@ -342,7 +342,7 @@ ReservedHeapSpace::ReservedHeapSpace(siz + (UseCompressedOops && (Universe::narrow_oop_base() != NULL) && + Universe::narrow_oop_use_implicit_null_checks()) ? + lcm(os::vm_page_size(), alignment) : 0) { +- if (base() > 0) { ++ if (base() != NULL) { + MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap); + } + |