/hg/release/icedtea7-forest-2.5/hotspot: 5 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Jul 20 15:46:16 UTC 2015
changeset f9edc77edd3c in /hg/release/icedtea7-forest-2.5/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot?cmd=changeset;node=f9edc77edd3c
author: roland
date: Fri Jul 03 21:30:02 2015 +0100
8071731: Better scaling for C1
Reviewed-by: kvn, iveresov
changeset d095415c0700 in /hg/release/icedtea7-forest-2.5/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot?cmd=changeset;node=d095415c0700
author: vlivanov
date: Mon Jul 06 19:41:23 2015 +0100
8075838: Method for typing MethodTypes
Reviewed-by: jrose, ahgross, alanb, bmoloden
changeset 235355f70290 in /hg/release/icedtea7-forest-2.5/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot?cmd=changeset;node=235355f70290
author: andrew
date: Tue Jul 07 14:29:19 2015 +0100
OPENJDK7-03: Only apply PaX-marking when needed by a running PaX kernel
Reviewed-by: omajid
changeset 383de087ee57 in /hg/release/icedtea7-forest-2.5/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot?cmd=changeset;node=383de087ee57
author: andrew
date: Thu Jul 09 02:31:11 2015 +0100
PR2502: Remove -fno-tree-vectorize workaround now http://gcc.gnu.org/PR63341 is fixed
changeset 3f6e602a1357 in /hg/release/icedtea7-forest-2.5/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot?cmd=changeset;node=3f6e602a1357
author: andrew
date: Mon Jul 20 16:44:01 2015 +0100
Added tag icedtea-2.5.6 for changeset 383de087ee57
diffstat:
.hgtags | 1 +
make/linux/makefiles/buildtree.make | 4 +-
make/linux/makefiles/gcc.make | 3 +
src/share/vm/c1/c1_LIRGenerator.cpp | 10 +++++-
src/share/vm/classfile/systemDictionary.cpp | 50 +++++++++++++++++++---------
5 files changed, 49 insertions(+), 19 deletions(-)
diffs (156 lines):
diff -r 73fd325ff54e -r 3f6e602a1357 .hgtags
--- a/.hgtags Sat Jul 18 00:45:31 2015 +0100
+++ b/.hgtags Mon Jul 20 16:44:01 2015 +0100
@@ -796,3 +796,4 @@
cac66550581b9bc94fa36275712dd3c502a1993e icedtea-2.5.5
9b1de9bff274bdfb82d9052d864ff9173cb7e6be icedtea-2.5.6pre01
a694d681dba7004b7d47d0f5d84b7e3011e1657a icedtea-2.5.6pre02
+383de087ee5736b665b72837aaa83dfabf8ea877 icedtea-2.5.6
diff -r 73fd325ff54e -r 3f6e602a1357 make/linux/makefiles/buildtree.make
--- a/make/linux/makefiles/buildtree.make Sat Jul 18 00:45:31 2015 +0100
+++ b/make/linux/makefiles/buildtree.make Mon Jul 20 16:44:01 2015 +0100
@@ -477,7 +477,9 @@
echo "fi"; \
echo ""; \
echo "if [ -x \"$(PAX_COMMAND)\" ]; then "; \
- echo " $(PAX_COMMAND) $(PAX_COMMAND_ARGS) ./\$${GAMMA_PROG}"; \
+ echo " if cat /proc/self/status | grep '^PaX' > /dev/null ; then "; \
+ echo " $(PAX_COMMAND) $(PAX_COMMAND_ARGS) ./\$${GAMMA_PROG}"; \
+ echo " fi"; \
echo "fi"; \
echo ""; \
echo "if [ \"$(OS_VENDOR)\" = \"Darwin\" ]; then "; \
diff -r 73fd325ff54e -r 3f6e602a1357 make/linux/makefiles/gcc.make
--- a/make/linux/makefiles/gcc.make Sat Jul 18 00:45:31 2015 +0100
+++ b/make/linux/makefiles/gcc.make Mon Jul 20 16:44:01 2015 +0100
@@ -107,6 +107,8 @@
endif
ARCHFLAG/ppc64 = -m64
# gcc bug http://gcc.gnu.org/PR63341 in ppc code generation requires -fno-tree-vectorize for now
+# Fixed in GCC 5 and later
+ifeq "$(shell expr \( $(CC_VER_MAJOR) \< 5 \) )" "1"
ARCHFLAG/ppc += -fno-tree-vectorize
ARCHFLAG/ppc64 += -fno-tree-vectorize
ifeq ($(TYPE),ZERO)
@@ -120,6 +122,7 @@
ARCHFLAG/zero += -fno-tree-vectorize
endif
endif
+endif
CFLAGS += $(ARCHFLAG)
AOUT_FLAGS += $(ARCHFLAG)
diff -r 73fd325ff54e -r 3f6e602a1357 src/share/vm/c1/c1_LIRGenerator.cpp
--- a/src/share/vm/c1/c1_LIRGenerator.cpp Sat Jul 18 00:45:31 2015 +0100
+++ b/src/share/vm/c1/c1_LIRGenerator.cpp Mon Jul 20 16:44:01 2015 +0100
@@ -2154,7 +2154,15 @@
#ifdef _LP64
}
#endif
- __ shift_left(index_op, log2_scale, index_op);
+ LIR_Opr tmp = new_pointer_register();
+ if (TwoOperandLIRForm) {
+ __ move(index_op, tmp);
+ index_op = tmp;
+ }
+ __ shift_left(index_op, log2_scale, tmp);
+ if (!TwoOperandLIRForm) {
+ index_op = tmp;
+ }
}
#ifdef _LP64
else if(!index_op->is_illegal() && index_op->type() == T_INT) {
diff -r 73fd325ff54e -r 3f6e602a1357 src/share/vm/classfile/systemDictionary.cpp
--- a/src/share/vm/classfile/systemDictionary.cpp Sat Jul 18 00:45:31 2015 +0100
+++ b/src/share/vm/classfile/systemDictionary.cpp Mon Jul 20 16:44:01 2015 +0100
@@ -2305,9 +2305,6 @@
assert(!THREAD->is_Compiler_thread(), "");
Handle method_type =
SystemDictionary::find_method_handle_type(signature, accessing_klass, CHECK_(empty));
- if (false) { // FIXME: Decide if the Java upcall should resolve signatures.
- method_type = java_lang_String::create_from_symbol(signature, CHECK_(empty));
- }
KlassHandle mh_klass = SystemDictionaryHandles::MethodHandle_klass();
int ref_kind = JVM_REF_invokeVirtual;
@@ -2339,6 +2336,24 @@
return unpack_method_and_appendix(mname, appendix_box, appendix_result, THREAD);
}
+// Decide if we can globally cache a lookup of this class, to be returned to any client that asks.
+// We must ensure that all class loaders everywhere will reach this class, for any client.
+// This is a safe bet for public classes in java.lang, such as Object and String.
+// We also include public classes in java.lang.invoke, because they appear frequently in system-level method types.
+// Out of an abundance of caution, we do not include any other classes, not even for packages like java.util.
+static bool is_always_visible_class(oop mirror) {
+ klassOop klass = java_lang_Class::as_klassOop(mirror);
+ if (Klass::cast(klass)->oop_is_objArray()) {
+ klass = objArrayKlass::cast(klass)->bottom_klass(); // check element type
+ }
+ if (Klass::cast(klass)->oop_is_typeArray()) {
+ return true; // primitive array
+ }
+ assert(Klass::cast(klass)->oop_is_instance(), Klass::cast(klass)->external_name());
+ return Klass::cast(klass)->is_public() &&
+ (instanceKlass::cast(klass)->is_same_class_package(SystemDictionary::Object_klass()) || // java.lang
+ instanceKlass::cast(klass)->is_same_class_package(SystemDictionary::MethodHandle_klass())); // java.lang.invoke
+}
// Ask Java code to find or construct a java.lang.invoke.MethodType for the given
// signature, as interpreted relative to the given class loader.
@@ -2361,32 +2376,33 @@
}
Handle class_loader, protection_domain;
- bool is_on_bcp = true; // keep this true as long as we can materialize from the boot classloader
+ if (accessing_klass.not_null()) {
+ class_loader = Handle(THREAD, instanceKlass::cast(accessing_klass())->class_loader());
+ protection_domain = Handle(THREAD, instanceKlass::cast(accessing_klass())->protection_domain());
+ }
+ bool can_be_cached = true;
int npts = ArgumentCount(signature).size();
objArrayHandle pts = oopFactory::new_objArray(SystemDictionary::Class_klass(), npts, CHECK_(empty));
int arg = 0;
- Handle rt; // the return type from the signature
+ Handle rt; // the return type from the signature
ResourceMark rm(THREAD);
for (SignatureStream ss(signature); !ss.is_done(); ss.next()) {
oop mirror = NULL;
- if (is_on_bcp) {
- // Note: class_loader & protection_domain are both null at this point.
- mirror = ss.as_java_mirror(class_loader, protection_domain,
+ if (can_be_cached) {
+ // Use neutral class loader to lookup candidate classes to be placed in the cache.
+ mirror = ss.as_java_mirror(Handle(), Handle(),
SignatureStream::ReturnNull, CHECK_(empty));
- if (mirror == NULL) {
- // fall back from BCP to accessing_klass
- if (accessing_klass.not_null()) {
- class_loader = Handle(THREAD, instanceKlass::cast(accessing_klass())->class_loader());
- protection_domain = Handle(THREAD, instanceKlass::cast(accessing_klass())->protection_domain());
- }
- is_on_bcp = false;
+ if (mirror == NULL || (ss.is_object() && !is_always_visible_class(mirror))) {
+ // Fall back to accessing_klass context.
+ can_be_cached = false;
}
}
- if (!is_on_bcp) {
+ if (!can_be_cached) {
// Resolve, throwing a real error if it doesn't work.
mirror = ss.as_java_mirror(class_loader, protection_domain,
SignatureStream::NCDFError, CHECK_(empty));
}
+ assert(!oopDesc::is_null(mirror), ss.as_symbol(THREAD)->as_C_string());
if (ss.at_return_type())
rt = Handle(THREAD, mirror);
else
@@ -2418,7 +2434,7 @@
&args, CHECK_(empty));
Handle method_type(THREAD, (oop) result.get_jobject());
- if (is_on_bcp) {
+ if (can_be_cached) {
// We can cache this MethodType inside the JVM.
MutexLocker ml(SystemDictionary_lock, THREAD);
spe = invoke_method_table()->find_entry(index, hash, signature, null_iid);
More information about the distro-pkg-dev
mailing list