head 1.2; access; symbols; locks; strict; comment @// @; 1.2 date 2018.09.15.02.51.02; author ryoon; state dead; branches; next 1.1; commitid JMty5j1yhx4X89SA; 1.1 date 2018.08.20.17.24.00; author tnn; state Exp; branches; next ; commitid 0paoycep5hJJNSOA; desc @@ 1.2 log @Update to 1.8.181 Changelog: Fixed: CVE-2018-2938 CVE-2018-2964 CVE-2018-2941 CVE-2018-2942 CVE-2018-2972 CVE-2018-2973 CVE-2018-2940 CVE-2018-2952 @ text @$NetBSD: patch-hotspot_src_share_vm_services_memTracker.hpp,v 1.1 2018/08/20 17:24:00 tnn Exp $ clang>6 fixes. Ref: http://mail.openjdk.java.net/pipermail/bsd-port-dev/2018-May/003177.html --- hotspot/src/share/vm/services/memTracker.hpp.orig 2018-05-26 23:58:31.000000000 +0000 +++ hotspot/src/share/vm/services/memTracker.hpp @@@@ -31,8 +31,8 @@@@ #if !INCLUDE_NMT -#define CURRENT_PC NativeCallStack::EMPTY_STACK -#define CALLER_PC NativeCallStack::EMPTY_STACK +#define CURRENT_PC NativeCallStack::EMPTY_STACK() +#define CALLER_PC NativeCallStack::EMPTY_STACK() class Tracker : public StackObj { public: @@@@ -83,9 +83,9 @@@@ class MemTracker : AllStatic { extern volatile bool NMT_stack_walkable; #define CURRENT_PC ((MemTracker::tracking_level() == NMT_detail && NMT_stack_walkable) ? \ - NativeCallStack(0, true) : NativeCallStack::EMPTY_STACK) + NativeCallStack(0, true) : NativeCallStack::EMPTY_STACK()) #define CALLER_PC ((MemTracker::tracking_level() == NMT_detail && NMT_stack_walkable) ? \ - NativeCallStack(1, true) : NativeCallStack::EMPTY_STACK) + NativeCallStack(1, true) : NativeCallStack::EMPTY_STACK()) class MemBaseline; class Mutex; @ 1.1 log @openjdk8: apply upstream changeset be59128afb76 (fixes SEGV w/ clang>=6) @ text @d1 1 a1 1 $NetBSD$ @