From 462a73f1054716d2cd5eff71ce7969a3076bb43f Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Fri, 13 Jan 2017 19:46:01 +0000 Subject: java/openjdk{7,8}: unbreak build with clang 4.0 hotspot/src/share/vm/runtime/virtualspace.cpp:527:14: error: ordered comparison between pointer and zero ('char *' and 'int') if (base() > 0) { ~~~~~~ ^ ~ hotspot/src/share/vm/runtime/virtualspace.cpp:546:14: error: ordered comparison between pointer and zero ('char *' and 'int') if (base() > 0) { ~~~~~~ ^ ~ PR: 216016 Regressed by: https://github.com/llvm-mirror/clang/commit/4b6ad14285f3 --- java/openjdk7/Makefile | 2 +- ...tch-hotspot_src_share_vm_runtime_virtualspace.cpp | 20 ++++++++++++++++++++ java/openjdk8/Makefile | 2 +- .../files/patch-hotspot_src_share_vm_opto_lcm.cpp | 11 +++++++++++ ...tch-hotspot_src_share_vm_runtime_virtualspace.cpp | 11 +++++++++++ 5 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 java/openjdk7/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp create mode 100644 java/openjdk8/files/patch-hotspot_src_share_vm_opto_lcm.cpp create mode 100644 java/openjdk8/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile index c835fe57969b..ae872be3cd98 100644 --- a/java/openjdk7/Makefile +++ b/java/openjdk7/Makefile @@ -3,7 +3,7 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER} -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= java devel MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/ \ diff --git a/java/openjdk7/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp b/java/openjdk7/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp new file mode 100644 index 000000000000..625d40b819d8 --- /dev/null +++ b/java/openjdk7/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp @@ -0,0 +1,20 @@ +--- hotspot/src/share/vm/runtime/virtualspace.cpp.orig ++++ hotspot/src/share/vm/runtime/virtualspace.cpp +@@ -524,7 +524,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); + } + +@@ -543,7 +543,7 @@ ReservedHeapSpace::ReservedHeapSpace(con + (UseCompressedOops && (Universe::narrow_oop_base() != NULL) && + Universe::narrow_oop_use_implicit_null_checks()) ? + lcm(os::vm_page_size(), prefix_align) : 0) { +- if (base() > 0) { ++ if (base() != NULL) { + MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap); + } + diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile index 49c2d28531ee..d4fae8dfa93a 100644 --- a/java/openjdk8/Makefile +++ b/java/openjdk8/Makefile @@ -2,7 +2,7 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= java devel MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \ https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \ 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); + } +