diff options
| author | Steve Wills <swills@FreeBSD.org> | 2018-02-23 18:15:53 +0000 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2018-02-23 18:15:53 +0000 |
| commit | dda5bc8deaac3116f4fac5f1997defcf1110d039 (patch) | |
| tree | a5905d5a95c75cb61b351c969b8b7466f55967e1 | |
| parent | 896a6d846c9454efde267ca1bd7f3cbb1fbae402 (diff) | |
| download | ports-dda5bc8deaac3116f4fac5f1997defcf1110d039.tar.gz ports-dda5bc8deaac3116f4fac5f1997defcf1110d039.zip | |
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)
Notes
Notes:
svn path=/branches/2018Q1/; revision=462713
| -rw-r--r-- | java/openjdk8/Makefile | 2 | ||||
| -rw-r--r-- | java/openjdk8/files/patch-hotspot_src_share_vm_services_memTracker.cpp | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile index 1b5f8656c4da..ddd1f6a0173e 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_services_memTracker.cpp b/java/openjdk8/files/patch-hotspot_src_share_vm_services_memTracker.cpp new file mode 100644 index 000000000000..ac002a41f888 --- /dev/null +++ b/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; |