Date: Thu, 19 Jan 2017 05:33:19 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431849 - in branches/2017Q1/java/openjdk8: . files Message-ID: <201701190533.v0J5XJOx048700@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Thu Jan 19 05:33:19 2017 New Revision: 431849 URL: https://svnweb.freebsd.org/changeset/ports/431849 Log: MFH: r431607 by glewis . Fix compilation with Clang 4.0 PR: 216016 Submitted by: jbeich@ Approved by: ports-secteam blanket Added: branches/2017Q1/java/openjdk8/files/patch-hotspot_src_share_vm_opto_lcm.cpp - copied unchanged from r431607, head/java/openjdk8/files/patch-hotspot_src_share_vm_opto_lcm.cpp branches/2017Q1/java/openjdk8/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp - copied unchanged from r431607, head/java/openjdk8/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp Modified: branches/2017Q1/java/openjdk8/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/java/openjdk8/Makefile ============================================================================== --- branches/2017Q1/java/openjdk8/Makefile Thu Jan 19 05:30:36 2017 (r431848) +++ branches/2017Q1/java/openjdk8/Makefile Thu Jan 19 05:33:19 2017 (r431849) @@ -2,7 +2,7 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//} -PORTREVISION= 1 +PORTREVISION= 2 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 \ Copied: branches/2017Q1/java/openjdk8/files/patch-hotspot_src_share_vm_opto_lcm.cpp (from r431607, head/java/openjdk8/files/patch-hotspot_src_share_vm_opto_lcm.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/java/openjdk8/files/patch-hotspot_src_share_vm_opto_lcm.cpp Thu Jan 19 05:33:19 2017 (r431849, copy of r431607, head/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 Copied: branches/2017Q1/java/openjdk8/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp (from r431607, head/java/openjdk8/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/java/openjdk8/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp Thu Jan 19 05:33:19 2017 (r431849, copy of r431607, head/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); + } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701190533.v0J5XJOx048700>