/hg/release/icedtea7-forest-2.6/hotspot: 13 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Apr 19 17:27:30 UTC 2018
changeset d673ec579604 in /hg/release/icedtea7-forest-2.6/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=d673ec579604
author: aph
date: Thu Apr 19 03:20:20 2018 +0100
8197429, PR3547: Increased stack guard causes segfaults on x86-32
Reviewed-by: dholmes
changeset ff3e9de15dff in /hg/release/icedtea7-forest-2.6/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=ff3e9de15dff
author: aph
date: Wed Aug 02 17:22:40 2017 +0100
8185723, PR3555: Zero: segfaults on Power PC 32-bit
Reviewed-by: roland
changeset 7517e77dd338 in /hg/release/icedtea7-forest-2.6/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=7517e77dd338
author: glaubitz
date: Thu Apr 19 03:35:25 2018 +0100
8186461, PR3558: Zero's atomic_copy64() should use SPE instructions on linux-powerpcspe
Reviewed-by: aph
changeset c1063f344f13 in /hg/release/icedtea7-forest-2.6/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=c1063f344f13
author: aph
date: Thu Apr 19 03:50:47 2018 +0100
8200556, PR3567: AArch64 port crashes on slowdebug builds
changeset 79d8447a461c in /hg/release/icedtea7-forest-2.6/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=79d8447a461c
author: mbalao
date: Thu Apr 19 04:11:35 2018 +0100
8201509, PR3580: Zero's atomic_copy64() broken on s390
changeset a68f2a94f319 in /hg/release/icedtea7-forest-2.6/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=a68f2a94f319
author: andrew
date: Thu Apr 19 04:49:54 2018 +0100
Added tag icedtea-2.6.14pre01 for changeset 79d8447a461c
changeset 13fda368122a in /hg/release/icedtea7-forest-2.6/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=13fda368122a
author: robm
date: Tue Apr 10 22:46:22 2018 +0100
8180881: Better packaging of deserialization
Summary: Contains is_ext_class_loader_data addition from 7198429
Reviewed-by: chegar, acorn
changeset 8b0587cd6277 in /hg/release/icedtea7-forest-2.6/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=8b0587cd6277
author: hseigel
date: Sat Apr 14 07:26:03 2018 +0100
8190478: Improved interface method selection
Reviewed-by: acorn, ahgross, jwilhelm, rhalade
Contributed-by: harold.seigel at oracle.com
changeset 7d1eb0dcab5a in /hg/release/icedtea7-forest-2.6/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=7d1eb0dcab5a
author: drchase
date: Tue Apr 17 22:51:28 2018 +0100
8064524: Compiler code generation improvements
Summary: Contains refactoring from 8009130, 8033150, 7200776 & 8028438 without default method work
Reviewed-by: jrose, acorn, vlivanov
changeset 4fc7288c77a6 in /hg/release/icedtea7-forest-2.6/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=4fc7288c77a6
author: thartmann
date: Wed Apr 18 01:07:03 2018 +0100
8190877: Better handling of abstract classes
Reviewed-by: kvn, vlivanov, rhalade, ahgross, jwilhelm
Contributed-by: tobias.hartmann at oracle.com
changeset 205c34770f35 in /hg/release/icedtea7-forest-2.6/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=205c34770f35
author: kbarrett
date: Wed Apr 18 02:18:40 2018 +0100
8192025: Less referential references
Reviewed-by: coleenp, eosterlund, mchung, ahgross, rhalade
changeset 5559874a74ad in /hg/release/icedtea7-forest-2.6/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=5559874a74ad
author: andrew
date: Thu Apr 19 04:51:00 2018 +0100
Added tag jdk7u181-b00 for changeset 205c34770f35
changeset 942409603ae4 in /hg/release/icedtea7-forest-2.6/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=942409603ae4
author: andrew
date: Thu Apr 19 17:55:26 2018 +0100
Merge jdk7u181-b00
diffstat:
.hgtags | 2 +
src/cpu/aarch64/vm/nativeInst_aarch64.cpp | 2 +-
src/os/linux/vm/os_linux.cpp | 4 +
src/os/linux/vm/os_linux.hpp | 4 +-
src/os_cpu/linux_x86/vm/os_linux_x86.cpp | 31 +++++++-
src/os_cpu/linux_zero/vm/os_linux_zero.hpp | 24 +++--
src/share/vm/classfile/classFileParser.cpp | 3 +-
src/share/vm/classfile/javaClasses.cpp | 32 +++++++-
src/share/vm/classfile/javaClasses.hpp | 22 +++++-
src/share/vm/classfile/systemDictionary.cpp | 15 +++-
src/share/vm/classfile/systemDictionary.hpp | 8 +-
src/share/vm/classfile/vmSymbols.hpp | 6 +-
src/share/vm/code/dependencies.cpp | 112 ++++++++------------------
src/share/vm/code/dependencies.hpp | 4 +-
src/share/vm/interpreter/linkResolver.cpp | 5 +-
src/share/vm/oops/cpCacheOop.cpp | 11 +-
src/share/vm/oops/instanceKlass.cpp | 117 ++++++++++++++++++++-------
src/share/vm/oops/instanceKlass.hpp | 20 ++++
src/share/vm/oops/klass.cpp | 15 +++-
src/share/vm/oops/klass.hpp | 6 +-
src/share/vm/oops/methodOop.cpp | 6 +-
src/share/vm/prims/jvm.cpp | 47 ++++++++++-
test/runtime/StackGap/T.java | 33 +++++++
test/runtime/StackGap/exestack-gap.c | 82 +++++++++++++++++++
test/runtime/StackGap/testme.sh | 48 +++++++++++
25 files changed, 509 insertions(+), 150 deletions(-)
diffs (truncated from 1150 to 500 lines):
diff -r 13d6044ee3d2 -r 942409603ae4 .hgtags
--- a/.hgtags Wed Feb 28 05:52:11 2018 +0000
+++ b/.hgtags Thu Apr 19 17:55:26 2018 +0100
@@ -918,3 +918,5 @@
d07df83bf5755c518bb0acc65cd6a33da38014b5 jdk7u171-b01
ce3abb5889fb01808cab7489e83c1dc448743b70 jdk7u171-b02
f96baf6b460751580465a599ed2fba0c912e4bad icedtea-2.6.13
+79d8447a461c7319969585c363649901b4c2773a icedtea-2.6.14pre01
+205c34770f355f726055a716ecc8991dd3bbd8fd jdk7u181-b00
diff -r 13d6044ee3d2 -r 942409603ae4 src/cpu/aarch64/vm/nativeInst_aarch64.cpp
--- a/src/cpu/aarch64/vm/nativeInst_aarch64.cpp Wed Feb 28 05:52:11 2018 +0000
+++ b/src/cpu/aarch64/vm/nativeInst_aarch64.cpp Thu Apr 19 17:55:26 2018 +0100
@@ -295,7 +295,7 @@
CodeBuffer cb(code_pos, instruction_size);
MacroAssembler a(&cb);
- a.mov(rscratch1, entry);
+ a.movptr(rscratch1, (uintptr_t)entry);
a.br(rscratch1);
ICache::invalidate_range(code_pos, instruction_size);
diff -r 13d6044ee3d2 -r 942409603ae4 src/os/linux/vm/os_linux.cpp
--- a/src/os/linux/vm/os_linux.cpp Wed Feb 28 05:52:11 2018 +0000
+++ b/src/os/linux/vm/os_linux.cpp Thu Apr 19 17:55:26 2018 +0100
@@ -794,6 +794,10 @@
}
}
+void os::Linux::expand_stack_to(address bottom) {
+ _expand_stack_to(bottom);
+}
+
bool os::Linux::manually_expand_stack(JavaThread * t, address addr) {
assert(t!=NULL, "just checking");
assert(t->osthread()->expanding_stack(), "expand should be set");
diff -r 13d6044ee3d2 -r 942409603ae4 src/os/linux/vm/os_linux.hpp
--- a/src/os/linux/vm/os_linux.hpp Wed Feb 28 05:52:11 2018 +0000
+++ b/src/os/linux/vm/os_linux.hpp Thu Apr 19 17:55:26 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -239,6 +239,8 @@
static int safe_cond_timedwait(pthread_cond_t *_cond, pthread_mutex_t *_mutex, const struct timespec *_abstime);
private:
+ static void expand_stack_to(address bottom);
+
typedef int (*sched_getcpu_func_t)(void);
typedef int (*numa_node_to_cpus_func_t)(int node, unsigned long *buffer, int bufferlen);
typedef int (*numa_max_node_func_t)(void);
diff -r 13d6044ee3d2 -r 942409603ae4 src/os_cpu/linux_x86/vm/os_linux_x86.cpp
--- a/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Wed Feb 28 05:52:11 2018 +0000
+++ b/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Thu Apr 19 17:55:26 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -883,6 +883,25 @@
void os::workaround_expand_exec_shield_cs_limit() {
#if defined(IA32) && !defined(ZERO)
size_t page_size = os::vm_page_size();
+
+ /*
+ * JDK-8197429
+ *
+ * Expand the stack mapping to the end of the initial stack before
+ * attempting to install the codebuf. This is needed because newer
+ * Linux kernels impose a distance of a megabyte between stack
+ * memory and other memory regions. If we try to install the
+ * codebuf before expanding the stack the installation will appear
+ * to succeed but we'll get a segfault later if we expand the stack
+ * in Java code.
+ *
+ */
+ if (os::Linux::is_initial_thread()) {
+ address limit = Linux::initial_thread_stack_bottom();
+ limit += (StackYellowPages + StackRedPages) * page_size;
+ os::Linux::expand_stack_to(limit);
+ }
+
/*
* Take the highest VA the OS will give us and exec
*
@@ -901,6 +920,16 @@
char* hint = (char*) (Linux::initial_thread_stack_bottom() -
((StackYellowPages + StackRedPages + 1) * page_size));
char* codebuf = os::pd_attempt_reserve_memory_at(page_size, hint);
+
+ if (codebuf == NULL) {
+ // JDK-8197429: There may be a stack gap of one megabyte between
+ // the limit of the stack and the nearest memory region: this is a
+ // Linux kernel workaround for CVE-2017-1000364. If we failed to
+ // map our codebuf, try again at an address one megabyte lower.
+ hint -= 1 * M;
+ codebuf = os::pd_attempt_reserve_memory_at(page_size, hint);
+ }
+
if ( (codebuf == NULL) || (!os::commit_memory(codebuf, page_size, true)) ) {
return; // No matter, we tried, best effort.
}
diff -r 13d6044ee3d2 -r 942409603ae4 src/os_cpu/linux_zero/vm/os_linux_zero.hpp
--- a/src/os_cpu/linux_zero/vm/os_linux_zero.hpp Wed Feb 28 05:52:11 2018 +0000
+++ b/src/os_cpu/linux_zero/vm/os_linux_zero.hpp Thu Apr 19 17:55:26 2018 +0100
@@ -36,18 +36,24 @@
// Atomically copy 64 bits of data
static void atomic_copy64(volatile void *src, volatile void *dst) {
-#if defined(PPC32)
+#if defined(PPC32) && !defined(__SPE__)
double tmp;
- asm volatile ("lfd %0, 0(%1)\n"
- "stfd %0, 0(%2)\n"
- : "=f"(tmp)
- : "b"(src), "b"(dst));
+ asm volatile ("lfd %0, %2\n"
+ "stfd %0, %1\n"
+ : "=&f"(tmp), "=Q"(*(volatile double*)dst)
+ : "Q"(*(volatile double*)src));
+#elif defined(PPC32) && defined(__SPE__)
+ long tmp;
+ asm volatile ("evldd %0, %2\n"
+ "evstdd %0, %1\n"
+ : "=&r"(tmp), "=Q"(*(volatile long*)dst)
+ : "Q"(*(volatile long*)src));
#elif defined(S390) && !defined(_LP64)
double tmp;
- asm volatile ("ld %0, 0(%1)\n"
- "std %0, 0(%2)\n"
- : "=r"(tmp)
- : "a"(src), "a"(dst));
+ asm volatile ("ld %0, %2\n"
+ "std %0, %1\n"
+ : "=&f"(tmp), "=Q"(*(volatile double*)dst)
+ : "Q"(*(volatile double*)src));
#elif defined(__ARM_ARCH_7A__)
jlong tmp;
asm volatile ("ldrexd %0, [%1]\n"
diff -r 13d6044ee3d2 -r 942409603ae4 src/share/vm/classfile/classFileParser.cpp
--- a/src/share/vm/classfile/classFileParser.cpp Wed Feb 28 05:52:11 2018 +0000
+++ b/src/share/vm/classfile/classFileParser.cpp Thu Apr 19 17:55:26 2018 +0100
@@ -1779,8 +1779,7 @@
vmSymbols::SID sid = vmSymbols::find_sid(name);
// Privileged code can use all annotations. Other code silently drops some.
const bool privileged = class_loader.is_null() || is_anonymous ||
- class_loader()->klass()->klass_part()->name() ==
- vmSymbols::sun_misc_Launcher_ExtClassLoader();
+ SystemDictionary::is_ext_class_loader(class_loader);
switch (sid) {
case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_ForceInline_signature):
if (_location != _in_method) break; // only allow for methods
diff -r 13d6044ee3d2 -r 942409603ae4 src/share/vm/classfile/javaClasses.cpp
--- a/src/share/vm/classfile/javaClasses.cpp Wed Feb 28 05:52:11 2018 +0000
+++ b/src/share/vm/classfile/javaClasses.cpp Thu Apr 19 17:55:26 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -2430,6 +2430,32 @@
*offset = value;
}
+// Support for java_lang_ref_ReferenceQueue
+
+oop java_lang_ref_ReferenceQueue::NULL_queue() {
+ instanceKlass* ik = instanceKlass::cast(SystemDictionary::ReferenceQueue_klass());
+ oop mirror = ik->java_mirror();
+ return mirror->obj_field(static_NULL_queue_offset);
+}
+
+oop java_lang_ref_ReferenceQueue::ENQUEUED_queue() {
+ instanceKlass* ik = instanceKlass::cast(SystemDictionary::ReferenceQueue_klass());
+ oop mirror = ik->java_mirror();
+ return mirror->obj_field(static_ENQUEUED_queue_offset);
+}
+
+void java_lang_ref_ReferenceQueue::compute_offsets() {
+ klassOop k = SystemDictionary::ReferenceQueue_klass();
+ compute_offset(static_NULL_queue_offset,
+ k,
+ vmSymbols::referencequeue_null_name(),
+ vmSymbols::referencequeue_signature());
+ compute_offset(static_ENQUEUED_queue_offset,
+ k,
+ vmSymbols::referencequeue_enqueued_name(),
+ vmSymbols::referencequeue_signature());
+}
+
// Support for java_lang_invoke_DirectMethodHandle
int java_lang_invoke_DirectMethodHandle::_member_offset;
@@ -2938,6 +2964,8 @@
int java_lang_ref_Reference::static_lock_offset;
int java_lang_ref_Reference::static_pending_offset;
int java_lang_ref_Reference::number_of_fake_oop_fields;
+int java_lang_ref_ReferenceQueue::static_NULL_queue_offset;
+int java_lang_ref_ReferenceQueue::static_ENQUEUED_queue_offset;
int java_lang_ref_SoftReference::timestamp_offset;
int java_lang_ref_SoftReference::static_clock_offset;
int java_lang_ClassLoader::parent_offset;
@@ -3117,6 +3145,8 @@
sun_reflect_UnsafeStaticFieldAccessorImpl::compute_offsets();
}
+ java_lang_ref_ReferenceQueue::compute_offsets();
+
// generated interpreter code wants to know about the offsets we just computed:
AbstractAssembler::update_delayed_values();
}
diff -r 13d6044ee3d2 -r 942409603ae4 src/share/vm/classfile/javaClasses.hpp
--- a/src/share/vm/classfile/javaClasses.hpp Wed Feb 28 05:52:11 2018 +0000
+++ b/src/share/vm/classfile/javaClasses.hpp Thu Apr 19 17:55:26 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -860,6 +860,12 @@
static HeapWord* discovered_addr(oop ref) {
return ref->obj_field_addr<HeapWord>(discovered_offset);
}
+ static inline oop queue(oop ref) {
+ return ref->obj_field(queue_offset);
+ }
+ static inline void set_queue(oop ref, oop value) {
+ return ref->obj_field_put(queue_offset, value);
+ }
// Accessors for statics
static oop pending_list_lock();
static oop pending_list();
@@ -892,6 +898,20 @@
};
+// Interface to java.lang.ref.ReferenceQueue objects
+
+class java_lang_ref_ReferenceQueue: public AllStatic {
+public:
+ static int static_NULL_queue_offset;
+ static int static_ENQUEUED_queue_offset;
+
+ // Accessors
+ static oop NULL_queue();
+ static oop ENQUEUED_queue();
+
+ static void compute_offsets();
+};
+
// Interface to java.lang.invoke.MethodHandle objects
class MethodHandleEntry;
diff -r 13d6044ee3d2 -r 942409603ae4 src/share/vm/classfile/systemDictionary.cpp
--- a/src/share/vm/classfile/systemDictionary.cpp Wed Feb 28 05:52:11 2018 +0000
+++ b/src/share/vm/classfile/systemDictionary.cpp Thu Apr 19 17:55:26 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -145,6 +145,17 @@
}
return false;
}
+
+/**
+ * Returns true if the passed class loader is the extension class loader.
+ */
+bool SystemDictionary::is_ext_class_loader(Handle class_loader) {
+ if (class_loader.is_null()) {
+ return false;
+ }
+ return (class_loader->klass()->klass_part()->name() == vmSymbols::sun_misc_Launcher_ExtClassLoader());
+}
+
// ----------------------------------------------------------------------------
// Resolving of classes
@@ -1892,6 +1903,8 @@
instanceKlass::cast(WK_KLASS(PhantomReference_klass))->set_reference_type(REF_PHANTOM);
instanceKlass::cast(WK_KLASS(Cleaner_klass))->set_reference_type(REF_CLEANER);
+ initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(ReferenceQueue_klass), scan, CHECK);
+
// JSR 292 classes
WKID jsr292_group_start = WK_KLASS_ENUM_NAME(MethodHandle_klass);
WKID jsr292_group_end = WK_KLASS_ENUM_NAME(VolatileCallSite_klass);
diff -r 13d6044ee3d2 -r 942409603ae4 src/share/vm/classfile/systemDictionary.hpp
--- a/src/share/vm/classfile/systemDictionary.hpp Wed Feb 28 05:52:11 2018 +0000
+++ b/src/share/vm/classfile/systemDictionary.hpp Thu Apr 19 17:55:26 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -128,6 +128,7 @@
do_klass(PhantomReference_klass, java_lang_ref_PhantomReference, Pre ) \
do_klass(Cleaner_klass, sun_misc_Cleaner, Pre ) \
do_klass(Finalizer_klass, java_lang_ref_Finalizer, Pre ) \
+ do_klass(ReferenceQueue_klass, java_lang_ref_ReferenceQueue, Pre ) \
\
do_klass(Thread_klass, java_lang_Thread, Pre ) \
do_klass(ThreadGroup_klass, java_lang_ThreadGroup, Pre ) \
@@ -612,6 +613,10 @@
static bool is_parallelCapable(Handle class_loader);
static bool is_parallelDefine(Handle class_loader);
+public:
+ static bool is_ext_class_loader(Handle class_loader);
+
+private:
static klassOop find_shared_class(Symbol* class_name);
// Setup link to hierarchy
@@ -622,7 +627,6 @@
Handle initiating_loader);
static void post_class_unload_events(BoolObjectClosure* is_alive);
-private:
// We pass in the hashtable index so we can calculate it outside of
// the SystemDictionary_lock.
diff -r 13d6044ee3d2 -r 942409603ae4 src/share/vm/classfile/vmSymbols.hpp
--- a/src/share/vm/classfile/vmSymbols.hpp Wed Feb 28 05:52:11 2018 +0000
+++ b/src/share/vm/classfile/vmSymbols.hpp Thu Apr 19 17:55:26 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -83,6 +83,7 @@
template(java_lang_ref_PhantomReference, "java/lang/ref/PhantomReference") \
template(sun_misc_Cleaner, "sun/misc/Cleaner") \
template(java_lang_ref_Finalizer, "java/lang/ref/Finalizer") \
+ template(java_lang_ref_ReferenceQueue, "java/lang/ref/ReferenceQueue") \
template(java_lang_reflect_AccessibleObject, "java/lang/reflect/AccessibleObject") \
template(java_lang_reflect_Method, "java/lang/reflect/Method") \
template(java_lang_reflect_Constructor, "java/lang/reflect/Constructor") \
@@ -379,6 +380,8 @@
template(array_klass_name, "array_klass") \
template(oop_size_name, "oop_size") \
template(static_oop_field_count_name, "static_oop_field_count") \
+ template(referencequeue_null_name, "NULL") \
+ template(referencequeue_enqueued_name, "ENQUEUED") \
\
/* non-intrinsic name/signature pairs: */ \
template(register_method_name, "register") \
@@ -469,6 +472,7 @@
template(class_signature, "Ljava/lang/Class;") \
template(string_signature, "Ljava/lang/String;") \
template(reference_signature, "Ljava/lang/ref/Reference;") \
+ template(referencequeue_signature, "Ljava/lang/ref/ReferenceQueue;") \
template(concurrenthashmap_signature, "Ljava/util/concurrent/ConcurrentHashMap;") \
template(String_StringBuilder_signature, "(Ljava/lang/String;)Ljava/lang/StringBuilder;") \
template(int_StringBuilder_signature, "(I)Ljava/lang/StringBuilder;") \
diff -r 13d6044ee3d2 -r 942409603ae4 src/share/vm/code/dependencies.cpp
--- a/src/share/vm/code/dependencies.cpp Wed Feb 28 05:52:11 2018 +0000
+++ b/src/share/vm/code/dependencies.cpp Thu Apr 19 17:55:26 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -723,6 +723,14 @@
_signature = NULL;
initialize(participant);
}
+ ClassHierarchyWalker(klassOop participants[], int num_participants) {
+ _name = NULL;
+ _signature = NULL;
+ initialize(NULL);
+ for (int i = 0; i < num_participants; ++i) {
+ add_participant(participants[i]);
+ }
+ }
// This is common code for two searches: One for concrete subtypes,
// the other for concrete method implementations and overrides.
@@ -810,8 +818,29 @@
if (doing_subtype_search()) {
return Dependencies::is_concrete_klass(k);
} else {
- methodOop m = instanceKlass::cast(k)->find_method(_name, _signature);
- if (m == NULL || !Dependencies::is_concrete_method(m)) return false;
+ // Search class hierarchy first.
+ methodOop m = instanceKlass::cast(k)->find_instance_method(_name, _signature);
+ if (!Dependencies::is_concrete_method(m)) {
+ // Check for re-abstraction of method
+ if (!k->klass_part()->is_interface() && m != NULL && m->is_abstract()) {
+ // Found a matching abstract method 'm' in the class hierarchy.
+ // This is fine iff 'k' is an abstract class and all concrete subtypes
+ // of 'k' override 'm' and are participates of the current search.
+ ClassHierarchyWalker wf(_participants, _num_participants);
+ klassOop w = wf.find_witness_subtype(k);
+ if (w != NULL) {
+ methodOop wm = instanceKlass::cast(w)->find_instance_method(_name, _signature);
+ if (!Dependencies::is_concrete_method(wm)) {
+ // Found a concrete subtype 'w' which does not override abstract method 'm'.
+ // Bail out because 'm' could be called with 'w' as receiver (leading to an
+ // AbstractMethodError) and thus the method we are looking for is not unique.
+ _found_methods[_num_participants] = m;
+ return true;
+ }
+ }
+ }
+ return false;
+ }
_found_methods[_num_participants] = m;
// Note: If add_participant(k) is called,
// the method m will already be memoized for it.
@@ -1104,15 +1133,12 @@
}
bool Dependencies::is_concrete_method(methodOop m) {
- // Statics are irrelevant to virtual call sites.
- if (m->is_static()) return false;
-
- // We could also return false if m does not yet appear to be
- // executed, if the VM version supports this distinction also.
- return !m->is_abstract();
+ // NULL is not a concrete method,
+ // statics are irrelevant to virtual call sites,
+ // abstract methods are not concrete,
+ return ! ( m == NULL || m -> is_static() || m -> is_abstract());
}
-
Klass* Dependencies::find_finalizable_subclass(Klass* k) {
if (k->is_interface()) return NULL;
if (k->has_finalizer()) return k;
@@ -1134,16 +1160,6 @@
return true;
}
-bool Dependencies::is_concrete_method(ciMethod* m) {
- // Statics are irrelevant to virtual call sites.
- if (m->is_static()) return false;
-
- // We could also return false if m does not yet appear to be
- // executed, if the VM version supports this distinction also.
- return !m->is_abstract();
-}
-
-
bool Dependencies::has_finalizable_subclass(ciInstanceKlass* k) {
return k->has_finalizable_subclass();
}
@@ -1387,61 +1403,6 @@
return wf.find_witness_definer(ctxk, changes);
}
-// Find the set of all non-abstract methods under ctxk that match m[0].
-// (The method m[0] must be defined or inherited in ctxk.)
-// Include m itself in the set, unless it is abstract.
-// Fill the given array m[0..(mlen-1)] with this set, and return the length.
-// (The length may be zero if no concrete methods are found anywhere.)
-// If there are too many concrete methods to fit in marray, return -1.
-int Dependencies::find_exclusive_concrete_methods(klassOop ctxk,
- int mlen,
- methodOop marray[]) {
- methodOop m0 = marray[0];
- ClassHierarchyWalker wf(m0);
- assert(wf.check_method_context(ctxk, m0), "proper context");
- wf.record_witnesses(mlen);
- bool participants_hide_witnesses = true;
- klassOop wit = wf.find_witness_definer(ctxk);
- if (wit != NULL) return -1; // Too many witnesses.
- int num = wf.num_participants();
- assert(num <= mlen, "oob");
- // Keep track of whether m is also part of the result set.
- int mfill = 0;
- assert(marray[mfill] == m0, "sanity");
- if (Dependencies::is_concrete_method(m0))
- mfill++; // keep m0 as marray[0], the first result
- for (int i = 0; i < num; i++) {
- methodOop fm = wf.found_method(i);
- if (fm == m0) continue; // Already put this guy in the list.
- if (mfill == mlen) {
- return -1; // Oops. Too many methods after all!
- }
- marray[mfill++] = fm;
- }
More information about the distro-pkg-dev
mailing list