Date: Fri, 23 Feb 2018 18:15:54 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462713 - in branches/2018Q1/java/openjdk8: . files Message-ID: <201802231815.w1NIFsAC080130@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Fri Feb 23 18:15:53 2018 New Revision: 462713 URL: https://svnweb.freebsd.org/changeset/ports/462713 Log: MFH: r459368 Fix a run-time crash with Clang 6.0. Note this problem was introduced with fixes for JDK-8055007. https://bugs.java.com/view_bug.do?bug_id=8055007 http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/changeset/c6211b707068 PR: 225054 Approved by: ports-secteam (implicit) Added: branches/2018Q1/java/openjdk8/files/patch-hotspot_src_share_vm_services_memTracker.cpp - copied unchanged from r459368, head/java/openjdk8/files/patch-hotspot_src_share_vm_services_memTracker.cpp Modified: branches/2018Q1/java/openjdk8/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/java/openjdk8/Makefile ============================================================================== --- branches/2018Q1/java/openjdk8/Makefile Fri Feb 23 18:14:59 2018 (r462712) +++ branches/2018Q1/java/openjdk8/Makefile Fri Feb 23 18:15:53 2018 (r462713) @@ -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 \ Copied: branches/2018Q1/java/openjdk8/files/patch-hotspot_src_share_vm_services_memTracker.cpp (from r459368, head/java/openjdk8/files/patch-hotspot_src_share_vm_services_memTracker.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/java/openjdk8/files/patch-hotspot_src_share_vm_services_memTracker.cpp Fri Feb 23 18:15:53 2018 (r462713, copy of r459368, head/java/openjdk8/files/patch-hotspot_src_share_vm_services_memTracker.cpp) @@ -0,0 +1,13 @@ +--- hotspot/src/share/vm/services/memTracker.cpp.orig ++++ hotspot/src/share/vm/services/memTracker.cpp +@@ -67,10 +67,6 @@ NMT_TrackingLevel MemTracker::init_tracking_level() { + os::unsetenv(buf); + } + +- // Construct NativeCallStack::EMPTY_STACK. It may get constructed twice, +- // but it is benign, the results are the same. +- ::new ((void*)&NativeCallStack::EMPTY_STACK) NativeCallStack(0, false); +- + if (!MallocTracker::initialize(level) || + !VirtualMemoryTracker::initialize(level)) { + level = NMT_off;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802231815.w1NIFsAC080130>