2007-12-01 00:00:00 +00:00
|
|
|
/*
|
2014-04-14 14:27:45 -04:00
|
|
|
* Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
|
2007-12-01 00:00:00 +00:00
|
|
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
|
|
*
|
|
|
|
* This code is free software; you can redistribute it and/or modify it
|
|
|
|
* under the terms of the GNU General Public License version 2 only, as
|
|
|
|
* published by the Free Software Foundation.
|
|
|
|
*
|
|
|
|
* This code is distributed in the hope that it will be useful, but WITHOUT
|
|
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
|
|
* version 2 for more details (a copy is included in the LICENSE file that
|
|
|
|
* accompanied this code).
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License version
|
|
|
|
* 2 along with this work; if not, write to the Free Software Foundation,
|
|
|
|
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
*
|
2010-05-27 19:08:38 -07:00
|
|
|
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
|
|
|
* or visit www.oracle.com if you need additional information or have any
|
|
|
|
* questions.
|
2007-12-01 00:00:00 +00:00
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2010-11-23 13:22:55 -08:00
|
|
|
#include "precompiled.hpp"
|
|
|
|
#include "classfile/systemDictionary.hpp"
|
|
|
|
#include "classfile/vmSymbols.hpp"
|
|
|
|
#include "gc_implementation/shared/markSweep.inline.hpp"
|
|
|
|
#include "memory/gcLocker.hpp"
|
|
|
|
#include "memory/resourceArea.hpp"
|
|
|
|
#include "memory/universe.inline.hpp"
|
|
|
|
#include "oops/instanceKlass.hpp"
|
|
|
|
#include "oops/klassVtable.hpp"
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
#include "oops/method.hpp"
|
2010-11-23 13:22:55 -08:00
|
|
|
#include "oops/objArrayOop.hpp"
|
|
|
|
#include "oops/oop.inline.hpp"
|
|
|
|
#include "prims/jvmtiRedefineClassesTrace.hpp"
|
|
|
|
#include "runtime/arguments.hpp"
|
|
|
|
#include "runtime/handles.inline.hpp"
|
|
|
|
#include "utilities/copy.hpp"
|
2007-12-01 00:00:00 +00:00
|
|
|
|
2014-05-09 16:50:54 -04:00
|
|
|
PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
|
|
|
|
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
inline InstanceKlass* klassVtable::ik() const {
|
|
|
|
Klass* k = _klass();
|
|
|
|
assert(k->oop_is_instance(), "not an InstanceKlass");
|
|
|
|
return (InstanceKlass*)k;
|
2007-12-01 00:00:00 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// this function computes the vtable size (including the size needed for miranda
|
2013-09-13 22:38:02 -04:00
|
|
|
// methods) and the number of miranda methods in this class.
|
2007-12-01 00:00:00 +00:00
|
|
|
// Note on Miranda methods: Let's say there is a class C that implements
|
2013-09-13 22:38:02 -04:00
|
|
|
// interface I, and none of C's superclasses implements I.
|
|
|
|
// Let's say there is an abstract method m in I that neither C
|
|
|
|
// nor any of its super classes implement (i.e there is no method of any access,
|
|
|
|
// with the same name and signature as m), then m is a Miranda method which is
|
2007-12-01 00:00:00 +00:00
|
|
|
// entered as a public abstract method in C's vtable. From then on it should
|
|
|
|
// treated as any other public method in C for method over-ride purposes.
|
2012-10-11 12:25:42 -04:00
|
|
|
void klassVtable::compute_vtable_size_and_num_mirandas(
|
|
|
|
int* vtable_length_ret, int* num_new_mirandas,
|
|
|
|
GrowableArray<Method*>* all_mirandas, Klass* super,
|
|
|
|
Array<Method*>* methods, AccessFlags class_flags,
|
|
|
|
Handle classloader, Symbol* classname, Array<Klass*>* local_interfaces,
|
|
|
|
TRAPS) {
|
2007-12-01 00:00:00 +00:00
|
|
|
No_Safepoint_Verifier nsv;
|
|
|
|
|
|
|
|
// set up default result values
|
2012-10-11 12:25:42 -04:00
|
|
|
int vtable_length = 0;
|
2007-12-01 00:00:00 +00:00
|
|
|
|
|
|
|
// start off with super's vtable length
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
InstanceKlass* sk = (InstanceKlass*)super;
|
2007-12-01 00:00:00 +00:00
|
|
|
vtable_length = super == NULL ? 0 : sk->vtable_length();
|
|
|
|
|
|
|
|
// go thru each method in the methods table to see if it needs a new entry
|
|
|
|
int len = methods->length();
|
|
|
|
for (int i = 0; i < len; i++) {
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
assert(methods->at(i)->is_method(), "must be a Method*");
|
|
|
|
methodHandle mh(THREAD, methods->at(i));
|
2007-12-01 00:00:00 +00:00
|
|
|
|
2009-03-18 17:20:57 -04:00
|
|
|
if (needs_new_vtable_entry(mh, super, classloader, classname, class_flags, THREAD)) {
|
2007-12-01 00:00:00 +00:00
|
|
|
vtable_length += vtableEntry::size(); // we need a new entry
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-10-11 12:25:42 -04:00
|
|
|
GrowableArray<Method*> new_mirandas(20);
|
2007-12-01 00:00:00 +00:00
|
|
|
// compute the number of mirandas methods that must be added to the end
|
2013-10-07 12:20:28 -04:00
|
|
|
get_mirandas(&new_mirandas, all_mirandas, super, methods, NULL, local_interfaces);
|
2012-10-11 12:25:42 -04:00
|
|
|
*num_new_mirandas = new_mirandas.length();
|
|
|
|
|
2013-11-13 07:31:26 -08:00
|
|
|
// Interfaces do not need interface methods in their vtables
|
|
|
|
// This includes miranda methods and during later processing, default methods
|
|
|
|
if (!class_flags.is_interface()) {
|
|
|
|
vtable_length += *num_new_mirandas * vtableEntry::size();
|
|
|
|
}
|
2007-12-01 00:00:00 +00:00
|
|
|
|
|
|
|
if (Universe::is_bootstrapping() && vtable_length == 0) {
|
|
|
|
// array classes don't have their superclass set correctly during
|
|
|
|
// bootstrapping
|
|
|
|
vtable_length = Universe::base_vtable_size();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (super == NULL && !Universe::is_bootstrapping() &&
|
|
|
|
vtable_length != Universe::base_vtable_size()) {
|
|
|
|
// Someone is attempting to redefine java.lang.Object incorrectly. The
|
|
|
|
// only way this should happen is from
|
|
|
|
// SystemDictionary::resolve_from_stream(), which will detect this later
|
|
|
|
// and throw a security exception. So don't assert here to let
|
|
|
|
// the exception occur.
|
|
|
|
vtable_length = Universe::base_vtable_size();
|
|
|
|
}
|
|
|
|
assert(super != NULL || vtable_length == Universe::base_vtable_size(),
|
|
|
|
"bad vtable size for class Object");
|
|
|
|
assert(vtable_length % vtableEntry::size() == 0, "bad vtable length");
|
|
|
|
assert(vtable_length >= Universe::base_vtable_size(), "vtable too small");
|
2012-10-11 12:25:42 -04:00
|
|
|
|
|
|
|
*vtable_length_ret = vtable_length;
|
2007-12-01 00:00:00 +00:00
|
|
|
}
|
|
|
|
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
int klassVtable::index_of(Method* m, int len) const {
|
2013-09-13 22:38:02 -04:00
|
|
|
assert(m->has_vtable_index(), "do not ask this of non-vtable methods");
|
2007-12-01 00:00:00 +00:00
|
|
|
return m->vtable_index();
|
|
|
|
}
|
|
|
|
|
2013-09-13 22:38:02 -04:00
|
|
|
// Copy super class's vtable to the first part (prefix) of this class's vtable,
|
|
|
|
// and return the number of entries copied. Expects that 'super' is the Java
|
|
|
|
// super class (arrays can have "array" super classes that must be skipped).
|
2007-12-01 00:00:00 +00:00
|
|
|
int klassVtable::initialize_from_super(KlassHandle super) {
|
|
|
|
if (super.is_null()) {
|
|
|
|
return 0;
|
|
|
|
} else {
|
|
|
|
// copy methods from superKlass
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
// can't inherit from array class, so must be InstanceKlass
|
2007-12-01 00:00:00 +00:00
|
|
|
assert(super->oop_is_instance(), "must be instance klass");
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
InstanceKlass* sk = (InstanceKlass*)super();
|
2007-12-01 00:00:00 +00:00
|
|
|
klassVtable* superVtable = sk->vtable();
|
|
|
|
assert(superVtable->length() <= _length, "vtable too short");
|
|
|
|
#ifdef ASSERT
|
|
|
|
superVtable->verify(tty, true);
|
|
|
|
#endif
|
|
|
|
superVtable->copy_vtable_to(table());
|
|
|
|
#ifndef PRODUCT
|
|
|
|
if (PrintVtables && Verbose) {
|
2009-03-18 17:20:57 -04:00
|
|
|
ResourceMark rm;
|
2007-12-01 00:00:00 +00:00
|
|
|
tty->print_cr("copy vtable from %s to %s size %d", sk->internal_name(), klass()->internal_name(), _length);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
return superVtable->length();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-09-13 22:38:02 -04:00
|
|
|
//
|
|
|
|
// Revised lookup semantics introduced 1.3 (Kestrel beta)
|
2007-12-01 00:00:00 +00:00
|
|
|
void klassVtable::initialize_vtable(bool checkconstraints, TRAPS) {
|
|
|
|
|
|
|
|
// Note: Arrays can have intermediate array supers. Use java_super to skip them.
|
|
|
|
KlassHandle super (THREAD, klass()->java_super());
|
|
|
|
int nofNewEntries = 0;
|
|
|
|
|
|
|
|
if (PrintVtables && !klass()->oop_is_array()) {
|
|
|
|
ResourceMark rm(THREAD);
|
|
|
|
tty->print_cr("Initializing: %s", _klass->name()->as_C_string());
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef ASSERT
|
|
|
|
oop* end_of_obj = (oop*)_klass() + _klass()->size();
|
|
|
|
oop* end_of_vtable = (oop*)&table()[_length];
|
|
|
|
assert(end_of_vtable <= end_of_obj, "vtable extends beyond end");
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (Universe::is_bootstrapping()) {
|
|
|
|
// just clear everything
|
|
|
|
for (int i = 0; i < _length; i++) table()[i].clear();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
int super_vtable_len = initialize_from_super(super);
|
|
|
|
if (klass()->oop_is_array()) {
|
|
|
|
assert(super_vtable_len == _length, "arrays shouldn't introduce new methods");
|
|
|
|
} else {
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
assert(_klass->oop_is_instance(), "must be InstanceKlass");
|
2007-12-01 00:00:00 +00:00
|
|
|
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
Array<Method*>* methods = ik()->methods();
|
|
|
|
int len = methods->length();
|
2007-12-01 00:00:00 +00:00
|
|
|
int initialized = super_vtable_len;
|
|
|
|
|
2013-09-13 22:38:02 -04:00
|
|
|
// Check each of this class's methods against super;
|
|
|
|
// if override, replace in copy of super vtable, otherwise append to end
|
2007-12-01 00:00:00 +00:00
|
|
|
for (int i = 0; i < len; i++) {
|
2013-09-13 22:38:02 -04:00
|
|
|
// update_inherited_vtable can stop for gc - ensure using handles
|
2007-12-01 00:00:00 +00:00
|
|
|
HandleMark hm(THREAD);
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
assert(methods->at(i)->is_method(), "must be a Method*");
|
|
|
|
methodHandle mh(THREAD, methods->at(i));
|
2007-12-01 00:00:00 +00:00
|
|
|
|
2013-10-07 12:20:28 -04:00
|
|
|
bool needs_new_entry = update_inherited_vtable(ik(), mh, super_vtable_len, -1, checkconstraints, CHECK);
|
2007-12-01 00:00:00 +00:00
|
|
|
|
|
|
|
if (needs_new_entry) {
|
|
|
|
put_method_at(mh(), initialized);
|
|
|
|
mh()->set_vtable_index(initialized); // set primary vtable index
|
|
|
|
initialized++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-10-07 12:20:28 -04:00
|
|
|
// update vtable with default_methods
|
|
|
|
Array<Method*>* default_methods = ik()->default_methods();
|
|
|
|
if (default_methods != NULL) {
|
|
|
|
len = default_methods->length();
|
|
|
|
if (len > 0) {
|
|
|
|
Array<int>* def_vtable_indices = NULL;
|
|
|
|
if ((def_vtable_indices = ik()->default_vtable_indices()) == NULL) {
|
|
|
|
def_vtable_indices = ik()->create_new_default_vtable_indices(len, CHECK);
|
|
|
|
} else {
|
|
|
|
assert(def_vtable_indices->length() == len, "reinit vtable len?");
|
|
|
|
}
|
|
|
|
for (int i = 0; i < len; i++) {
|
|
|
|
HandleMark hm(THREAD);
|
|
|
|
assert(default_methods->at(i)->is_method(), "must be a Method*");
|
|
|
|
methodHandle mh(THREAD, default_methods->at(i));
|
|
|
|
|
|
|
|
bool needs_new_entry = update_inherited_vtable(ik(), mh, super_vtable_len, i, checkconstraints, CHECK);
|
|
|
|
|
|
|
|
// needs new entry
|
|
|
|
if (needs_new_entry) {
|
|
|
|
put_method_at(mh(), initialized);
|
|
|
|
def_vtable_indices->at_put(i, initialized); //set vtable index
|
|
|
|
initialized++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// add miranda methods; it will also return the updated initialized
|
2013-11-13 07:31:26 -08:00
|
|
|
// Interfaces do not need interface methods in their vtables
|
|
|
|
// This includes miranda methods and during later processing, default methods
|
|
|
|
if (!ik()->is_interface()) {
|
|
|
|
initialized = fill_in_mirandas(initialized);
|
|
|
|
}
|
2007-12-01 00:00:00 +00:00
|
|
|
|
2009-03-18 17:20:57 -04:00
|
|
|
// In class hierarchies where the accessibility is not increasing (i.e., going from private ->
|
2013-09-13 22:38:02 -04:00
|
|
|
// package_private -> public/protected), the vtable might actually be smaller than our initial
|
2007-12-01 00:00:00 +00:00
|
|
|
// calculation.
|
|
|
|
assert(initialized <= _length, "vtable initialization failed");
|
|
|
|
for(;initialized < _length; initialized++) {
|
|
|
|
put_method_at(NULL, initialized);
|
|
|
|
}
|
|
|
|
NOT_PRODUCT(verify(tty, true));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-03-18 17:20:57 -04:00
|
|
|
// Called for cases where a method does not override its superclass' vtable entry
|
|
|
|
// For bytecodes not produced by javac together it is possible that a method does not override
|
|
|
|
// the superclass's method, but might indirectly override a super-super class's vtable entry
|
|
|
|
// If none found, return a null superk, else return the superk of the method this does override
|
2014-05-07 19:21:52 +04:00
|
|
|
// For public and protected methods: if they override a superclass, they will
|
|
|
|
// also be overridden themselves appropriately.
|
|
|
|
// Private methods do not override and are not overridden.
|
|
|
|
// Package Private methods are trickier:
|
|
|
|
// e.g. P1.A, pub m
|
|
|
|
// P2.B extends A, package private m
|
|
|
|
// P1.C extends B, public m
|
|
|
|
// P1.C.m needs to override P1.A.m and can not override P2.B.m
|
|
|
|
// Therefore: all package private methods need their own vtable entries for
|
|
|
|
// them to be the root of an inheritance overriding decision
|
|
|
|
// Package private methods may also override other vtable entries
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
InstanceKlass* klassVtable::find_transitive_override(InstanceKlass* initialsuper, methodHandle target_method,
|
2011-01-27 16:11:27 -08:00
|
|
|
int vtable_index, Handle target_loader, Symbol* target_classname, Thread * THREAD) {
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
InstanceKlass* superk = initialsuper;
|
2009-03-18 17:20:57 -04:00
|
|
|
while (superk != NULL && superk->super() != NULL) {
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
InstanceKlass* supersuperklass = InstanceKlass::cast(superk->super());
|
2009-03-18 17:20:57 -04:00
|
|
|
klassVtable* ssVtable = supersuperklass->vtable();
|
|
|
|
if (vtable_index < ssVtable->length()) {
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
Method* super_method = ssVtable->method_at(vtable_index);
|
2009-03-18 17:20:57 -04:00
|
|
|
#ifndef PRODUCT
|
2011-01-27 16:11:27 -08:00
|
|
|
Symbol* name= target_method()->name();
|
|
|
|
Symbol* signature = target_method()->signature();
|
|
|
|
assert(super_method->name() == name && super_method->signature() == signature, "vtable entry name/sig mismatch");
|
2009-03-18 17:20:57 -04:00
|
|
|
#endif
|
|
|
|
if (supersuperklass->is_override(super_method, target_loader, target_classname, THREAD)) {
|
|
|
|
#ifndef PRODUCT
|
|
|
|
if (PrintVtables && Verbose) {
|
|
|
|
ResourceMark rm(THREAD);
|
2013-10-07 12:20:28 -04:00
|
|
|
char* sig = target_method()->name_and_sig_as_C_string();
|
2009-03-18 17:20:57 -04:00
|
|
|
tty->print("transitive overriding superclass %s with %s::%s index %d, original flags: ",
|
|
|
|
supersuperklass->internal_name(),
|
2013-10-07 12:20:28 -04:00
|
|
|
_klass->internal_name(), sig, vtable_index);
|
2009-03-18 17:20:57 -04:00
|
|
|
super_method->access_flags().print_on(tty);
|
2013-10-07 12:20:28 -04:00
|
|
|
if (super_method->is_default_method()) {
|
2013-11-13 07:31:26 -08:00
|
|
|
tty->print("default ");
|
2013-10-07 12:20:28 -04:00
|
|
|
}
|
2009-03-18 17:20:57 -04:00
|
|
|
tty->print("overriders flags: ");
|
|
|
|
target_method->access_flags().print_on(tty);
|
2013-10-07 12:20:28 -04:00
|
|
|
if (target_method->is_default_method()) {
|
2013-11-13 07:31:26 -08:00
|
|
|
tty->print("default ");
|
2013-10-07 12:20:28 -04:00
|
|
|
}
|
2009-03-18 17:20:57 -04:00
|
|
|
}
|
|
|
|
#endif /*PRODUCT*/
|
|
|
|
break; // return found superk
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// super class has no vtable entry here, stop transitive search
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
superk = (InstanceKlass*)NULL;
|
2009-03-18 17:20:57 -04:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
// if no override found yet, continue to search up
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
superk = InstanceKlass::cast(superk->super());
|
2009-03-18 17:20:57 -04:00
|
|
|
}
|
2007-12-01 00:00:00 +00:00
|
|
|
|
2009-03-18 17:20:57 -04:00
|
|
|
return superk;
|
2007-12-01 00:00:00 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Update child's copy of super vtable for overrides
|
2013-09-13 22:38:02 -04:00
|
|
|
// OR return true if a new vtable entry is required.
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
// Only called for InstanceKlass's, i.e. not for arrays
|
2007-12-01 00:00:00 +00:00
|
|
|
// If that changed, could not use _klass as handle for klass
|
2013-10-07 12:20:28 -04:00
|
|
|
bool klassVtable::update_inherited_vtable(InstanceKlass* klass, methodHandle target_method,
|
|
|
|
int super_vtable_len, int default_index,
|
|
|
|
bool checkconstraints, TRAPS) {
|
2007-12-01 00:00:00 +00:00
|
|
|
ResourceMark rm;
|
|
|
|
bool allocate_new = true;
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
assert(klass->oop_is_instance(), "must be InstanceKlass");
|
2007-12-01 00:00:00 +00:00
|
|
|
|
2013-10-07 12:20:28 -04:00
|
|
|
Array<int>* def_vtable_indices = NULL;
|
|
|
|
bool is_default = false;
|
|
|
|
// default methods are concrete methods in superinterfaces which are added to the vtable
|
|
|
|
// with their real method_holder
|
|
|
|
// Since vtable and itable indices share the same storage, don't touch
|
|
|
|
// the default method's real vtable/itable index
|
|
|
|
// default_vtable_indices stores the vtable value relative to this inheritor
|
|
|
|
if (default_index >= 0 ) {
|
|
|
|
is_default = true;
|
|
|
|
def_vtable_indices = klass->default_vtable_indices();
|
|
|
|
assert(def_vtable_indices != NULL, "def vtable alloc?");
|
|
|
|
assert(default_index <= def_vtable_indices->length(), "def vtable len?");
|
|
|
|
} else {
|
|
|
|
assert(klass == target_method()->method_holder(), "caller resp.");
|
|
|
|
// Initialize the method's vtable index to "nonvirtual".
|
|
|
|
// If we allocate a vtable entry, we will update it to a non-negative number.
|
|
|
|
target_method()->set_vtable_index(Method::nonvirtual_vtable_index);
|
|
|
|
}
|
2007-12-01 00:00:00 +00:00
|
|
|
|
|
|
|
// Static and <init> methods are never in
|
|
|
|
if (target_method()->is_static() || target_method()->name() == vmSymbols::object_initializer_name()) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2013-09-13 22:38:02 -04:00
|
|
|
if (target_method->is_final_method(klass->access_flags())) {
|
2007-12-01 00:00:00 +00:00
|
|
|
// a final method never needs a new entry; final methods can be statically
|
|
|
|
// resolved and they have to be present in the vtable only if they override
|
|
|
|
// a super's method, in which case they re-use its entry
|
|
|
|
allocate_new = false;
|
2013-09-13 22:38:02 -04:00
|
|
|
} else if (klass->is_interface()) {
|
|
|
|
allocate_new = false; // see note below in needs_new_vtable_entry
|
|
|
|
// An interface never allocates new vtable slots, only inherits old ones.
|
|
|
|
// This method will either be assigned its own itable index later,
|
|
|
|
// or be assigned an inherited vtable index in the loop below.
|
2013-11-13 07:31:26 -08:00
|
|
|
// default methods inherited by classes store their vtable indices
|
|
|
|
// in the inheritor's default_vtable_indices
|
|
|
|
// default methods inherited by interfaces may already have a
|
|
|
|
// valid itable index, if so, don't change it
|
|
|
|
// overpass methods in an interface will be assigned an itable index later
|
|
|
|
// by an inheriting class
|
|
|
|
if (!is_default || !target_method()->has_itable_index()) {
|
|
|
|
target_method()->set_vtable_index(Method::pending_itable_index);
|
|
|
|
}
|
2007-12-01 00:00:00 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// we need a new entry if there is no superclass
|
|
|
|
if (klass->super() == NULL) {
|
|
|
|
return allocate_new;
|
|
|
|
}
|
|
|
|
|
2013-10-01 08:10:42 -04:00
|
|
|
// private methods in classes always have a new entry in the vtable
|
2009-03-18 17:20:57 -04:00
|
|
|
// specification interpretation since classic has
|
|
|
|
// private methods not overriding
|
2013-10-01 08:10:42 -04:00
|
|
|
// JDK8 adds private methods in interfaces which require invokespecial
|
2007-12-01 00:00:00 +00:00
|
|
|
if (target_method()->is_private()) {
|
|
|
|
return allocate_new;
|
|
|
|
}
|
|
|
|
|
|
|
|
// search through the vtable and update overridden entries
|
|
|
|
// Since check_signature_loaders acquires SystemDictionary_lock
|
2009-03-18 17:20:57 -04:00
|
|
|
// which can block for gc, once we are in this loop, use handles
|
|
|
|
// For classfiles built with >= jdk7, we now look for transitive overrides
|
2007-12-01 00:00:00 +00:00
|
|
|
|
2011-01-27 16:11:27 -08:00
|
|
|
Symbol* name = target_method()->name();
|
|
|
|
Symbol* signature = target_method()->signature();
|
2013-10-07 12:20:28 -04:00
|
|
|
|
|
|
|
KlassHandle target_klass(THREAD, target_method()->method_holder());
|
|
|
|
if (target_klass == NULL) {
|
|
|
|
target_klass = _klass;
|
|
|
|
}
|
|
|
|
|
|
|
|
Handle target_loader(THREAD, target_klass->class_loader());
|
|
|
|
|
|
|
|
Symbol* target_classname = target_klass->name();
|
2007-12-01 00:00:00 +00:00
|
|
|
for(int i = 0; i < super_vtable_len; i++) {
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
Method* super_method = method_at(i);
|
2007-12-01 00:00:00 +00:00
|
|
|
// Check if method name matches
|
2011-01-27 16:11:27 -08:00
|
|
|
if (super_method->name() == name && super_method->signature() == signature) {
|
2007-12-01 00:00:00 +00:00
|
|
|
|
2009-03-18 17:20:57 -04:00
|
|
|
// get super_klass for method_holder for the found method
|
2012-11-06 15:09:37 -05:00
|
|
|
InstanceKlass* super_klass = super_method->method_holder();
|
2007-12-01 00:00:00 +00:00
|
|
|
|
2013-10-07 12:20:28 -04:00
|
|
|
if (is_default
|
|
|
|
|| ((super_klass->is_override(super_method, target_loader, target_classname, THREAD))
|
|
|
|
|| ((klass->major_version() >= VTABLE_TRANSITIVE_OVERRIDE_VERSION)
|
|
|
|
&& ((super_klass = find_transitive_override(super_klass,
|
|
|
|
target_method, i, target_loader,
|
|
|
|
target_classname, THREAD))
|
|
|
|
!= (InstanceKlass*)NULL))))
|
|
|
|
{
|
2014-05-07 19:21:52 +04:00
|
|
|
// Package private methods always need a new entry to root their own
|
|
|
|
// overriding. They may also override other methods.
|
|
|
|
if (!target_method()->is_package_private()) {
|
|
|
|
allocate_new = false;
|
|
|
|
}
|
2007-12-01 00:00:00 +00:00
|
|
|
|
|
|
|
if (checkconstraints) {
|
|
|
|
// Override vtable entry if passes loader constraint check
|
|
|
|
// if loader constraint checking requested
|
|
|
|
// No need to visit his super, since he and his super
|
|
|
|
// have already made any needed loader constraints.
|
|
|
|
// Since loader constraints are transitive, it is enough
|
|
|
|
// to link to the first super, and we get all the others.
|
|
|
|
Handle super_loader(THREAD, super_klass->class_loader());
|
|
|
|
|
2009-03-18 17:20:57 -04:00
|
|
|
if (target_loader() != super_loader()) {
|
2007-12-01 00:00:00 +00:00
|
|
|
ResourceMark rm(THREAD);
|
2013-03-27 14:10:59 -04:00
|
|
|
Symbol* failed_type_symbol =
|
2009-03-18 17:20:57 -04:00
|
|
|
SystemDictionary::check_signature_loaders(signature, target_loader,
|
2007-12-01 00:00:00 +00:00
|
|
|
super_loader, true,
|
|
|
|
CHECK_(false));
|
2013-03-27 14:10:59 -04:00
|
|
|
if (failed_type_symbol != NULL) {
|
2007-12-01 00:00:00 +00:00
|
|
|
const char* msg = "loader constraint violation: when resolving "
|
|
|
|
"overridden method \"%s\" the class loader (instance"
|
|
|
|
" of %s) of the current class, %s, and its superclass loader "
|
|
|
|
"(instance of %s), have different Class objects for the type "
|
|
|
|
"%s used in the signature";
|
|
|
|
char* sig = target_method()->name_and_sig_as_C_string();
|
2009-03-18 17:20:57 -04:00
|
|
|
const char* loader1 = SystemDictionary::loader_name(target_loader());
|
2013-10-07 12:20:28 -04:00
|
|
|
char* current = target_klass->name()->as_C_string();
|
2007-12-01 00:00:00 +00:00
|
|
|
const char* loader2 = SystemDictionary::loader_name(super_loader());
|
2013-03-27 14:10:59 -04:00
|
|
|
char* failed_type_name = failed_type_symbol->as_C_string();
|
2007-12-01 00:00:00 +00:00
|
|
|
size_t buflen = strlen(msg) + strlen(sig) + strlen(loader1) +
|
|
|
|
strlen(current) + strlen(loader2) + strlen(failed_type_name);
|
|
|
|
char* buf = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, buflen);
|
|
|
|
jio_snprintf(buf, buflen, msg, sig, loader1, current, loader2,
|
|
|
|
failed_type_name);
|
|
|
|
THROW_MSG_(vmSymbols::java_lang_LinkageError(), buf, false);
|
|
|
|
}
|
|
|
|
}
|
2009-03-18 17:20:57 -04:00
|
|
|
}
|
2007-12-01 00:00:00 +00:00
|
|
|
|
2013-10-07 12:20:28 -04:00
|
|
|
put_method_at(target_method(), i);
|
|
|
|
if (!is_default) {
|
|
|
|
target_method()->set_vtable_index(i);
|
|
|
|
} else {
|
|
|
|
if (def_vtable_indices != NULL) {
|
|
|
|
def_vtable_indices->at_put(default_index, i);
|
|
|
|
}
|
|
|
|
assert(super_method->is_default_method() || super_method->is_overpass()
|
|
|
|
|| super_method->is_abstract(), "default override error");
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-12-01 00:00:00 +00:00
|
|
|
#ifndef PRODUCT
|
2009-03-18 17:20:57 -04:00
|
|
|
if (PrintVtables && Verbose) {
|
2013-10-07 12:20:28 -04:00
|
|
|
ResourceMark rm(THREAD);
|
|
|
|
char* sig = target_method()->name_and_sig_as_C_string();
|
2009-03-18 17:20:57 -04:00
|
|
|
tty->print("overriding with %s::%s index %d, original flags: ",
|
2013-10-07 12:20:28 -04:00
|
|
|
target_klass->internal_name(), sig, i);
|
2009-03-18 17:20:57 -04:00
|
|
|
super_method->access_flags().print_on(tty);
|
2013-10-07 12:20:28 -04:00
|
|
|
if (super_method->is_default_method()) {
|
2013-11-13 07:31:26 -08:00
|
|
|
tty->print("default ");
|
2013-10-07 12:20:28 -04:00
|
|
|
}
|
|
|
|
if (super_method->is_overpass()) {
|
|
|
|
tty->print("overpass");
|
|
|
|
}
|
2009-03-18 17:20:57 -04:00
|
|
|
tty->print("overriders flags: ");
|
|
|
|
target_method->access_flags().print_on(tty);
|
2013-10-07 12:20:28 -04:00
|
|
|
if (target_method->is_default_method()) {
|
2013-11-13 07:31:26 -08:00
|
|
|
tty->print("default ");
|
2013-10-07 12:20:28 -04:00
|
|
|
}
|
|
|
|
if (target_method->is_overpass()) {
|
|
|
|
tty->print("overpass");
|
|
|
|
}
|
2009-03-18 17:20:57 -04:00
|
|
|
tty->cr();
|
|
|
|
}
|
2007-12-01 00:00:00 +00:00
|
|
|
#endif /*PRODUCT*/
|
2009-03-18 17:20:57 -04:00
|
|
|
} else {
|
|
|
|
// allocate_new = true; default. We might override one entry,
|
|
|
|
// but not override another. Once we override one, not need new
|
2007-12-01 00:00:00 +00:00
|
|
|
#ifndef PRODUCT
|
2009-03-18 17:20:57 -04:00
|
|
|
if (PrintVtables && Verbose) {
|
2013-10-07 12:20:28 -04:00
|
|
|
ResourceMark rm(THREAD);
|
|
|
|
char* sig = target_method()->name_and_sig_as_C_string();
|
2009-03-18 17:20:57 -04:00
|
|
|
tty->print("NOT overriding with %s::%s index %d, original flags: ",
|
2013-10-07 12:20:28 -04:00
|
|
|
target_klass->internal_name(), sig,i);
|
2009-03-18 17:20:57 -04:00
|
|
|
super_method->access_flags().print_on(tty);
|
2013-10-07 12:20:28 -04:00
|
|
|
if (super_method->is_default_method()) {
|
2013-11-13 07:31:26 -08:00
|
|
|
tty->print("default ");
|
2013-10-07 12:20:28 -04:00
|
|
|
}
|
|
|
|
if (super_method->is_overpass()) {
|
|
|
|
tty->print("overpass");
|
|
|
|
}
|
2009-03-18 17:20:57 -04:00
|
|
|
tty->print("overriders flags: ");
|
|
|
|
target_method->access_flags().print_on(tty);
|
2013-10-07 12:20:28 -04:00
|
|
|
if (target_method->is_default_method()) {
|
2013-11-13 07:31:26 -08:00
|
|
|
tty->print("default ");
|
2013-10-07 12:20:28 -04:00
|
|
|
}
|
|
|
|
if (target_method->is_overpass()) {
|
|
|
|
tty->print("overpass");
|
|
|
|
}
|
2009-03-18 17:20:57 -04:00
|
|
|
tty->cr();
|
2007-12-01 00:00:00 +00:00
|
|
|
}
|
2009-03-18 17:20:57 -04:00
|
|
|
#endif /*PRODUCT*/
|
2007-12-01 00:00:00 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return allocate_new;
|
|
|
|
}
|
|
|
|
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
void klassVtable::put_method_at(Method* m, int index) {
|
2007-12-01 00:00:00 +00:00
|
|
|
#ifndef PRODUCT
|
|
|
|
if (PrintVtables && Verbose) {
|
2009-03-18 17:20:57 -04:00
|
|
|
ResourceMark rm;
|
2013-11-13 07:31:26 -08:00
|
|
|
const char* sig = (m != NULL) ? m->name_and_sig_as_C_string() : "<NULL>";
|
|
|
|
tty->print("adding %s at index %d, flags: ", sig, index);
|
|
|
|
if (m != NULL) {
|
|
|
|
m->access_flags().print_on(tty);
|
|
|
|
if (m->is_default_method()) {
|
|
|
|
tty->print("default ");
|
|
|
|
}
|
|
|
|
if (m->is_overpass()) {
|
|
|
|
tty->print("overpass");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
tty->cr();
|
2007-12-01 00:00:00 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
table()[index].set(m);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Find out if a method "m" with superclass "super", loader "classloader" and
|
|
|
|
// name "classname" needs a new vtable entry. Let P be a class package defined
|
|
|
|
// by "classloader" and "classname".
|
|
|
|
// NOTE: The logic used here is very similar to the one used for computing
|
|
|
|
// the vtables indices for a method. We cannot directly use that function because,
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
// we allocate the InstanceKlass at load time, and that requires that the
|
2009-03-18 17:20:57 -04:00
|
|
|
// superclass has been loaded.
|
|
|
|
// However, the vtable entries are filled in at link time, and therefore
|
|
|
|
// the superclass' vtable may not yet have been filled in.
|
|
|
|
bool klassVtable::needs_new_vtable_entry(methodHandle target_method,
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
Klass* super,
|
2009-03-18 17:20:57 -04:00
|
|
|
Handle classloader,
|
2011-01-27 16:11:27 -08:00
|
|
|
Symbol* classname,
|
2009-03-18 17:20:57 -04:00
|
|
|
AccessFlags class_flags,
|
|
|
|
TRAPS) {
|
2013-09-13 22:38:02 -04:00
|
|
|
if (class_flags.is_interface()) {
|
2014-05-07 19:21:52 +04:00
|
|
|
// Interfaces do not use vtables, except for java.lang.Object methods,
|
|
|
|
// so there is no point to assigning
|
|
|
|
// a vtable index to any of their local methods. If we refrain from doing this,
|
2013-09-13 22:38:02 -04:00
|
|
|
// we can use Method::_vtable_index to hold the itable index
|
|
|
|
return false;
|
|
|
|
}
|
2012-10-11 12:25:42 -04:00
|
|
|
|
2013-09-13 22:38:02 -04:00
|
|
|
if (target_method->is_final_method(class_flags) ||
|
2007-12-01 00:00:00 +00:00
|
|
|
// a final method never needs a new entry; final methods can be statically
|
|
|
|
// resolved and they have to be present in the vtable only if they override
|
|
|
|
// a super's method, in which case they re-use its entry
|
2009-03-18 17:20:57 -04:00
|
|
|
(target_method()->is_static()) ||
|
2007-12-01 00:00:00 +00:00
|
|
|
// static methods don't need to be in vtable
|
2009-03-18 17:20:57 -04:00
|
|
|
(target_method()->name() == vmSymbols::object_initializer_name())
|
2007-12-01 00:00:00 +00:00
|
|
|
// <init> is never called dynamically-bound
|
|
|
|
) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2013-10-07 12:20:28 -04:00
|
|
|
// Concrete interface methods do not need new entries, they override
|
|
|
|
// abstract method entries using default inheritance rules
|
|
|
|
if (target_method()->method_holder() != NULL &&
|
|
|
|
target_method()->method_holder()->is_interface() &&
|
|
|
|
!target_method()->is_abstract() ) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2007-12-01 00:00:00 +00:00
|
|
|
// we need a new entry if there is no superclass
|
|
|
|
if (super == NULL) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2013-10-01 08:10:42 -04:00
|
|
|
// private methods in classes always have a new entry in the vtable
|
2009-03-18 17:20:57 -04:00
|
|
|
// specification interpretation since classic has
|
|
|
|
// private methods not overriding
|
2013-10-07 12:20:28 -04:00
|
|
|
// JDK8 adds private methods in interfaces which require invokespecial
|
2009-03-18 17:20:57 -04:00
|
|
|
if (target_method()->is_private()) {
|
2007-12-01 00:00:00 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2014-05-07 19:21:52 +04:00
|
|
|
// Package private methods always need a new entry to root their own
|
|
|
|
// overriding. This allows transitive overriding to work.
|
|
|
|
if (target_method()->is_package_private()) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2007-12-01 00:00:00 +00:00
|
|
|
// search through the super class hierarchy to see if we need
|
|
|
|
// a new entry
|
2009-03-18 17:20:57 -04:00
|
|
|
ResourceMark rm;
|
2011-01-27 16:11:27 -08:00
|
|
|
Symbol* name = target_method()->name();
|
|
|
|
Symbol* signature = target_method()->signature();
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
Klass* k = super;
|
|
|
|
Method* super_method = NULL;
|
|
|
|
InstanceKlass *holder = NULL;
|
|
|
|
Method* recheck_method = NULL;
|
2007-12-01 00:00:00 +00:00
|
|
|
while (k != NULL) {
|
|
|
|
// lookup through the hierarchy for a method with matching name and sign.
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
super_method = InstanceKlass::cast(k)->lookup_method(name, signature);
|
2009-03-18 17:20:57 -04:00
|
|
|
if (super_method == NULL) {
|
2007-12-01 00:00:00 +00:00
|
|
|
break; // we still have to search for a matching miranda method
|
|
|
|
}
|
|
|
|
// get the class holding the matching method
|
2009-03-18 17:20:57 -04:00
|
|
|
// make sure you use that class for is_override
|
2012-11-06 15:09:37 -05:00
|
|
|
InstanceKlass* superk = super_method->method_holder();
|
2009-03-18 17:20:57 -04:00
|
|
|
// we want only instance method matches
|
|
|
|
// pretend private methods are not in the super vtable
|
|
|
|
// since we do override around them: e.g. a.m pub/b.m private/c.m pub,
|
|
|
|
// ignore private, c.m pub does override a.m pub
|
|
|
|
// For classes that were not javac'd together, we also do transitive overriding around
|
|
|
|
// methods that have less accessibility
|
|
|
|
if ((!super_method->is_static()) &&
|
|
|
|
(!super_method->is_private())) {
|
|
|
|
if (superk->is_override(super_method, classloader, classname, THREAD)) {
|
2007-12-01 00:00:00 +00:00
|
|
|
return false;
|
2009-03-18 17:20:57 -04:00
|
|
|
// else keep looking for transitive overrides
|
2007-12-01 00:00:00 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-03-18 17:20:57 -04:00
|
|
|
// Start with lookup result and continue to search up
|
|
|
|
k = superk->super(); // haven't found an override match yet; continue to look
|
2007-12-01 00:00:00 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// if the target method is public or protected it may have a matching
|
|
|
|
// miranda method in the super, whose entry it should re-use.
|
2009-03-18 17:20:57 -04:00
|
|
|
// Actually, to handle cases that javac would not generate, we need
|
|
|
|
// this check for all access permissions.
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
InstanceKlass *sk = InstanceKlass::cast(super);
|
2009-03-18 17:20:57 -04:00
|
|
|
if (sk->has_miranda_methods()) {
|
2014-04-14 14:27:45 -04:00
|
|
|
if (sk->lookup_method_in_all_interfaces(name, signature, Klass::normal) != NULL) {
|
2009-03-18 17:20:57 -04:00
|
|
|
return false; // found a matching miranda; we do not need a new entry
|
2007-12-01 00:00:00 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return true; // found no match; we need a new entry
|
|
|
|
}
|
|
|
|
|
|
|
|
// Support for miranda methods
|
|
|
|
|
|
|
|
// get the vtable index of a miranda method with matching "name" and "signature"
|
2011-01-27 16:11:27 -08:00
|
|
|
int klassVtable::index_of_miranda(Symbol* name, Symbol* signature) {
|
2007-12-01 00:00:00 +00:00
|
|
|
// search from the bottom, might be faster
|
|
|
|
for (int i = (length() - 1); i >= 0; i--) {
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
Method* m = table()[i].method();
|
2007-12-01 00:00:00 +00:00
|
|
|
if (is_miranda_entry_at(i) &&
|
|
|
|
m->name() == name && m->signature() == signature) {
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
}
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
return Method::invalid_vtable_index;
|
2007-12-01 00:00:00 +00:00
|
|
|
}
|
|
|
|
|
2013-09-13 22:38:02 -04:00
|
|
|
// check if an entry at an index is miranda
|
|
|
|
// requires that method m at entry be declared ("held") by an interface.
|
2007-12-01 00:00:00 +00:00
|
|
|
bool klassVtable::is_miranda_entry_at(int i) {
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
Method* m = method_at(i);
|
|
|
|
Klass* method_holder = m->method_holder();
|
|
|
|
InstanceKlass *mhk = InstanceKlass::cast(method_holder);
|
2007-12-01 00:00:00 +00:00
|
|
|
|
2013-10-01 08:10:42 -04:00
|
|
|
// miranda methods are public abstract instance interface methods in a class's vtable
|
2007-12-01 00:00:00 +00:00
|
|
|
if (mhk->is_interface()) {
|
2012-10-11 12:25:42 -04:00
|
|
|
assert(m->is_public(), "should be public");
|
2007-12-01 00:00:00 +00:00
|
|
|
assert(ik()->implements_interface(method_holder) , "this class should implement the interface");
|
2013-11-13 07:31:26 -08:00
|
|
|
// the search could find a miranda or a default method
|
|
|
|
if (is_miranda(m, ik()->methods(), ik()->default_methods(), ik()->super())) {
|
|
|
|
return true;
|
|
|
|
}
|
2007-12-01 00:00:00 +00:00
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2013-10-07 12:20:28 -04:00
|
|
|
// check if a method is a miranda method, given a class's methods table,
|
|
|
|
// its default_method table and its super
|
2013-12-03 11:13:14 -08:00
|
|
|
// Miranda methods are calculated twice:
|
|
|
|
// first: before vtable size calculation: including abstract and default
|
|
|
|
// This is seen by default method creation
|
|
|
|
// Second: recalculated during vtable initialization: only abstract
|
|
|
|
// This is seen by link resolution and selection.
|
2013-10-07 12:20:28 -04:00
|
|
|
// "miranda" means not static, not defined by this class.
|
|
|
|
// private methods in interfaces do not belong in the miranda list.
|
2007-12-01 00:00:00 +00:00
|
|
|
// the caller must make sure that the method belongs to an interface implemented by the class
|
2013-10-01 08:10:42 -04:00
|
|
|
// Miranda methods only include public interface instance methods
|
2013-10-07 12:20:28 -04:00
|
|
|
// Not private methods, not static methods, not default == concrete abstract
|
2013-11-13 07:31:26 -08:00
|
|
|
// Miranda methods also do not include overpass methods in interfaces
|
2013-10-07 12:20:28 -04:00
|
|
|
bool klassVtable::is_miranda(Method* m, Array<Method*>* class_methods,
|
|
|
|
Array<Method*>* default_methods, Klass* super) {
|
2013-11-13 07:31:26 -08:00
|
|
|
if (m->is_static() || m->is_private() || m->is_overpass()) {
|
2013-05-01 08:07:59 -07:00
|
|
|
return false;
|
|
|
|
}
|
2011-01-27 16:11:27 -08:00
|
|
|
Symbol* name = m->name();
|
|
|
|
Symbol* signature = m->signature();
|
2013-12-03 11:13:14 -08:00
|
|
|
|
|
|
|
if (InstanceKlass::find_instance_method(class_methods, name, signature) == NULL) {
|
2010-12-09 17:53:22 +03:00
|
|
|
// did not find it in the method table of the current class
|
2013-10-07 12:20:28 -04:00
|
|
|
if ((default_methods == NULL) ||
|
|
|
|
InstanceKlass::find_method(default_methods, name, signature) == NULL) {
|
|
|
|
if (super == NULL) {
|
|
|
|
// super doesn't exist
|
|
|
|
return true;
|
|
|
|
}
|
2010-12-09 17:53:22 +03:00
|
|
|
|
2013-10-07 12:20:28 -04:00
|
|
|
Method* mo = InstanceKlass::cast(super)->lookup_method(name, signature);
|
2013-12-03 11:13:14 -08:00
|
|
|
while (mo != NULL && mo->access_flags().is_static()
|
|
|
|
&& mo->method_holder() != NULL
|
|
|
|
&& mo->method_holder()->super() != NULL)
|
|
|
|
{
|
2014-04-14 14:27:45 -04:00
|
|
|
mo = mo->method_holder()->super()->uncached_lookup_method(name, signature, Klass::normal);
|
2013-12-03 11:13:14 -08:00
|
|
|
}
|
2013-10-07 12:20:28 -04:00
|
|
|
if (mo == NULL || mo->access_flags().is_private() ) {
|
|
|
|
// super class hierarchy does not implement it or protection is different
|
|
|
|
return true;
|
|
|
|
}
|
2007-12-01 00:00:00 +00:00
|
|
|
}
|
|
|
|
}
|
2010-12-09 17:53:22 +03:00
|
|
|
|
2007-12-01 00:00:00 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2013-09-13 22:38:02 -04:00
|
|
|
// Scans current_interface_methods for miranda methods that do not
|
2013-10-07 12:20:28 -04:00
|
|
|
// already appear in new_mirandas, or default methods, and are also not defined-and-non-private
|
2013-09-13 22:38:02 -04:00
|
|
|
// in super (superclass). These mirandas are added to all_mirandas if it is
|
|
|
|
// not null; in addition, those that are not duplicates of miranda methods
|
|
|
|
// inherited by super from its interfaces are added to new_mirandas.
|
|
|
|
// Thus, new_mirandas will be the set of mirandas that this class introduces,
|
|
|
|
// all_mirandas will be the set of all mirandas applicable to this class
|
|
|
|
// including all defined in superclasses.
|
2012-10-11 12:25:42 -04:00
|
|
|
void klassVtable::add_new_mirandas_to_lists(
|
|
|
|
GrowableArray<Method*>* new_mirandas, GrowableArray<Method*>* all_mirandas,
|
|
|
|
Array<Method*>* current_interface_methods, Array<Method*>* class_methods,
|
2013-10-07 12:20:28 -04:00
|
|
|
Array<Method*>* default_methods, Klass* super) {
|
|
|
|
|
2007-12-01 00:00:00 +00:00
|
|
|
// iterate thru the current interface's method to see if it a miranda
|
|
|
|
int num_methods = current_interface_methods->length();
|
|
|
|
for (int i = 0; i < num_methods; i++) {
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
Method* im = current_interface_methods->at(i);
|
2007-12-01 00:00:00 +00:00
|
|
|
bool is_duplicate = false;
|
2012-10-11 12:25:42 -04:00
|
|
|
int num_of_current_mirandas = new_mirandas->length();
|
2007-12-01 00:00:00 +00:00
|
|
|
// check for duplicate mirandas in different interfaces we implement
|
|
|
|
for (int j = 0; j < num_of_current_mirandas; j++) {
|
2012-10-11 12:25:42 -04:00
|
|
|
Method* miranda = new_mirandas->at(j);
|
2007-12-01 00:00:00 +00:00
|
|
|
if ((im->name() == miranda->name()) &&
|
|
|
|
(im->signature() == miranda->signature())) {
|
|
|
|
is_duplicate = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!is_duplicate) { // we don't want duplicate miranda entries in the vtable
|
2013-10-07 12:20:28 -04:00
|
|
|
if (is_miranda(im, class_methods, default_methods, super)) { // is it a miranda at all?
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
InstanceKlass *sk = InstanceKlass::cast(super);
|
2007-12-01 00:00:00 +00:00
|
|
|
// check if it is a duplicate of a super's miranda
|
2014-04-14 14:27:45 -04:00
|
|
|
if (sk->lookup_method_in_all_interfaces(im->name(), im->signature(), Klass::normal) == NULL) {
|
2012-10-11 12:25:42 -04:00
|
|
|
new_mirandas->append(im);
|
|
|
|
}
|
|
|
|
if (all_mirandas != NULL) {
|
|
|
|
all_mirandas->append(im);
|
2007-12-01 00:00:00 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-10-11 12:25:42 -04:00
|
|
|
void klassVtable::get_mirandas(GrowableArray<Method*>* new_mirandas,
|
|
|
|
GrowableArray<Method*>* all_mirandas,
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
Klass* super, Array<Method*>* class_methods,
|
2013-10-07 12:20:28 -04:00
|
|
|
Array<Method*>* default_methods,
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
Array<Klass*>* local_interfaces) {
|
2012-10-11 12:25:42 -04:00
|
|
|
assert((new_mirandas->length() == 0) , "current mirandas must be 0");
|
2007-12-01 00:00:00 +00:00
|
|
|
|
|
|
|
// iterate thru the local interfaces looking for a miranda
|
|
|
|
int num_local_ifs = local_interfaces->length();
|
|
|
|
for (int i = 0; i < num_local_ifs; i++) {
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
InstanceKlass *ik = InstanceKlass::cast(local_interfaces->at(i));
|
2012-10-11 12:25:42 -04:00
|
|
|
add_new_mirandas_to_lists(new_mirandas, all_mirandas,
|
2013-10-07 12:20:28 -04:00
|
|
|
ik->methods(), class_methods,
|
|
|
|
default_methods, super);
|
2007-12-01 00:00:00 +00:00
|
|
|
// iterate thru each local's super interfaces
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
Array<Klass*>* super_ifs = ik->transitive_interfaces();
|
2007-12-01 00:00:00 +00:00
|
|
|
int num_super_ifs = super_ifs->length();
|
|
|
|
for (int j = 0; j < num_super_ifs; j++) {
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
InstanceKlass *sik = InstanceKlass::cast(super_ifs->at(j));
|
2012-10-11 12:25:42 -04:00
|
|
|
add_new_mirandas_to_lists(new_mirandas, all_mirandas,
|
2013-10-07 12:20:28 -04:00
|
|
|
sik->methods(), class_methods,
|
|
|
|
default_methods, super);
|
2007-12-01 00:00:00 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-09-13 22:38:02 -04:00
|
|
|
// Discover miranda methods ("miranda" = "interface abstract, no binding"),
|
|
|
|
// and append them into the vtable starting at index initialized,
|
|
|
|
// return the new value of initialized.
|
2013-11-13 07:31:26 -08:00
|
|
|
// Miranda methods use vtable entries, but do not get assigned a vtable_index
|
|
|
|
// The vtable_index is discovered by searching from the end of the vtable
|
2013-09-13 22:38:02 -04:00
|
|
|
int klassVtable::fill_in_mirandas(int initialized) {
|
2012-10-11 12:25:42 -04:00
|
|
|
GrowableArray<Method*> mirandas(20);
|
|
|
|
get_mirandas(&mirandas, NULL, ik()->super(), ik()->methods(),
|
2013-10-07 12:20:28 -04:00
|
|
|
ik()->default_methods(), ik()->local_interfaces());
|
2012-10-11 12:25:42 -04:00
|
|
|
for (int i = 0; i < mirandas.length(); i++) {
|
2013-10-07 12:20:28 -04:00
|
|
|
if (PrintVtables && Verbose) {
|
|
|
|
Method* meth = mirandas.at(i);
|
|
|
|
ResourceMark rm(Thread::current());
|
|
|
|
if (meth != NULL) {
|
|
|
|
char* sig = meth->name_and_sig_as_C_string();
|
|
|
|
tty->print("fill in mirandas with %s index %d, flags: ",
|
|
|
|
sig, initialized);
|
|
|
|
meth->access_flags().print_on(tty);
|
|
|
|
if (meth->is_default_method()) {
|
2013-11-13 07:31:26 -08:00
|
|
|
tty->print("default ");
|
2013-10-07 12:20:28 -04:00
|
|
|
}
|
|
|
|
tty->cr();
|
|
|
|
}
|
|
|
|
}
|
2013-09-13 22:38:02 -04:00
|
|
|
put_method_at(mirandas.at(i), initialized);
|
|
|
|
++initialized;
|
2007-12-01 00:00:00 +00:00
|
|
|
}
|
2013-09-13 22:38:02 -04:00
|
|
|
return initialized;
|
2007-12-01 00:00:00 +00:00
|
|
|
}
|
|
|
|
|
2013-09-13 22:38:02 -04:00
|
|
|
// Copy this class's vtable to the vtable beginning at start.
|
|
|
|
// Used to copy superclass vtable to prefix of subclass's vtable.
|
2007-12-01 00:00:00 +00:00
|
|
|
void klassVtable::copy_vtable_to(vtableEntry* start) {
|
|
|
|
Copy::disjoint_words((HeapWord*)table(), (HeapWord*)start, _length * vtableEntry::size());
|
|
|
|
}
|
|
|
|
|
2013-02-06 14:31:37 -08:00
|
|
|
#if INCLUDE_JVMTI
|
2013-10-07 12:20:28 -04:00
|
|
|
bool klassVtable::adjust_default_method(int vtable_index, Method* old_method, Method* new_method) {
|
|
|
|
// If old_method is default, find this vtable index in default_vtable_indices
|
|
|
|
// and replace that method in the _default_methods list
|
|
|
|
bool updated = false;
|
|
|
|
|
|
|
|
Array<Method*>* default_methods = ik()->default_methods();
|
|
|
|
if (default_methods != NULL) {
|
|
|
|
int len = default_methods->length();
|
|
|
|
for (int idx = 0; idx < len; idx++) {
|
|
|
|
if (vtable_index == ik()->default_vtable_indices()->at(idx)) {
|
|
|
|
if (default_methods->at(idx) == old_method) {
|
|
|
|
default_methods->at_put(idx, new_method);
|
|
|
|
updated = true;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return updated;
|
|
|
|
}
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
void klassVtable::adjust_method_entries(Method** old_methods, Method** new_methods,
|
2007-12-01 00:00:00 +00:00
|
|
|
int methods_length, bool * trace_name_printed) {
|
|
|
|
// search the vtable for uses of either obsolete or EMCP methods
|
|
|
|
for (int j = 0; j < methods_length; j++) {
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
Method* old_method = old_methods[j];
|
|
|
|
Method* new_method = new_methods[j];
|
2007-12-01 00:00:00 +00:00
|
|
|
|
|
|
|
// In the vast majority of cases we could get the vtable index
|
|
|
|
// by using: old_method->vtable_index()
|
|
|
|
// However, there are rare cases, eg. sun.awt.X11.XDecoratedPeer.getX()
|
|
|
|
// in sun.awt.X11.XFramePeer where methods occur more than once in the
|
|
|
|
// vtable, so, alas, we must do an exhaustive search.
|
|
|
|
for (int index = 0; index < length(); index++) {
|
|
|
|
if (unchecked_method_at(index) == old_method) {
|
|
|
|
put_method_at(new_method, index);
|
2013-10-07 12:20:28 -04:00
|
|
|
// For default methods, need to update the _default_methods array
|
|
|
|
// which can only have one method entry for a given signature
|
|
|
|
bool updated_default = false;
|
|
|
|
if (old_method->is_default_method()) {
|
|
|
|
updated_default = adjust_default_method(index, old_method, new_method);
|
|
|
|
}
|
2007-12-01 00:00:00 +00:00
|
|
|
|
|
|
|
if (RC_TRACE_IN_RANGE(0x00100000, 0x00400000)) {
|
|
|
|
if (!(*trace_name_printed)) {
|
|
|
|
// RC_TRACE_MESG macro has an embedded ResourceMark
|
2013-10-07 12:20:28 -04:00
|
|
|
RC_TRACE_MESG(("adjust: klassname=%s for methods from name=%s",
|
|
|
|
klass()->external_name(),
|
2012-11-06 15:09:37 -05:00
|
|
|
old_method->method_holder()->external_name()));
|
2007-12-01 00:00:00 +00:00
|
|
|
*trace_name_printed = true;
|
|
|
|
}
|
|
|
|
// RC_TRACE macro has an embedded ResourceMark
|
2013-10-07 12:20:28 -04:00
|
|
|
RC_TRACE(0x00100000, ("vtable method update: %s(%s), updated default = %s",
|
2007-12-01 00:00:00 +00:00
|
|
|
new_method->name()->as_C_string(),
|
2013-10-07 12:20:28 -04:00
|
|
|
new_method->signature()->as_C_string(),
|
|
|
|
updated_default ? "true" : "false"));
|
2007-12-01 00:00:00 +00:00
|
|
|
}
|
2013-02-06 14:31:37 -08:00
|
|
|
// cannot 'break' here; see for-loop comment above.
|
2007-12-01 00:00:00 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-02-06 14:31:37 -08:00
|
|
|
// a vtable should never contain old or obsolete methods
|
|
|
|
bool klassVtable::check_no_old_or_obsolete_entries() {
|
|
|
|
for (int i = 0; i < length(); i++) {
|
|
|
|
Method* m = unchecked_method_at(i);
|
|
|
|
if (m != NULL &&
|
|
|
|
(NOT_PRODUCT(!m->is_valid() ||) m->is_old() || m->is_obsolete())) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void klassVtable::dump_vtable() {
|
|
|
|
tty->print_cr("vtable dump --");
|
|
|
|
for (int i = 0; i < length(); i++) {
|
|
|
|
Method* m = unchecked_method_at(i);
|
|
|
|
if (m != NULL) {
|
|
|
|
tty->print(" (%5d) ", i);
|
|
|
|
m->access_flags().print_on(tty);
|
2013-10-07 12:20:28 -04:00
|
|
|
if (m->is_default_method()) {
|
2013-11-13 07:31:26 -08:00
|
|
|
tty->print("default ");
|
2013-10-07 12:20:28 -04:00
|
|
|
}
|
|
|
|
if (m->is_overpass()) {
|
|
|
|
tty->print("overpass");
|
|
|
|
}
|
2013-02-06 14:31:37 -08:00
|
|
|
tty->print(" -- ");
|
|
|
|
m->print_name(tty);
|
|
|
|
tty->cr();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif // INCLUDE_JVMTI
|
|
|
|
|
2011-04-15 09:36:28 -04:00
|
|
|
// CDS/RedefineClasses support - clear vtables so they can be reinitialized
|
|
|
|
void klassVtable::clear_vtable() {
|
|
|
|
for (int i = 0; i < _length; i++) table()[i].clear();
|
|
|
|
}
|
|
|
|
|
|
|
|
bool klassVtable::is_initialized() {
|
|
|
|
return _length == 0 || table()[0].method() != NULL;
|
|
|
|
}
|
|
|
|
|
2007-12-01 00:00:00 +00:00
|
|
|
//-----------------------------------------------------------------------------------------
|
|
|
|
// Itable code
|
|
|
|
|
|
|
|
// Initialize a itableMethodEntry
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
void itableMethodEntry::initialize(Method* m) {
|
2007-12-01 00:00:00 +00:00
|
|
|
if (m == NULL) return;
|
|
|
|
|
|
|
|
_method = m;
|
|
|
|
}
|
|
|
|
|
|
|
|
klassItable::klassItable(instanceKlassHandle klass) {
|
|
|
|
_klass = klass;
|
|
|
|
|
|
|
|
if (klass->itable_length() > 0) {
|
|
|
|
itableOffsetEntry* offset_entry = (itableOffsetEntry*)klass->start_of_itable();
|
|
|
|
if (offset_entry != NULL && offset_entry->interface_klass() != NULL) { // Check that itable is initialized
|
|
|
|
// First offset entry points to the first method_entry
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
intptr_t* method_entry = (intptr_t *)(((address)klass()) + offset_entry->offset());
|
2007-12-01 00:00:00 +00:00
|
|
|
intptr_t* end = klass->end_of_itable();
|
|
|
|
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
_table_offset = (intptr_t*)offset_entry - (intptr_t*)klass();
|
2007-12-01 00:00:00 +00:00
|
|
|
_size_offset_table = (method_entry - ((intptr_t*)offset_entry)) / itableOffsetEntry::size();
|
|
|
|
_size_method_table = (end - method_entry) / itableMethodEntry::size();
|
|
|
|
assert(_table_offset >= 0 && _size_offset_table >= 0 && _size_method_table >= 0, "wrong computation");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-12-05 09:00:00 -08:00
|
|
|
// The length of the itable was either zero, or it has not yet been initialized.
|
2007-12-01 00:00:00 +00:00
|
|
|
_table_offset = 0;
|
|
|
|
_size_offset_table = 0;
|
|
|
|
_size_method_table = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int initialize_count = 0;
|
|
|
|
|
|
|
|
// Initialization
|
|
|
|
void klassItable::initialize_itable(bool checkconstraints, TRAPS) {
|
2013-09-13 22:38:02 -04:00
|
|
|
if (_klass->is_interface()) {
|
2013-10-07 12:20:28 -04:00
|
|
|
// This needs to go after vtable indices are assigned but
|
|
|
|
// before implementors need to know the number of itable indices.
|
|
|
|
assign_itable_indices_for_interface(_klass());
|
2013-09-13 22:38:02 -04:00
|
|
|
}
|
|
|
|
|
2007-12-05 09:00:00 -08:00
|
|
|
// Cannot be setup doing bootstrapping, interfaces don't have
|
|
|
|
// itables, and klass with only ones entry have empty itables
|
|
|
|
if (Universe::is_bootstrapping() ||
|
|
|
|
_klass->is_interface() ||
|
|
|
|
_klass->itable_length() == itableOffsetEntry::size()) return;
|
|
|
|
|
|
|
|
// There's alway an extra itable entry so we can null-terminate it.
|
|
|
|
guarantee(size_offset_table() >= 1, "too small");
|
|
|
|
int num_interfaces = size_offset_table() - 1;
|
2007-12-01 00:00:00 +00:00
|
|
|
if (num_interfaces > 0) {
|
2007-12-05 09:00:00 -08:00
|
|
|
if (TraceItables) tty->print_cr("%3d: Initializing itables for %s", ++initialize_count,
|
|
|
|
_klass->name()->as_C_string());
|
2007-12-01 00:00:00 +00:00
|
|
|
|
|
|
|
|
2009-03-18 17:20:57 -04:00
|
|
|
// Iterate through all interfaces
|
2007-12-01 00:00:00 +00:00
|
|
|
int i;
|
|
|
|
for(i = 0; i < num_interfaces; i++) {
|
|
|
|
itableOffsetEntry* ioe = offset_entry(i);
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
HandleMark hm(THREAD);
|
2007-12-01 00:00:00 +00:00
|
|
|
KlassHandle interf_h (THREAD, ioe->interface_klass());
|
|
|
|
assert(interf_h() != NULL && ioe->offset() != 0, "bad offset entry in itable");
|
|
|
|
initialize_itable_for_interface(ioe->offset(), interf_h, checkconstraints, CHECK);
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
2007-12-05 09:00:00 -08:00
|
|
|
// Check that the last entry is empty
|
|
|
|
itableOffsetEntry* ioe = offset_entry(size_offset_table() - 1);
|
|
|
|
guarantee(ioe->interface_klass() == NULL && ioe->offset() == 0, "terminator entry missing");
|
2007-12-01 00:00:00 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-09-13 22:38:02 -04:00
|
|
|
inline bool interface_method_needs_itable_index(Method* m) {
|
|
|
|
if (m->is_static()) return false; // e.g., Stream.empty
|
|
|
|
if (m->is_initializer()) return false; // <init> or <clinit>
|
|
|
|
// If an interface redeclares a method from java.lang.Object,
|
|
|
|
// it should already have a vtable index, don't touch it.
|
|
|
|
// e.g., CharSequence.toString (from initialize_vtable)
|
|
|
|
// if (m->has_vtable_index()) return false; // NO!
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2013-10-07 12:20:28 -04:00
|
|
|
int klassItable::assign_itable_indices_for_interface(Klass* klass) {
|
2013-09-13 22:38:02 -04:00
|
|
|
// an interface does not have an itable, but its methods need to be numbered
|
|
|
|
if (TraceItables) tty->print_cr("%3d: Initializing itable for interface %s", ++initialize_count,
|
|
|
|
klass->name()->as_C_string());
|
|
|
|
Array<Method*>* methods = InstanceKlass::cast(klass)->methods();
|
|
|
|
int nof_methods = methods->length();
|
|
|
|
int ime_num = 0;
|
|
|
|
for (int i = 0; i < nof_methods; i++) {
|
|
|
|
Method* m = methods->at(i);
|
|
|
|
if (interface_method_needs_itable_index(m)) {
|
|
|
|
assert(!m->is_final_method(), "no final interface methods");
|
|
|
|
// If m is already assigned a vtable index, do not disturb it.
|
2013-11-13 07:31:26 -08:00
|
|
|
if (TraceItables && Verbose) {
|
|
|
|
ResourceMark rm;
|
|
|
|
const char* sig = (m != NULL) ? m->name_and_sig_as_C_string() : "<NULL>";
|
|
|
|
if (m->has_vtable_index()) {
|
|
|
|
tty->print("itable index %d for method: %s, flags: ", m->vtable_index(), sig);
|
|
|
|
} else {
|
|
|
|
tty->print("itable index %d for method: %s, flags: ", ime_num, sig);
|
|
|
|
}
|
|
|
|
if (m != NULL) {
|
|
|
|
m->access_flags().print_on(tty);
|
|
|
|
if (m->is_default_method()) {
|
|
|
|
tty->print("default ");
|
|
|
|
}
|
|
|
|
if (m->is_overpass()) {
|
|
|
|
tty->print("overpass");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
tty->cr();
|
|
|
|
}
|
2013-09-13 22:38:02 -04:00
|
|
|
if (!m->has_vtable_index()) {
|
|
|
|
assert(m->vtable_index() == Method::pending_itable_index, "set by initialize_vtable");
|
|
|
|
m->set_itable_index(ime_num);
|
|
|
|
// Progress to next itable entry
|
|
|
|
ime_num++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
assert(ime_num == method_count_for_interface(klass), "proper sizing");
|
|
|
|
return ime_num;
|
|
|
|
}
|
|
|
|
|
|
|
|
int klassItable::method_count_for_interface(Klass* interf) {
|
|
|
|
assert(interf->oop_is_instance(), "must be");
|
|
|
|
assert(interf->is_interface(), "must be");
|
|
|
|
Array<Method*>* methods = InstanceKlass::cast(interf)->methods();
|
|
|
|
int nof_methods = methods->length();
|
|
|
|
while (nof_methods > 0) {
|
|
|
|
Method* m = methods->at(nof_methods-1);
|
|
|
|
if (m->has_itable_index()) {
|
|
|
|
int length = m->itable_index() + 1;
|
|
|
|
#ifdef ASSERT
|
|
|
|
while (nof_methods = 0) {
|
|
|
|
m = methods->at(--nof_methods);
|
|
|
|
assert(!m->has_itable_index() || m->itable_index() < length, "");
|
|
|
|
}
|
|
|
|
#endif //ASSERT
|
|
|
|
return length; // return the rightmost itable index, plus one
|
|
|
|
}
|
|
|
|
nof_methods -= 1;
|
|
|
|
}
|
2013-10-07 12:20:28 -04:00
|
|
|
// no methods have itable indices
|
2013-09-13 22:38:02 -04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-12-01 00:00:00 +00:00
|
|
|
void klassItable::initialize_itable_for_interface(int method_table_offset, KlassHandle interf_h, bool checkconstraints, TRAPS) {
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
Array<Method*>* methods = InstanceKlass::cast(interf_h())->methods();
|
|
|
|
int nof_methods = methods->length();
|
2007-12-01 00:00:00 +00:00
|
|
|
HandleMark hm;
|
2009-10-11 16:19:25 -07:00
|
|
|
assert(nof_methods > 0, "at least one method must exist for interface to be in vtable");
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
Handle interface_loader (THREAD, InstanceKlass::cast(interf_h())->class_loader());
|
2007-12-01 00:00:00 +00:00
|
|
|
|
2013-09-13 22:38:02 -04:00
|
|
|
int ime_count = method_count_for_interface(interf_h());
|
|
|
|
for (int i = 0; i < nof_methods; i++) {
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
Method* m = methods->at(i);
|
2013-09-13 22:38:02 -04:00
|
|
|
methodHandle target;
|
|
|
|
if (m->has_itable_index()) {
|
2013-12-16 08:24:33 -05:00
|
|
|
// This search must match the runtime resolution, i.e. selection search for invokeinterface
|
|
|
|
// to correctly enforce loader constraints for interface method inheritance
|
2013-09-13 22:38:02 -04:00
|
|
|
LinkResolver::lookup_instance_method_in_klasses(target, _klass, m->name(), m->signature(), CHECK);
|
2007-12-01 00:00:00 +00:00
|
|
|
}
|
|
|
|
if (target == NULL || !target->is_public() || target->is_abstract()) {
|
2013-11-26 18:16:04 -05:00
|
|
|
// Entry does not resolve. Leave it empty for AbstractMethodError.
|
|
|
|
if (!(target == NULL) && !target->is_public()) {
|
|
|
|
// Stuff an IllegalAccessError throwing method in there instead.
|
|
|
|
itableOffsetEntry::method_entry(_klass(), method_table_offset)[m->itable_index()].
|
|
|
|
initialize(Universe::throw_illegal_access_error());
|
|
|
|
}
|
2007-12-01 00:00:00 +00:00
|
|
|
} else {
|
|
|
|
// Entry did resolve, check loader constraints before initializing
|
|
|
|
// if checkconstraints requested
|
|
|
|
if (checkconstraints) {
|
2012-11-06 15:09:37 -05:00
|
|
|
Handle method_holder_loader (THREAD, target->method_holder()->class_loader());
|
2007-12-01 00:00:00 +00:00
|
|
|
if (method_holder_loader() != interface_loader()) {
|
|
|
|
ResourceMark rm(THREAD);
|
2013-03-27 14:10:59 -04:00
|
|
|
Symbol* failed_type_symbol =
|
2013-09-13 22:38:02 -04:00
|
|
|
SystemDictionary::check_signature_loaders(m->signature(),
|
2007-12-01 00:00:00 +00:00
|
|
|
method_holder_loader,
|
|
|
|
interface_loader,
|
|
|
|
true, CHECK);
|
2013-03-27 14:10:59 -04:00
|
|
|
if (failed_type_symbol != NULL) {
|
2007-12-01 00:00:00 +00:00
|
|
|
const char* msg = "loader constraint violation in interface "
|
|
|
|
"itable initialization: when resolving method \"%s\" the class"
|
|
|
|
" loader (instance of %s) of the current class, %s, "
|
|
|
|
"and the class loader (instance of %s) for interface "
|
|
|
|
"%s have different Class objects for the type %s "
|
|
|
|
"used in the signature";
|
2013-09-13 22:38:02 -04:00
|
|
|
char* sig = target()->name_and_sig_as_C_string();
|
2007-12-01 00:00:00 +00:00
|
|
|
const char* loader1 = SystemDictionary::loader_name(method_holder_loader());
|
2013-09-13 22:38:02 -04:00
|
|
|
char* current = _klass->name()->as_C_string();
|
2007-12-01 00:00:00 +00:00
|
|
|
const char* loader2 = SystemDictionary::loader_name(interface_loader());
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
char* iface = InstanceKlass::cast(interf_h())->name()->as_C_string();
|
2013-03-27 14:10:59 -04:00
|
|
|
char* failed_type_name = failed_type_symbol->as_C_string();
|
2007-12-01 00:00:00 +00:00
|
|
|
size_t buflen = strlen(msg) + strlen(sig) + strlen(loader1) +
|
|
|
|
strlen(current) + strlen(loader2) + strlen(iface) +
|
|
|
|
strlen(failed_type_name);
|
|
|
|
char* buf = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, buflen);
|
|
|
|
jio_snprintf(buf, buflen, msg, sig, loader1, current, loader2,
|
|
|
|
iface, failed_type_name);
|
|
|
|
THROW_MSG(vmSymbols::java_lang_LinkageError(), buf);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// ime may have moved during GC so recalculate address
|
2013-09-13 22:38:02 -04:00
|
|
|
int ime_num = m->itable_index();
|
|
|
|
assert(ime_num < ime_count, "oob");
|
|
|
|
itableOffsetEntry::method_entry(_klass(), method_table_offset)[ime_num].initialize(target());
|
2013-10-07 12:20:28 -04:00
|
|
|
if (TraceItables && Verbose) {
|
|
|
|
ResourceMark rm(THREAD);
|
|
|
|
if (target() != NULL) {
|
|
|
|
char* sig = target()->name_and_sig_as_C_string();
|
|
|
|
tty->print("interface: %s, ime_num: %d, target: %s, method_holder: %s ",
|
|
|
|
interf_h()->internal_name(), ime_num, sig,
|
|
|
|
target()->method_holder()->internal_name());
|
|
|
|
tty->print("target_method flags: ");
|
|
|
|
target()->access_flags().print_on(tty);
|
|
|
|
if (target()->is_default_method()) {
|
2013-11-13 07:31:26 -08:00
|
|
|
tty->print("default ");
|
2013-10-07 12:20:28 -04:00
|
|
|
}
|
|
|
|
tty->cr();
|
|
|
|
}
|
|
|
|
}
|
2007-12-01 00:00:00 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
// Update entry for specific Method*
|
|
|
|
void klassItable::initialize_with_method(Method* m) {
|
2007-12-01 00:00:00 +00:00
|
|
|
itableMethodEntry* ime = method_entry(0);
|
|
|
|
for(int i = 0; i < _size_method_table; i++) {
|
|
|
|
if (ime->method() == m) {
|
|
|
|
ime->initialize(m);
|
|
|
|
}
|
|
|
|
ime++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-02-06 14:31:37 -08:00
|
|
|
#if INCLUDE_JVMTI
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
void klassItable::adjust_method_entries(Method** old_methods, Method** new_methods,
|
2007-12-01 00:00:00 +00:00
|
|
|
int methods_length, bool * trace_name_printed) {
|
|
|
|
// search the itable for uses of either obsolete or EMCP methods
|
|
|
|
for (int j = 0; j < methods_length; j++) {
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
Method* old_method = old_methods[j];
|
|
|
|
Method* new_method = new_methods[j];
|
2007-12-01 00:00:00 +00:00
|
|
|
itableMethodEntry* ime = method_entry(0);
|
|
|
|
|
2009-03-02 14:03:03 -07:00
|
|
|
// The itable can describe more than one interface and the same
|
|
|
|
// method signature can be specified by more than one interface.
|
|
|
|
// This means we have to do an exhaustive search to find all the
|
|
|
|
// old_method references.
|
2007-12-01 00:00:00 +00:00
|
|
|
for (int i = 0; i < _size_method_table; i++) {
|
|
|
|
if (ime->method() == old_method) {
|
|
|
|
ime->initialize(new_method);
|
|
|
|
|
|
|
|
if (RC_TRACE_IN_RANGE(0x00100000, 0x00400000)) {
|
|
|
|
if (!(*trace_name_printed)) {
|
|
|
|
// RC_TRACE_MESG macro has an embedded ResourceMark
|
|
|
|
RC_TRACE_MESG(("adjust: name=%s",
|
2012-11-06 15:09:37 -05:00
|
|
|
old_method->method_holder()->external_name()));
|
2007-12-01 00:00:00 +00:00
|
|
|
*trace_name_printed = true;
|
|
|
|
}
|
|
|
|
// RC_TRACE macro has an embedded ResourceMark
|
|
|
|
RC_TRACE(0x00200000, ("itable method update: %s(%s)",
|
|
|
|
new_method->name()->as_C_string(),
|
|
|
|
new_method->signature()->as_C_string()));
|
|
|
|
}
|
2013-02-06 14:31:37 -08:00
|
|
|
// cannot 'break' here; see for-loop comment above.
|
2007-12-01 00:00:00 +00:00
|
|
|
}
|
|
|
|
ime++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-02-06 14:31:37 -08:00
|
|
|
// an itable should never contain old or obsolete methods
|
|
|
|
bool klassItable::check_no_old_or_obsolete_entries() {
|
|
|
|
itableMethodEntry* ime = method_entry(0);
|
|
|
|
for (int i = 0; i < _size_method_table; i++) {
|
|
|
|
Method* m = ime->method();
|
|
|
|
if (m != NULL &&
|
|
|
|
(NOT_PRODUCT(!m->is_valid() ||) m->is_old() || m->is_obsolete())) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
ime++;
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void klassItable::dump_itable() {
|
|
|
|
itableMethodEntry* ime = method_entry(0);
|
|
|
|
tty->print_cr("itable dump --");
|
|
|
|
for (int i = 0; i < _size_method_table; i++) {
|
|
|
|
Method* m = ime->method();
|
|
|
|
if (m != NULL) {
|
|
|
|
tty->print(" (%5d) ", i);
|
|
|
|
m->access_flags().print_on(tty);
|
2013-10-07 12:20:28 -04:00
|
|
|
if (m->is_default_method()) {
|
2013-11-13 07:31:26 -08:00
|
|
|
tty->print("default ");
|
2013-10-07 12:20:28 -04:00
|
|
|
}
|
2013-02-06 14:31:37 -08:00
|
|
|
tty->print(" -- ");
|
|
|
|
m->print_name(tty);
|
|
|
|
tty->cr();
|
|
|
|
}
|
|
|
|
ime++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif // INCLUDE_JVMTI
|
|
|
|
|
2007-12-01 00:00:00 +00:00
|
|
|
|
|
|
|
// Setup
|
|
|
|
class InterfaceVisiterClosure : public StackObj {
|
|
|
|
public:
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
virtual void doit(Klass* intf, int method_count) = 0;
|
2007-12-01 00:00:00 +00:00
|
|
|
};
|
|
|
|
|
2013-09-13 22:38:02 -04:00
|
|
|
// Visit all interfaces with at least one itable method
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
void visit_all_interfaces(Array<Klass*>* transitive_intf, InterfaceVisiterClosure *blk) {
|
2007-12-01 00:00:00 +00:00
|
|
|
// Handle array argument
|
|
|
|
for(int i = 0; i < transitive_intf->length(); i++) {
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
Klass* intf = transitive_intf->at(i);
|
2012-11-12 16:15:05 -05:00
|
|
|
assert(intf->is_interface(), "sanity check");
|
2007-12-01 00:00:00 +00:00
|
|
|
|
2013-09-13 22:38:02 -04:00
|
|
|
// Find no. of itable methods
|
|
|
|
int method_count = 0;
|
|
|
|
// method_count = klassItable::method_count_for_interface(intf);
|
|
|
|
Array<Method*>* methods = InstanceKlass::cast(intf)->methods();
|
|
|
|
if (methods->length() > 0) {
|
|
|
|
for (int i = methods->length(); --i >= 0; ) {
|
|
|
|
if (interface_method_needs_itable_index(methods->at(i))) {
|
|
|
|
method_count++;
|
|
|
|
}
|
2007-12-01 00:00:00 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Only count interfaces with at least one method
|
|
|
|
if (method_count > 0) {
|
|
|
|
blk->doit(intf, method_count);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
class CountInterfacesClosure : public InterfaceVisiterClosure {
|
|
|
|
private:
|
|
|
|
int _nof_methods;
|
|
|
|
int _nof_interfaces;
|
|
|
|
public:
|
|
|
|
CountInterfacesClosure() { _nof_methods = 0; _nof_interfaces = 0; }
|
|
|
|
|
|
|
|
int nof_methods() const { return _nof_methods; }
|
|
|
|
int nof_interfaces() const { return _nof_interfaces; }
|
|
|
|
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
void doit(Klass* intf, int method_count) { _nof_methods += method_count; _nof_interfaces++; }
|
2007-12-01 00:00:00 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
class SetupItableClosure : public InterfaceVisiterClosure {
|
|
|
|
private:
|
|
|
|
itableOffsetEntry* _offset_entry;
|
|
|
|
itableMethodEntry* _method_entry;
|
|
|
|
address _klass_begin;
|
|
|
|
public:
|
|
|
|
SetupItableClosure(address klass_begin, itableOffsetEntry* offset_entry, itableMethodEntry* method_entry) {
|
|
|
|
_klass_begin = klass_begin;
|
|
|
|
_offset_entry = offset_entry;
|
|
|
|
_method_entry = method_entry;
|
|
|
|
}
|
|
|
|
|
|
|
|
itableMethodEntry* method_entry() const { return _method_entry; }
|
|
|
|
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
void doit(Klass* intf, int method_count) {
|
2007-12-01 00:00:00 +00:00
|
|
|
int offset = ((address)_method_entry) - _klass_begin;
|
|
|
|
_offset_entry->initialize(intf, offset);
|
|
|
|
_offset_entry++;
|
|
|
|
_method_entry += method_count;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
int klassItable::compute_itable_size(Array<Klass*>* transitive_interfaces) {
|
2007-12-01 00:00:00 +00:00
|
|
|
// Count no of interfaces and total number of interface methods
|
|
|
|
CountInterfacesClosure cic;
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
visit_all_interfaces(transitive_interfaces, &cic);
|
2007-12-01 00:00:00 +00:00
|
|
|
|
2007-12-05 09:00:00 -08:00
|
|
|
// There's alway an extra itable entry so we can null-terminate it.
|
|
|
|
int itable_size = calc_itable_size(cic.nof_interfaces() + 1, cic.nof_methods());
|
2007-12-01 00:00:00 +00:00
|
|
|
|
|
|
|
// Statistics
|
|
|
|
update_stats(itable_size * HeapWordSize);
|
|
|
|
|
|
|
|
return itable_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Fill out offset table and interface klasses into the itable space
|
|
|
|
void klassItable::setup_itable_offset_table(instanceKlassHandle klass) {
|
|
|
|
if (klass->itable_length() == 0) return;
|
|
|
|
assert(!klass->is_interface(), "Should have zero length itable");
|
|
|
|
|
|
|
|
// Count no of interfaces and total number of interface methods
|
|
|
|
CountInterfacesClosure cic;
|
|
|
|
visit_all_interfaces(klass->transitive_interfaces(), &cic);
|
|
|
|
int nof_methods = cic.nof_methods();
|
|
|
|
int nof_interfaces = cic.nof_interfaces();
|
|
|
|
|
2007-12-05 09:00:00 -08:00
|
|
|
// Add one extra entry so we can null-terminate the table
|
|
|
|
nof_interfaces++;
|
2007-12-01 00:00:00 +00:00
|
|
|
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
assert(compute_itable_size(klass->transitive_interfaces()) ==
|
2007-12-01 00:00:00 +00:00
|
|
|
calc_itable_size(nof_interfaces, nof_methods),
|
|
|
|
"mismatch calculation of itable size");
|
|
|
|
|
|
|
|
// Fill-out offset table
|
|
|
|
itableOffsetEntry* ioe = (itableOffsetEntry*)klass->start_of_itable();
|
|
|
|
itableMethodEntry* ime = (itableMethodEntry*)(ioe + nof_interfaces);
|
|
|
|
intptr_t* end = klass->end_of_itable();
|
2011-03-18 16:00:34 -07:00
|
|
|
assert((oop*)(ime + nof_methods) <= (oop*)klass->start_of_nonstatic_oop_maps(), "wrong offset calculation (1)");
|
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
Compressed oops in instances, arrays, and headers. Code contributors are coleenp, phh, never, swamyv
Reviewed-by: jmasa, kamg, acorn, tbell, kvn, rasbold
2008-04-13 17:43:42 -04:00
|
|
|
assert((oop*)(end) == (oop*)(ime + nof_methods), "wrong offset calculation (2)");
|
2007-12-01 00:00:00 +00:00
|
|
|
|
|
|
|
// Visit all interfaces and initialize itable offset table
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
SetupItableClosure sic((address)klass(), ioe, ime);
|
2007-12-01 00:00:00 +00:00
|
|
|
visit_all_interfaces(klass->transitive_interfaces(), &sic);
|
|
|
|
|
|
|
|
#ifdef ASSERT
|
|
|
|
ime = sic.method_entry();
|
|
|
|
oop* v = (oop*) klass->end_of_itable();
|
|
|
|
assert( (oop*)(ime) == v, "wrong offset calculation (2)");
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-09-13 22:38:02 -04:00
|
|
|
// inverse to itable_index
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
Method* klassItable::method_for_itable_index(Klass* intf, int itable_index) {
|
|
|
|
assert(InstanceKlass::cast(intf)->is_interface(), "sanity check");
|
2013-09-13 22:38:02 -04:00
|
|
|
assert(intf->verify_itable_index(itable_index), "");
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
Array<Method*>* methods = InstanceKlass::cast(intf)->methods();
|
2009-03-20 23:19:36 -07:00
|
|
|
|
2013-09-13 22:38:02 -04:00
|
|
|
if (itable_index < 0 || itable_index >= method_count_for_interface(intf))
|
2013-10-07 12:20:28 -04:00
|
|
|
return NULL; // help caller defend against bad indices
|
2009-03-20 23:19:36 -07:00
|
|
|
|
2013-09-13 22:38:02 -04:00
|
|
|
int index = itable_index;
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
Method* m = methods->at(index);
|
2013-09-13 22:38:02 -04:00
|
|
|
int index2 = -1;
|
|
|
|
while (!m->has_itable_index() ||
|
|
|
|
(index2 = m->itable_index()) != itable_index) {
|
|
|
|
assert(index2 < itable_index, "monotonic");
|
|
|
|
if (++index == methods->length())
|
|
|
|
return NULL;
|
|
|
|
m = methods->at(index);
|
|
|
|
}
|
|
|
|
assert(m->itable_index() == itable_index, "correct inverse");
|
2009-03-20 23:19:36 -07:00
|
|
|
|
|
|
|
return m;
|
|
|
|
}
|
|
|
|
|
2007-12-01 00:00:00 +00:00
|
|
|
void klassVtable::verify(outputStream* st, bool forced) {
|
|
|
|
// make sure table is initialized
|
|
|
|
if (!Universe::is_fully_initialized()) return;
|
|
|
|
#ifndef PRODUCT
|
|
|
|
// avoid redundant verifies
|
|
|
|
if (!forced && _verify_count == Universe::verify_count()) return;
|
|
|
|
_verify_count = Universe::verify_count();
|
|
|
|
#endif
|
|
|
|
oop* end_of_obj = (oop*)_klass() + _klass()->size();
|
|
|
|
oop* end_of_vtable = (oop *)&table()[_length];
|
|
|
|
if (end_of_vtable > end_of_obj) {
|
2010-04-22 13:23:15 -07:00
|
|
|
fatal(err_msg("klass %s: klass object too short (vtable extends beyond "
|
|
|
|
"end)", _klass->internal_name()));
|
2007-12-01 00:00:00 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
for (int i = 0; i < _length; i++) table()[i].verify(this, st);
|
|
|
|
// verify consistency with superKlass vtable
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
Klass* super = _klass->super();
|
2007-12-01 00:00:00 +00:00
|
|
|
if (super != NULL) {
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
InstanceKlass* sk = InstanceKlass::cast(super);
|
2007-12-01 00:00:00 +00:00
|
|
|
klassVtable* vt = sk->vtable();
|
|
|
|
for (int i = 0; i < vt->length(); i++) {
|
|
|
|
verify_against(st, vt, i);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void klassVtable::verify_against(outputStream* st, klassVtable* vt, int index) {
|
|
|
|
vtableEntry* vte = &vt->table()[index];
|
|
|
|
if (vte->method()->name() != table()[index].method()->name() ||
|
|
|
|
vte->method()->signature() != table()[index].method()->signature()) {
|
|
|
|
fatal("mismatched name/signature of vtable entries");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifndef PRODUCT
|
|
|
|
void klassVtable::print() {
|
|
|
|
ResourceMark rm;
|
|
|
|
tty->print("klassVtable for klass %s (length %d):\n", _klass->internal_name(), length());
|
|
|
|
for (int i = 0; i < length(); i++) {
|
|
|
|
table()[i].print();
|
|
|
|
tty->cr();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
void vtableEntry::verify(klassVtable* vt, outputStream* st) {
|
|
|
|
NOT_PRODUCT(FlagSetting fs(IgnoreLockingAssertions, true));
|
|
|
|
assert(method() != NULL, "must have set method");
|
|
|
|
method()->verify();
|
|
|
|
// we sub_type, because it could be a miranda method
|
|
|
|
if (!vt->klass()->is_subtype_of(method()->method_holder())) {
|
|
|
|
#ifndef PRODUCT
|
|
|
|
print();
|
|
|
|
#endif
|
2010-04-22 13:23:15 -07:00
|
|
|
fatal(err_msg("vtableEntry " PTR_FORMAT ": method is from subclass", this));
|
2007-12-01 00:00:00 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifndef PRODUCT
|
|
|
|
|
|
|
|
void vtableEntry::print() {
|
|
|
|
ResourceMark rm;
|
|
|
|
tty->print("vtableEntry %s: ", method()->name()->as_C_string());
|
|
|
|
if (Verbose) {
|
|
|
|
tty->print("m %#lx ", (address)method());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
class VtableStats : AllStatic {
|
|
|
|
public:
|
|
|
|
static int no_klasses; // # classes with vtables
|
|
|
|
static int no_array_klasses; // # array classes
|
|
|
|
static int no_instance_klasses; // # instanceKlasses
|
|
|
|
static int sum_of_vtable_len; // total # of vtable entries
|
|
|
|
static int sum_of_array_vtable_len; // total # of vtable entries in array klasses only
|
|
|
|
static int fixed; // total fixed overhead in bytes
|
|
|
|
static int filler; // overhead caused by filler bytes
|
|
|
|
static int entries; // total bytes consumed by vtable entries
|
|
|
|
static int array_entries; // total bytes consumed by array vtable entries
|
|
|
|
|
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
2012-09-01 13:25:18 -04:00
|
|
|
static void do_class(Klass* k) {
|
|
|
|
Klass* kl = k;
|
2007-12-01 00:00:00 +00:00
|
|
|
klassVtable* vt = kl->vtable();
|
|
|
|
if (vt == NULL) return;
|
|
|
|
no_klasses++;
|
|
|
|
if (kl->oop_is_instance()) {
|
|
|
|
no_instance_klasses++;
|
|
|
|
kl->array_klasses_do(do_class);
|
|
|
|
}
|
|
|
|
if (kl->oop_is_array()) {
|
|
|
|
no_array_klasses++;
|
|
|
|
sum_of_array_vtable_len += vt->length();
|
|
|
|
}
|
|
|
|
sum_of_vtable_len += vt->length();
|
|
|
|
}
|
|
|
|
|
|
|
|
static void compute() {
|
|
|
|
SystemDictionary::classes_do(do_class);
|
|
|
|
fixed = no_klasses * oopSize; // vtable length
|
|
|
|
// filler size is a conservative approximation
|
2012-09-29 06:40:00 -04:00
|
|
|
filler = oopSize * (no_klasses - no_instance_klasses) * (sizeof(InstanceKlass) - sizeof(ArrayKlass) - 1);
|
2007-12-01 00:00:00 +00:00
|
|
|
entries = sizeof(vtableEntry) * sum_of_vtable_len;
|
|
|
|
array_entries = sizeof(vtableEntry) * sum_of_array_vtable_len;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
int VtableStats::no_klasses = 0;
|
|
|
|
int VtableStats::no_array_klasses = 0;
|
|
|
|
int VtableStats::no_instance_klasses = 0;
|
|
|
|
int VtableStats::sum_of_vtable_len = 0;
|
|
|
|
int VtableStats::sum_of_array_vtable_len = 0;
|
|
|
|
int VtableStats::fixed = 0;
|
|
|
|
int VtableStats::filler = 0;
|
|
|
|
int VtableStats::entries = 0;
|
|
|
|
int VtableStats::array_entries = 0;
|
|
|
|
|
|
|
|
void klassVtable::print_statistics() {
|
|
|
|
ResourceMark rm;
|
|
|
|
HandleMark hm;
|
|
|
|
VtableStats::compute();
|
|
|
|
tty->print_cr("vtable statistics:");
|
|
|
|
tty->print_cr("%6d classes (%d instance, %d array)", VtableStats::no_klasses, VtableStats::no_instance_klasses, VtableStats::no_array_klasses);
|
|
|
|
int total = VtableStats::fixed + VtableStats::filler + VtableStats::entries;
|
|
|
|
tty->print_cr("%6d bytes fixed overhead (refs + vtable object header)", VtableStats::fixed);
|
|
|
|
tty->print_cr("%6d bytes filler overhead", VtableStats::filler);
|
|
|
|
tty->print_cr("%6d bytes for vtable entries (%d for arrays)", VtableStats::entries, VtableStats::array_entries);
|
|
|
|
tty->print_cr("%6d bytes total", total);
|
|
|
|
}
|
|
|
|
|
|
|
|
int klassItable::_total_classes; // Total no. of classes with itables
|
|
|
|
long klassItable::_total_size; // Total no. of bytes used for itables
|
|
|
|
|
|
|
|
void klassItable::print_statistics() {
|
|
|
|
tty->print_cr("itable statistics:");
|
|
|
|
tty->print_cr("%6d classes with itables", _total_classes);
|
|
|
|
tty->print_cr("%6d K uses for itables (average by class: %d bytes)", _total_size / K, _total_size / _total_classes);
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif // PRODUCT
|