/hg/release/icedtea7-forest-2.5/hotspot: 8 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Oct 14 20:13:54 UTC 2014
changeset 22fb9f5381f8 in /hg/release/icedtea7-forest-2.5/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot?cmd=changeset;node=22fb9f5381f8
author: sgabdura
date: Wed May 21 08:20:28 2014 +0200
8015256: Better class accessibility
Summary: Improve protection domain check in forName()
Reviewed-by: coleenp, mchung, acorn, jdn
changeset 8ac7269c0c35 in /hg/release/icedtea7-forest-2.5/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot?cmd=changeset;node=8ac7269c0c35
author: andrew
date: Thu Oct 02 02:06:09 2014 +0100
8022783: Optimize C2 optimizations
Reviewed-by: kvn, twisti
Original-by: adlertz
changeset 06368453578a in /hg/release/icedtea7-forest-2.5/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot?cmd=changeset;node=06368453578a
author: sgabdura
date: Fri Apr 25 08:46:51 2014 +0200
8036805: Correct linker method lookup.
8036810: Correct linker field lookup
Summary: Correct handling of array of primitive type qualifiers during field and method resolution.
Reviewed-by: lfoltan
changeset cf79e029706a in /hg/release/icedtea7-forest-2.5/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot?cmd=changeset;node=cf79e029706a
author: twisti
date: Fri Apr 18 17:05:33 2014 -1000
8038899: Safer safepoints
Reviewed-by: kvn, ahgross
changeset 585e9d9562f4 in /hg/release/icedtea7-forest-2.5/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot?cmd=changeset;node=585e9d9562f4
author: vkempik
date: Wed Jun 18 18:30:08 2014 +0200
8038903: More native monitor monitoring
Summary: Moved ntive monitor monitoring flags to experimental
Reviewed-by: zgu
changeset 5c1fa981c640 in /hg/release/icedtea7-forest-2.5/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot?cmd=changeset;node=5c1fa981c640
author: hseigel
date: Fri May 30 13:38:44 2014 -0400
8041717: Issue with class file parser
Summary: Add better checking for bad values.
Reviewed-by: coleenp, lfoltan, mschoene
changeset 1d0d98e7c981 in /hg/release/icedtea7-forest-2.5/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot?cmd=changeset;node=1d0d98e7c981
author: twisti
date: Tue May 20 19:50:38 2014 -0700
8042603: 'SafepointPollOffset' was not declared in static member function 'static bool Arguments::check_vm_args_consistency()'
Reviewed-by: kvn
changeset 4dc4b096589a in /hg/release/icedtea7-forest-2.5/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot?cmd=changeset;node=4dc4b096589a
author: andrew
date: Tue Oct 14 21:12:32 2014 +0100
Added tag icedtea-2.5.3 for changeset 1d0d98e7c981
diffstat:
.hgtags | 1 +
make/bsd/makefiles/mapfile-vers-debug | 3 +-
make/bsd/makefiles/mapfile-vers-product | 3 +-
make/linux/makefiles/mapfile-vers-debug | 3 +-
make/linux/makefiles/mapfile-vers-product | 3 +-
make/solaris/makefiles/mapfile-vers | 3 +-
src/share/vm/adlc/formssel.cpp | 6 ---
src/share/vm/classfile/classFileParser.cpp | 6 ++-
src/share/vm/interpreter/linkResolver.cpp | 51 +++++++++++++++++------------
src/share/vm/oops/arrayKlass.cpp | 9 ++++-
src/share/vm/oops/arrayKlass.hpp | 7 +++-
src/share/vm/oops/klass.cpp | 11 +++++-
src/share/vm/oops/klass.hpp | 4 +-
src/share/vm/opto/reg_split.cpp | 21 ++++--------
src/share/vm/prims/jvm.cpp | 48 ++++++++++++++++++++++++++-
src/share/vm/prims/jvm.h | 15 ++++++++-
src/share/vm/runtime/arguments.cpp | 4 ++
src/share/vm/runtime/globals.hpp | 8 ++-
18 files changed, 148 insertions(+), 58 deletions(-)
diffs (truncated from 533 to 500 lines):
diff -r ec692ec8cf82 -r 4dc4b096589a .hgtags
--- a/.hgtags Thu Oct 02 00:43:17 2014 +0100
+++ b/.hgtags Tue Oct 14 21:12:32 2014 +0100
@@ -711,3 +711,4 @@
4ad43b271fd439317ec422b5ea35ea3483d40922 icedtea-2.5.2
9f719e4c80af23dc6574df3e431ad85c29a1937d icedtea-2.5.3pre01
7ce2690d2182cf6643b9860cdd64cc0c7ed72826 icedtea-2.5.3pre02
+1d0d98e7c98104a48513aa684b85e5dfdf77c7f0 icedtea-2.5.3
diff -r ec692ec8cf82 -r 4dc4b096589a make/bsd/makefiles/mapfile-vers-debug
--- a/make/bsd/makefiles/mapfile-vers-debug Thu Oct 02 00:43:17 2014 +0100
+++ b/make/bsd/makefiles/mapfile-vers-debug Tue Oct 14 21:12:32 2014 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 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
@@ -82,6 +82,7 @@
_JVM_EnableCompiler
_JVM_Exit
_JVM_FillInStackTrace
+ _JVM_FindClassFromCaller
_JVM_FindClassFromClass
_JVM_FindClassFromClassLoader
_JVM_FindClassFromBootLoader
diff -r ec692ec8cf82 -r 4dc4b096589a make/bsd/makefiles/mapfile-vers-product
--- a/make/bsd/makefiles/mapfile-vers-product Thu Oct 02 00:43:17 2014 +0100
+++ b/make/bsd/makefiles/mapfile-vers-product Tue Oct 14 21:12:32 2014 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 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
@@ -82,6 +82,7 @@
_JVM_EnableCompiler
_JVM_Exit
_JVM_FillInStackTrace
+ _JVM_FindClassFromCaller
_JVM_FindClassFromClass
_JVM_FindClassFromClassLoader
_JVM_FindClassFromBootLoader
diff -r ec692ec8cf82 -r 4dc4b096589a make/linux/makefiles/mapfile-vers-debug
--- a/make/linux/makefiles/mapfile-vers-debug Thu Oct 02 00:43:17 2014 +0100
+++ b/make/linux/makefiles/mapfile-vers-debug Tue Oct 14 21:12:32 2014 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 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
@@ -84,6 +84,7 @@
JVM_EnableCompiler;
JVM_Exit;
JVM_FillInStackTrace;
+ JVM_FindClassFromCaller;
JVM_FindClassFromClass;
JVM_FindClassFromClassLoader;
JVM_FindClassFromBootLoader;
diff -r ec692ec8cf82 -r 4dc4b096589a make/linux/makefiles/mapfile-vers-product
--- a/make/linux/makefiles/mapfile-vers-product Thu Oct 02 00:43:17 2014 +0100
+++ b/make/linux/makefiles/mapfile-vers-product Tue Oct 14 21:12:32 2014 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 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
@@ -84,6 +84,7 @@
JVM_EnableCompiler;
JVM_Exit;
JVM_FillInStackTrace;
+ JVM_FindClassFromCaller;
JVM_FindClassFromClass;
JVM_FindClassFromClassLoader;
JVM_FindClassFromBootLoader;
diff -r ec692ec8cf82 -r 4dc4b096589a make/solaris/makefiles/mapfile-vers
--- a/make/solaris/makefiles/mapfile-vers Thu Oct 02 00:43:17 2014 +0100
+++ b/make/solaris/makefiles/mapfile-vers Tue Oct 14 21:12:32 2014 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 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
@@ -84,6 +84,7 @@
JVM_EnableCompiler;
JVM_Exit;
JVM_FillInStackTrace;
+ JVM_FindClassFromCaller;
JVM_FindClassFromClass;
JVM_FindClassFromClassLoader;
JVM_FindClassFromBootLoader;
diff -r ec692ec8cf82 -r 4dc4b096589a src/share/vm/adlc/formssel.cpp
--- a/src/share/vm/adlc/formssel.cpp Thu Oct 02 00:43:17 2014 +0100
+++ b/src/share/vm/adlc/formssel.cpp Tue Oct 14 21:12:32 2014 +0100
@@ -565,12 +565,6 @@
attr = (Attribute *)attr->_next;
}
- // Ugly: until a better fix is implemented, disable rematerialization for
- // negD nodes because they are proved to be problematic.
- if (is_ideal_negD()) {
- return false;
- }
-
// Constants
if( _components.count() == 1 && _components[0]->is(Component::USE_DEF) )
rematerialize = true;
diff -r ec692ec8cf82 -r 4dc4b096589a src/share/vm/classfile/classFileParser.cpp
--- a/src/share/vm/classfile/classFileParser.cpp Thu Oct 02 00:43:17 2014 +0100
+++ b/src/share/vm/classfile/classFileParser.cpp Tue Oct 14 21:12:32 2014 +0100
@@ -2721,6 +2721,11 @@
"bootstrap_method_index %u has bad constant type in class file %s",
bootstrap_method_index,
CHECK);
+
+ guarantee_property((operand_fill_index + 1 + argument_count) < operands->length(),
+ "Invalid BootstrapMethods num_bootstrap_methods or num_bootstrap_arguments value in class file %s",
+ CHECK);
+
operands->short_at_put(operand_fill_index++, bootstrap_method_index);
operands->short_at_put(operand_fill_index++, argument_count);
@@ -2738,7 +2743,6 @@
}
assert(operand_fill_index == operands()->length(), "exact fill");
- assert(constantPoolOopDesc::operand_array_length(operands()) == attribute_array_length, "correct decode");
u1* current_end = cfs->current();
guarantee_property(current_end == current_start + attribute_byte_length,
diff -r ec692ec8cf82 -r 4dc4b096589a src/share/vm/interpreter/linkResolver.cpp
--- a/src/share/vm/interpreter/linkResolver.cpp Thu Oct 02 00:43:17 2014 +0100
+++ b/src/share/vm/interpreter/linkResolver.cpp Tue Oct 14 21:12:32 2014 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -190,6 +190,14 @@
void LinkResolver::lookup_method_in_klasses(methodHandle& result, KlassHandle klass, Symbol* name, Symbol* signature, TRAPS) {
methodOop result_oop = klass->uncached_lookup_method(name, signature);
+
+ //JDK 7 does not support default methods, but this code ported from JDK8 to keep code consistent for all JDK.
+ if (klass->oop_is_array()) {
+ // Only consider klass and super klass for arrays
+ result = methodHandle(THREAD, result_oop);
+ return;
+ }
+
if (EnableInvokeDynamic && result_oop != NULL) {
vmIntrinsics::ID iid = result_oop->intrinsic_id();
if (MethodHandles::is_signature_polymorphic(iid)) {
@@ -424,7 +432,7 @@
// 2. lookup method in resolved klass and its super klasses
lookup_method_in_klasses(resolved_method, resolved_klass, method_name, method_signature, CHECK);
- if (resolved_method.is_null()) { // not found in the class hierarchy
+ if (resolved_method.is_null() && !resolved_klass->oop_is_array()) { // not found in the class hierarchy
// 3. lookup method in all the interfaces implemented by the resolved klass
lookup_method_in_interfaces(resolved_method, resolved_klass, method_name, method_signature, CHECK);
@@ -437,16 +445,16 @@
CLEAR_PENDING_EXCEPTION;
}
}
+ }
- if (resolved_method.is_null()) {
- // 4. method lookup failed
- ResourceMark rm(THREAD);
- THROW_MSG_CAUSE(vmSymbols::java_lang_NoSuchMethodError(),
- methodOopDesc::name_and_sig_as_C_string(Klass::cast(resolved_klass()),
- method_name,
- method_signature),
- nested_exception);
- }
+ if (resolved_method.is_null()) {
+ // 4. method lookup failed
+ ResourceMark rm(THREAD);
+ THROW_MSG_CAUSE(vmSymbols::java_lang_NoSuchMethodError(),
+ methodOopDesc::name_and_sig_as_C_string(Klass::cast(resolved_klass()),
+ method_name,
+ method_signature),
+ nested_exception);
}
// 5. check if method is concrete
@@ -517,17 +525,18 @@
// lookup method in this interface or its super, java.lang.Object
lookup_instance_method_in_klasses(resolved_method, resolved_klass, method_name, method_signature, CHECK);
- if (resolved_method.is_null()) {
+ if (resolved_method.is_null() && !resolved_klass->oop_is_array()) {
// lookup method in all the super-interfaces
lookup_method_in_interfaces(resolved_method, resolved_klass, method_name, method_signature, CHECK);
- if (resolved_method.is_null()) {
- // no method found
- ResourceMark rm(THREAD);
- THROW_MSG(vmSymbols::java_lang_NoSuchMethodError(),
- methodOopDesc::name_and_sig_as_C_string(Klass::cast(resolved_klass()),
- method_name,
- method_signature));
- }
+ }
+
+ if (resolved_method.is_null()) {
+ // no method found
+ ResourceMark rm(THREAD);
+ THROW_MSG(vmSymbols::java_lang_NoSuchMethodError(),
+ methodOopDesc::name_and_sig_as_C_string(Klass::cast(resolved_klass()),
+ method_name,
+ method_signature));
}
if (check_access) {
@@ -617,7 +626,7 @@
// Resolve instance field
fieldDescriptor fd; // find_field initializes fd if found
- KlassHandle sel_klass(THREAD, instanceKlass::cast(resolved_klass())->find_field(field, sig, &fd));
+ KlassHandle sel_klass(THREAD, resolved_klass->find_field(field, sig, &fd));
// check if field exists; i.e., if a klass containing the field def has been selected
if (sel_klass.is_null()){
ResourceMark rm(THREAD);
diff -r ec692ec8cf82 -r 4dc4b096589a src/share/vm/oops/arrayKlass.cpp
--- a/src/share/vm/oops/arrayKlass.cpp Thu Oct 02 00:43:17 2014 +0100
+++ b/src/share/vm/oops/arrayKlass.cpp Tue Oct 14 21:12:32 2014 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -64,6 +64,13 @@
return NULL;
}
+// find field according to JVM spec 5.4.3.2, returns the klass in which the field is defined
+klassOop arrayKlass::find_field(Symbol* name, Symbol* sig, fieldDescriptor* fd) const {
+ // There are no fields in an array klass but look to the super class (Object)
+ assert(super(), "super klass must be present");
+ return Klass::cast(super())->find_field(name, sig, fd);
+}
+
methodOop arrayKlass::uncached_lookup_method(Symbol* name, Symbol* signature) const {
// There are no methods in an array klass but the super class (Object) has some
assert(super(), "super klass must be present");
diff -r ec692ec8cf82 -r 4dc4b096589a src/share/vm/oops/arrayKlass.hpp
--- a/src/share/vm/oops/arrayKlass.hpp Thu Oct 02 00:43:17 2014 +0100
+++ b/src/share/vm/oops/arrayKlass.hpp Tue Oct 14 21:12:32 2014 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -30,6 +30,8 @@
#include "oops/klassOop.hpp"
#include "oops/klassVtable.hpp"
+class fieldDescriptor;
+
// arrayKlass is the abstract baseclass for all array classes
class arrayKlass: public Klass {
@@ -83,6 +85,9 @@
virtual oop multi_allocate(int rank, jint* sizes, TRAPS);
objArrayOop allocate_arrayArray(int n, int length, TRAPS);
+ // find field according to JVM spec 5.4.3.2, returns the klass in which the field is defined
+ klassOop find_field(Symbol* name, Symbol* sig, fieldDescriptor* fd) const;
+
// Lookup operations
methodOop uncached_lookup_method(Symbol* name, Symbol* signature) const;
diff -r ec692ec8cf82 -r 4dc4b096589a src/share/vm/oops/klass.cpp
--- a/src/share/vm/oops/klass.cpp Thu Oct 02 00:43:17 2014 +0100
+++ b/src/share/vm/oops/klass.cpp Tue Oct 14 21:12:32 2014 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -119,6 +119,15 @@
return is_subclass_of(k);
}
+klassOop Klass::find_field(Symbol* name, Symbol* sig, fieldDescriptor* fd) const {
+#ifdef ASSERT
+ tty->print_cr("Error: find_field called on a klass oop."
+ " Likely error: reflection method does not correctly"
+ " wrap return value in a mirror object.");
+#endif
+ ShouldNotReachHere();
+ return NULL;
+}
methodOop Klass::uncached_lookup_method(Symbol* name, Symbol* signature) const {
#ifdef ASSERT
diff -r ec692ec8cf82 -r 4dc4b096589a src/share/vm/oops/klass.hpp
--- a/src/share/vm/oops/klass.hpp Thu Oct 02 00:43:17 2014 +0100
+++ b/src/share/vm/oops/klass.hpp Tue Oct 14 21:12:32 2014 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -88,6 +88,7 @@
class klassVtable;
class KlassHandle;
class OrderAccess;
+class fieldDescriptor;
// Holder (or cage) for the C++ vtable of each kind of Klass.
// We want to tightly constrain the location of the C++ vtable in the overall layout.
@@ -514,6 +515,7 @@
virtual void initialize(TRAPS);
// lookup operation for MethodLookupCache
friend class MethodLookupCache;
+ virtual klassOop find_field(Symbol* name, Symbol* signature, fieldDescriptor* fd) const;
virtual methodOop uncached_lookup_method(Symbol* name, Symbol* signature) const;
public:
methodOop lookup_method(Symbol* name, Symbol* signature) const {
diff -r ec692ec8cf82 -r 4dc4b096589a src/share/vm/opto/reg_split.cpp
--- a/src/share/vm/opto/reg_split.cpp Thu Oct 02 00:43:17 2014 +0100
+++ b/src/share/vm/opto/reg_split.cpp Tue Oct 14 21:12:32 2014 +0100
@@ -51,15 +51,6 @@
static const char out_of_nodes[] = "out of nodes during split";
-static bool contains_no_live_range_input(const Node* def) {
- for (uint i = 1; i < def->req(); ++i) {
- if (def->in(i) != NULL && def->in_RegMask(i).is_NotEmpty()) {
- return false;
- }
- }
- return true;
-}
-
//------------------------------get_spillcopy_wide-----------------------------
// Get a SpillCopy node with wide-enough masks. Use the 'wide-mask', the
// wide ideal-register spill-mask if possible. If the 'wide-mask' does
@@ -326,7 +317,6 @@
if( def->req() > 1 ) {
for( uint i = 1; i < def->req(); i++ ) {
Node *in = def->in(i);
- // Check for single-def (LRG cannot redefined)
uint lidx = n2lidx(in);
// On PPC we see rematerialized nodes that have a live-range
@@ -337,10 +327,13 @@
// count.
#if defined(PPC64)
if( lidx >= _maxlrg ) return def;
-#else
- if( lidx >= _maxlrg ) continue; // Value is a recent spill-copy
#endif
- if (lrgs(lidx).is_singledef()) continue;
+ // We do not need this for live ranges that are only defined once.
+ // However, this is not true for spill copies that are added in this
+ // Split() pass, since they might get coalesced later on in this pass.
+ if (lidx < _maxlrg && lrgs(lidx).is_singledef()) {
+ continue;
+ }
Block *b_def = _cfg._bbs[def->_idx];
int idx_def = b_def->find_node(def);
@@ -1314,7 +1307,7 @@
Node *def = Reaches[pidx][slidx];
assert( def, "must have reaching def" );
// If input up/down sense and reg-pressure DISagree
- if (def->rematerialize() && contains_no_live_range_input(def)) {
+ if (def->rematerialize()) {
// Place the rematerialized node above any MSCs created during
// phi node splitting. end_idx points at the insertion point
// so look at the node before it.
diff -r ec692ec8cf82 -r 4dc4b096589a src/share/vm/prims/jvm.cpp
--- a/src/share/vm/prims/jvm.cpp Thu Oct 02 00:43:17 2014 +0100
+++ b/src/share/vm/prims/jvm.cpp Tue Oct 14 21:12:32 2014 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -749,6 +749,7 @@
return (jclass) JNIHandles::make_local(env, Klass::cast(k)->java_mirror());
JVM_END
+// Not used; JVM_FindClassFromCaller replaces this.
JVM_ENTRY(jclass, JVM_FindClassFromClassLoader(JNIEnv* env, const char* name,
jboolean init, jobject loader,
jboolean throwError))
@@ -775,6 +776,42 @@
return result;
JVM_END
+// Find a class with this name in this loader, using the caller's protection domain.
+JVM_ENTRY(jclass, JVM_FindClassFromCaller(JNIEnv* env, const char* name,
+ jboolean init, jobject loader,
+ jclass caller))
+ JVMWrapper2("JVM_FindClassFromCaller %s throws ClassNotFoundException", name);
+ // Java libraries should ensure that name is never null...
+ if (name == NULL || (int)strlen(name) > Symbol::max_length()) {
+ // It's impossible to create this class; the name cannot fit
+ // into the constant pool.
+ THROW_MSG_0(vmSymbols::java_lang_ClassNotFoundException(), name);
+ }
+
+ TempNewSymbol h_name = SymbolTable::new_symbol(name, CHECK_NULL);
+
+ oop loader_oop = JNIHandles::resolve(loader);
+ oop from_class = JNIHandles::resolve(caller);
+ oop protection_domain = NULL;
+ // If loader is null, shouldn't call ClassLoader.checkPackageAccess; otherwise get
+ // NPE. Put it in another way, the bootstrap class loader has all permission and
+ // thus no checkPackageAccess equivalence in the VM class loader.
+ // The caller is also passed as NULL by the java code if there is no security
+ // manager to avoid the performance cost of getting the calling class.
+ if (from_class != NULL && loader_oop != NULL) {
+ protection_domain = instanceKlass::cast(java_lang_Class::as_klassOop(from_class))->protection_domain();
+ }
+
+ Handle h_loader(THREAD, loader_oop);
+ Handle h_prot(THREAD, protection_domain);
+ jclass result = find_class_from_class_loader(env, h_name, init, h_loader,
+ h_prot, false, THREAD);
+
+ if (TraceClassResolution && result != NULL) {
+ trace_class_resolution(java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(result)));
+ }
+ return result;
+JVM_END
JVM_ENTRY(jclass, JVM_FindClassFromClass(JNIEnv *env, const char *name,
jboolean init, jclass from))
@@ -4101,10 +4138,15 @@
// Shared JNI/JVM entry points //////////////////////////////////////////////////////////////
-jclass find_class_from_class_loader(JNIEnv* env, Symbol* name, jboolean init, Handle loader, Handle protection_domain, jboolean throwError, TRAPS) {
+jclass find_class_from_class_loader(JNIEnv* env, Symbol* name, jboolean init,
+ Handle loader, Handle protection_domain,
+ jboolean throwError, TRAPS) {
// Security Note:
// The Java level wrapper will perform the necessary security check allowing
- // us to pass the NULL as the initiating class loader.
+ // us to pass the NULL as the initiating class loader. The VM is responsible for
+ // the checkPackageAccess relative to the initiating class loader via the
+ // protection_domain. The protection_domain is passed as NULL by the java code
+ // if there is no security manager in 3-arg Class.forName().
klassOop klass = SystemDictionary::resolve_or_fail(name, loader, protection_domain, throwError != 0, CHECK_NULL);
KlassHandle klass_handle(THREAD, klass);
diff -r ec692ec8cf82 -r 4dc4b096589a src/share/vm/prims/jvm.h
--- a/src/share/vm/prims/jvm.h Thu Oct 02 00:43:17 2014 +0100
+++ b/src/share/vm/prims/jvm.h Tue Oct 14 21:12:32 2014 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -418,6 +418,19 @@
JVM_FindClassFromBootLoader(JNIEnv *env, const char *name);
/*
+ * Find a class from a given class loader. Throws ClassNotFoundException.
+ * name: name of class
+ * init: whether initialization is done
+ * loader: class loader to look up the class. This may not be the same as the caller's
+ * class loader.
+ * caller: initiating class. The initiating class may be null when a security
+ * manager is not installed.
+ */
+JNIEXPORT jclass JNICALL
+JVM_FindClassFromCaller(JNIEnv *env, const char *name, jboolean init,
+ jobject loader, jclass caller);
+
+/*
* Find a class from a given class.
*/
More information about the distro-pkg-dev
mailing list