svn commit: r431607 - in head/java/openjdk8: . files

[Greg Lewis]

Author: glewis
Date: Sun Jan 15 22:51:52 2017
New Revision: 431607
URL: https://svnweb.freebsd.org/changeset/ports/431607

Log:
  . Fix compilation with Clang 4.0
  
  PR:		216016
  Submitted by:	jbeich@

Added:
  head/java/openjdk8/files/patch-hotspot_src_share_vm_opto_lcm.cpp   (contents, props changed)
  head/java/openjdk8/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp   (contents, props changed)
Modified:
  head/java/openjdk8/Makefile

Modified: head/java/openjdk8/Makefile
==============================================================================
--- head/java/openjdk8/Makefile	Sun Jan 15 22:51:31 2017	(r431606)
+++ head/java/openjdk8/Makefile	Sun Jan 15 22:51:52 2017	(r431607)
@@ -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 \

Added: head/java/openjdk8/files/patch-hotspot_src_share_vm_opto_lcm.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/java/openjdk8/files/patch-hotspot_src_share_vm_opto_lcm.cpp	Sun Jan 15 22:51:52 2017	(r431607)
@@ -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

Added: head/java/openjdk8/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/java/openjdk8/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp	Sun Jan 15 22:51:52 2017	(r431607)
@@ -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);
+   }
+