src/hotspot/share/oops/klassVtable.cpp
author coleenp
Wed, 13 Nov 2019 08:23:23 -0500
changeset 59056 15936b142f86
parent 58575 6941d77417f4
permissions -rw-r--r--
8233913: Remove implicit conversion from Method* to methodHandle Summary: Fix call sites to use existing THREAD local or pass down THREAD local for shallower callsites. Make linkResolver methods return Method* for caller to handleize if needed. Reviewed-by: iklam, thartmann, hseigel
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
     1
/*
53904
9c3fe09f69bc 8078725: method adjustments can be done just once for all classes involved into redefinition
coleenp
parents: 52276
diff changeset
     2
 * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
489c9b5090e2 Initial load
duke
parents:
diff changeset
     4
 *
489c9b5090e2 Initial load
duke
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
489c9b5090e2 Initial load
duke
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
489c9b5090e2 Initial load
duke
parents:
diff changeset
     7
 * published by the Free Software Foundation.
489c9b5090e2 Initial load
duke
parents:
diff changeset
     8
 *
489c9b5090e2 Initial load
duke
parents:
diff changeset
     9
 * This code is distributed in the hope that it will be useful, but WITHOUT
489c9b5090e2 Initial load
duke
parents:
diff changeset
    10
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
489c9b5090e2 Initial load
duke
parents:
diff changeset
    11
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
489c9b5090e2 Initial load
duke
parents:
diff changeset
    12
 * version 2 for more details (a copy is included in the LICENSE file that
489c9b5090e2 Initial load
duke
parents:
diff changeset
    13
 * accompanied this code).
489c9b5090e2 Initial load
duke
parents:
diff changeset
    14
 *
489c9b5090e2 Initial load
duke
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License version
489c9b5090e2 Initial load
duke
parents:
diff changeset
    16
 * 2 along with this work; if not, write to the Free Software Foundation,
489c9b5090e2 Initial load
duke
parents:
diff changeset
    17
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
489c9b5090e2 Initial load
duke
parents:
diff changeset
    18
 *
5547
f4b087cbb361 6941466: Oracle rebranding changes for Hotspot repositories
trims
parents: 5403
diff changeset
    19
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
f4b087cbb361 6941466: Oracle rebranding changes for Hotspot repositories
trims
parents: 5403
diff changeset
    20
 * or visit www.oracle.com if you need additional information or have any
f4b087cbb361 6941466: Oracle rebranding changes for Hotspot repositories
trims
parents: 5403
diff changeset
    21
 * questions.
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    22
 *
489c9b5090e2 Initial load
duke
parents:
diff changeset
    23
 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
    24
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    25
#include "precompiled.hpp"
47765
b7c7428eaab9 8189610: Reconcile jvm.h and all jvm_md.h between java.base and hotspot
coleenp
parents: 47554
diff changeset
    26
#include "jvm.h"
51959
db0c3952de52 8209645: Split ClassLoaderData and ClassLoaderDataGraph into separate files
coleenp
parents: 51608
diff changeset
    27
#include "classfile/classLoaderDataGraph.hpp"
50036
e0dbf14885b8 8199852: Print more information about class loaders in LinkageErrors.
goetz
parents: 49902
diff changeset
    28
#include "classfile/javaClasses.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    29
#include "classfile/systemDictionary.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    30
#include "classfile/vmSymbols.hpp"
49593
4dd58ecc9912 8200105: Remove cyclic dependency between oop.inline.hpp and collectedHeap.inline.hpp
stefank
parents: 49359
diff changeset
    31
#include "interpreter/linkResolver.hpp"
35463
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
    32
#include "logging/log.hpp"
46701
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
    33
#include "logging/logStream.hpp"
39714
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
    34
#include "memory/metaspaceShared.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    35
#include "memory/resourceArea.hpp"
49359
59f6547e151f 8199264: Remove universe.inline.hpp to simplify include dependencies
stefank
parents: 48819
diff changeset
    36
#include "memory/universe.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    37
#include "oops/instanceKlass.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    38
#include "oops/klassVtable.hpp"
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 9172
diff changeset
    39
#include "oops/method.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    40
#include "oops/objArrayOop.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    41
#include "oops/oop.inline.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    42
#include "runtime/arguments.hpp"
49902
3661f31c6df4 8202150: [REDO] Split globals.hpp to factor out the Flag class
gziemski
parents: 49860
diff changeset
    43
#include "runtime/flags/flagSetting.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    44
#include "runtime/handles.inline.hpp"
49594
898ef81cbc0e 8200106: Move NoSafepointVerifier out from gcLocker.hpp
stefank
parents: 49593
diff changeset
    45
#include "runtime/safepointVerifiers.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    46
#include "utilities/copy.hpp"
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    47
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 9172
diff changeset
    48
inline InstanceKlass* klassVtable::ik() const {
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 41669
diff changeset
    49
  return InstanceKlass::cast(_klass);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    50
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
    51
39714
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
    52
bool klassVtable::is_preinitialized_vtable() {
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
    53
  return _klass->is_shared() && !MetaspaceShared::remapped_readwrite();
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
    54
}
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
    55
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    56
489c9b5090e2 Initial load
duke
parents:
diff changeset
    57
// this function computes the vtable size (including the size needed for miranda
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
    58
// methods) and the number of miranda methods in this class.
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    59
// Note on Miranda methods: Let's say there is a class C that implements
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
    60
// interface I, and none of C's superclasses implements I.
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
    61
// Let's say there is an abstract method m in I that neither C
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
    62
// nor any of its super classes implement (i.e there is no method of any access,
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
    63
// with the same name and signature as m), then m is a Miranda method which is
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    64
// entered as a public abstract method in C's vtable.  From then on it should
489c9b5090e2 Initial load
duke
parents:
diff changeset
    65
// treated as any other public method in C for method over-ride purposes.
14385
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 13952
diff changeset
    66
void klassVtable::compute_vtable_size_and_num_mirandas(
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 13952
diff changeset
    67
    int* vtable_length_ret, int* num_new_mirandas,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 33611
diff changeset
    68
    GrowableArray<Method*>* all_mirandas, const Klass* super,
40633
c33ad2ff51de 8163808: Fix asserts and logging for old classfile vtable construction
acorn
parents: 39714
diff changeset
    69
    Array<Method*>* methods, AccessFlags class_flags, u2 major_version,
51329
9c68699bebe5 8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents: 51097
diff changeset
    70
    Handle classloader, Symbol* classname, Array<InstanceKlass*>* local_interfaces,
14385
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 13952
diff changeset
    71
    TRAPS) {
35492
c8c0273e6b91 8146690: Make all classes in GC follow the naming convention.
david
parents: 35463
diff changeset
    72
  NoSafepointVerifier nsv;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    73
489c9b5090e2 Initial load
duke
parents:
diff changeset
    74
  // set up default result values
14385
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 13952
diff changeset
    75
  int vtable_length = 0;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    76
489c9b5090e2 Initial load
duke
parents:
diff changeset
    77
  // start off with super's vtable length
33602
16053580a684 8139163: InstanceKlass::cast passes through NULL
coleenp
parents: 33148
diff changeset
    78
  vtable_length = super == NULL ? 0 : super->vtable_length();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    79
489c9b5090e2 Initial load
duke
parents:
diff changeset
    80
  // go thru each method in the methods table to see if it needs a new entry
489c9b5090e2 Initial load
duke
parents:
diff changeset
    81
  int len = methods->length();
489c9b5090e2 Initial load
duke
parents:
diff changeset
    82
  for (int i = 0; i < len; i++) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 9172
diff changeset
    83
    assert(methods->at(i)->is_method(), "must be a Method*");
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 9172
diff changeset
    84
    methodHandle mh(THREAD, methods->at(i));
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    85
40633
c33ad2ff51de 8163808: Fix asserts and logging for old classfile vtable construction
acorn
parents: 39714
diff changeset
    86
    if (needs_new_vtable_entry(mh, super, classloader, classname, class_flags, major_version, THREAD)) {
52276
ad9077f044be 8024368: private methods are allocated vtable slots
sspitsyn
parents: 51959
diff changeset
    87
      assert(!methods->at(i)->is_private(), "private methods should not need a vtable entry");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    88
      vtable_length += vtableEntry::size(); // we need a new entry
489c9b5090e2 Initial load
duke
parents:
diff changeset
    89
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
    90
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
    91
14385
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 13952
diff changeset
    92
  GrowableArray<Method*> new_mirandas(20);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    93
  // compute the number of mirandas methods that must be added to the end
48463
474cec233fb2 8154587: Resolution fails for default method named 'clone'
hseigel
parents: 47765
diff changeset
    94
  get_mirandas(&new_mirandas, all_mirandas, super, methods, NULL, local_interfaces,
474cec233fb2 8154587: Resolution fails for default method named 'clone'
hseigel
parents: 47765
diff changeset
    95
               class_flags.is_interface());
14385
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 13952
diff changeset
    96
  *num_new_mirandas = new_mirandas.length();
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 13952
diff changeset
    97
21556
e75cd34a59e0 8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents: 20391
diff changeset
    98
  // Interfaces do not need interface methods in their vtables
e75cd34a59e0 8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents: 20391
diff changeset
    99
  // This includes miranda methods and during later processing, default methods
e75cd34a59e0 8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents: 20391
diff changeset
   100
  if (!class_flags.is_interface()) {
48463
474cec233fb2 8154587: Resolution fails for default method named 'clone'
hseigel
parents: 47765
diff changeset
   101
     vtable_length += *num_new_mirandas * vtableEntry::size();
21556
e75cd34a59e0 8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents: 20391
diff changeset
   102
  }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   103
489c9b5090e2 Initial load
duke
parents:
diff changeset
   104
  if (Universe::is_bootstrapping() && vtable_length == 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   105
    // array classes don't have their superclass set correctly during
489c9b5090e2 Initial load
duke
parents:
diff changeset
   106
    // bootstrapping
489c9b5090e2 Initial load
duke
parents:
diff changeset
   107
    vtable_length = Universe::base_vtable_size();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   108
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   109
28373
26fdc99d32f8 6583051: crash when adding non-static methods to java.lang.Object class
coleenp
parents: 25504
diff changeset
   110
  if (super == NULL && vtable_length != Universe::base_vtable_size()) {
26fdc99d32f8 6583051: crash when adding non-static methods to java.lang.Object class
coleenp
parents: 25504
diff changeset
   111
    if (Universe::is_bootstrapping()) {
26fdc99d32f8 6583051: crash when adding non-static methods to java.lang.Object class
coleenp
parents: 25504
diff changeset
   112
      // Someone is attempting to override java.lang.Object incorrectly on the
26fdc99d32f8 6583051: crash when adding non-static methods to java.lang.Object class
coleenp
parents: 25504
diff changeset
   113
      // bootclasspath.  The JVM cannot recover from this error including throwing
26fdc99d32f8 6583051: crash when adding non-static methods to java.lang.Object class
coleenp
parents: 25504
diff changeset
   114
      // an exception
26fdc99d32f8 6583051: crash when adding non-static methods to java.lang.Object class
coleenp
parents: 25504
diff changeset
   115
      vm_exit_during_initialization("Incompatible definition of java.lang.Object");
26fdc99d32f8 6583051: crash when adding non-static methods to java.lang.Object class
coleenp
parents: 25504
diff changeset
   116
    } else {
26fdc99d32f8 6583051: crash when adding non-static methods to java.lang.Object class
coleenp
parents: 25504
diff changeset
   117
      // Someone is attempting to redefine java.lang.Object incorrectly.  The
26fdc99d32f8 6583051: crash when adding non-static methods to java.lang.Object class
coleenp
parents: 25504
diff changeset
   118
      // only way this should happen is from
26fdc99d32f8 6583051: crash when adding non-static methods to java.lang.Object class
coleenp
parents: 25504
diff changeset
   119
      // SystemDictionary::resolve_from_stream(), which will detect this later
26fdc99d32f8 6583051: crash when adding non-static methods to java.lang.Object class
coleenp
parents: 25504
diff changeset
   120
      // and throw a security exception.  So don't assert here to let
26fdc99d32f8 6583051: crash when adding non-static methods to java.lang.Object class
coleenp
parents: 25504
diff changeset
   121
      // the exception occur.
26fdc99d32f8 6583051: crash when adding non-static methods to java.lang.Object class
coleenp
parents: 25504
diff changeset
   122
      vtable_length = Universe::base_vtable_size();
26fdc99d32f8 6583051: crash when adding non-static methods to java.lang.Object class
coleenp
parents: 25504
diff changeset
   123
    }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   124
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   125
  assert(vtable_length % vtableEntry::size() == 0, "bad vtable length");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   126
  assert(vtable_length >= Universe::base_vtable_size(), "vtable too small");
14385
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 13952
diff changeset
   127
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 13952
diff changeset
   128
  *vtable_length_ret = vtable_length;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   129
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   130
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   131
// Copy super class's vtable to the first part (prefix) of this class's vtable,
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   132
// and return the number of entries copied.  Expects that 'super' is the Java
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   133
// super class (arrays can have "array" super classes that must be skipped).
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 41669
diff changeset
   134
int klassVtable::initialize_from_super(Klass* super) {
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 41669
diff changeset
   135
  if (super == NULL) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   136
    return 0;
39714
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   137
  } else if (is_preinitialized_vtable()) {
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   138
    // A shared class' vtable is preinitialized at dump time. No need to copy
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   139
    // methods from super class for shared class, as that was already done
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   140
    // during archiving time. However, if Jvmti has redefined a class,
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   141
    // copy super class's vtable in case the super class has changed.
46408
70aab0c2ea8b 8178350: klassVtable and klassItable should be ValueObj
iklam
parents: 46329
diff changeset
   142
    return super->vtable().length();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   143
  } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   144
    // copy methods from superKlass
46408
70aab0c2ea8b 8178350: klassVtable and klassItable should be ValueObj
iklam
parents: 46329
diff changeset
   145
    klassVtable superVtable = super->vtable();
70aab0c2ea8b 8178350: klassVtable and klassItable should be ValueObj
iklam
parents: 46329
diff changeset
   146
    assert(superVtable.length() <= _length, "vtable too short");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   147
#ifdef ASSERT
46408
70aab0c2ea8b 8178350: klassVtable and klassItable should be ValueObj
iklam
parents: 46329
diff changeset
   148
    superVtable.verify(tty, true);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   149
#endif
46408
70aab0c2ea8b 8178350: klassVtable and klassItable should be ValueObj
iklam
parents: 46329
diff changeset
   150
    superVtable.copy_vtable_to(table());
35901
f5028c67e7cb 8147918: Rename develop_log_is_enabled() to log_develop_is_enabled()
pliden
parents: 35898
diff changeset
   151
    if (log_develop_is_enabled(Trace, vtables)) {
2264
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   152
      ResourceMark rm;
35463
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
   153
      log_develop_trace(vtables)("copy vtable from %s to %s size %d",
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
   154
                                 super->internal_name(), klass()->internal_name(),
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
   155
                                 _length);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   156
    }
46408
70aab0c2ea8b 8178350: klassVtable and klassItable should be ValueObj
iklam
parents: 46329
diff changeset
   157
    return superVtable.length();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   158
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   159
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   160
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   161
//
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   162
// Revised lookup semantics   introduced 1.3 (Kestrel beta)
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   163
void klassVtable::initialize_vtable(bool checkconstraints, TRAPS) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   164
489c9b5090e2 Initial load
duke
parents:
diff changeset
   165
  // Note:  Arrays can have intermediate array supers.  Use java_super to skip them.
51329
9c68699bebe5 8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents: 51097
diff changeset
   166
  InstanceKlass* super = _klass->java_super();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   167
39714
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   168
  bool is_shared = _klass->is_shared();
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   169
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 41669
diff changeset
   170
  if (!_klass->is_array_klass()) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   171
    ResourceMark rm(THREAD);
35463
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
   172
    log_develop_debug(vtables)("Initializing: %s", _klass->name()->as_C_string());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   173
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   174
489c9b5090e2 Initial load
duke
parents:
diff changeset
   175
#ifdef ASSERT
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 41669
diff changeset
   176
  oop* end_of_obj = (oop*)_klass + _klass->size();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   177
  oop* end_of_vtable = (oop*)&table()[_length];
489c9b5090e2 Initial load
duke
parents:
diff changeset
   178
  assert(end_of_vtable <= end_of_obj, "vtable extends beyond end");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   179
#endif
489c9b5090e2 Initial load
duke
parents:
diff changeset
   180
489c9b5090e2 Initial load
duke
parents:
diff changeset
   181
  if (Universe::is_bootstrapping()) {
39714
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   182
    assert(!is_shared, "sanity");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   183
    // just clear everything
489c9b5090e2 Initial load
duke
parents:
diff changeset
   184
    for (int i = 0; i < _length; i++) table()[i].clear();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   185
    return;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   186
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   187
489c9b5090e2 Initial load
duke
parents:
diff changeset
   188
  int super_vtable_len = initialize_from_super(super);
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 41669
diff changeset
   189
  if (_klass->is_array_klass()) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   190
    assert(super_vtable_len == _length, "arrays shouldn't introduce new methods");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   191
  } else {
33611
9abd65805e19 8139203: Consistent naming for klass type predicates
coleenp
parents: 33602
diff changeset
   192
    assert(_klass->is_instance_klass(), "must be InstanceKlass");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   193
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 9172
diff changeset
   194
    Array<Method*>* methods = ik()->methods();
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 9172
diff changeset
   195
    int len = methods->length();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   196
    int initialized = super_vtable_len;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   197
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   198
    // Check each of this class's methods against super;
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   199
    // if override, replace in copy of super vtable, otherwise append to end
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   200
    for (int i = 0; i < len; i++) {
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   201
      // update_inherited_vtable can stop for gc - ensure using handles
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   202
      HandleMark hm(THREAD);
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 9172
diff changeset
   203
      assert(methods->at(i)->is_method(), "must be a Method*");
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 9172
diff changeset
   204
      methodHandle mh(THREAD, methods->at(i));
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   205
20391
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   206
      bool needs_new_entry = update_inherited_vtable(ik(), mh, super_vtable_len, -1, checkconstraints, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   207
489c9b5090e2 Initial load
duke
parents:
diff changeset
   208
      if (needs_new_entry) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   209
        put_method_at(mh(), initialized);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   210
        mh()->set_vtable_index(initialized); // set primary vtable index
489c9b5090e2 Initial load
duke
parents:
diff changeset
   211
        initialized++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   212
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   213
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   214
20391
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   215
    // update vtable with default_methods
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   216
    Array<Method*>* default_methods = ik()->default_methods();
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   217
    if (default_methods != NULL) {
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   218
      len = default_methods->length();
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   219
      if (len > 0) {
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   220
        Array<int>* def_vtable_indices = NULL;
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   221
        if ((def_vtable_indices = ik()->default_vtable_indices()) == NULL) {
39714
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   222
          assert(!is_shared, "shared class def_vtable_indices does not exist");
20391
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   223
          def_vtable_indices = ik()->create_new_default_vtable_indices(len, CHECK);
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   224
        } else {
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   225
          assert(def_vtable_indices->length() == len, "reinit vtable len?");
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   226
        }
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   227
        for (int i = 0; i < len; i++) {
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   228
          HandleMark hm(THREAD);
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   229
          assert(default_methods->at(i)->is_method(), "must be a Method*");
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   230
          methodHandle mh(THREAD, default_methods->at(i));
41669
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40633
diff changeset
   231
          assert(!mh->is_private(), "private interface method in the default method list");
20391
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   232
          bool needs_new_entry = update_inherited_vtable(ik(), mh, super_vtable_len, i, checkconstraints, CHECK);
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   233
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   234
          // needs new entry
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   235
          if (needs_new_entry) {
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   236
            put_method_at(mh(), initialized);
39714
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   237
            if (is_preinitialized_vtable()) {
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   238
              // At runtime initialize_vtable is rerun for a shared class
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   239
              // (loaded by the non-boot loader) as part of link_class_impl().
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   240
              // The dumptime vtable index should be the same as the runtime index.
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   241
              assert(def_vtable_indices->at(i) == initialized,
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   242
                     "dump time vtable index is different from runtime index");
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   243
            } else {
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   244
              def_vtable_indices->at_put(i, initialized); //set vtable index
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   245
            }
20391
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   246
            initialized++;
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   247
          }
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   248
        }
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   249
      }
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   250
    }
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   251
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   252
    // add miranda methods; it will also return the updated initialized
21556
e75cd34a59e0 8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents: 20391
diff changeset
   253
    // Interfaces do not need interface methods in their vtables
e75cd34a59e0 8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents: 20391
diff changeset
   254
    // This includes miranda methods and during later processing, default methods
e75cd34a59e0 8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents: 20391
diff changeset
   255
    if (!ik()->is_interface()) {
51096
695dff91a997 8178712: ResourceMark may be missing inside initialize_[vi]table
lfoltan
parents: 50735
diff changeset
   256
      initialized = fill_in_mirandas(initialized, THREAD);
21556
e75cd34a59e0 8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents: 20391
diff changeset
   257
    }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   258
2264
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   259
    // In class hierarchies where the accessibility is not increasing (i.e., going from private ->
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   260
    // package_private -> public/protected), the vtable might actually be smaller than our initial
40633
c33ad2ff51de 8163808: Fix asserts and logging for old classfile vtable construction
acorn
parents: 39714
diff changeset
   261
    // calculation, for classfile versions for which we do not do transitive override
c33ad2ff51de 8163808: Fix asserts and logging for old classfile vtable construction
acorn
parents: 39714
diff changeset
   262
    // calculations.
c33ad2ff51de 8163808: Fix asserts and logging for old classfile vtable construction
acorn
parents: 39714
diff changeset
   263
    if (ik()->major_version() >= VTABLE_TRANSITIVE_OVERRIDE_VERSION) {
c33ad2ff51de 8163808: Fix asserts and logging for old classfile vtable construction
acorn
parents: 39714
diff changeset
   264
      assert(initialized == _length, "vtable initialization failed");
c33ad2ff51de 8163808: Fix asserts and logging for old classfile vtable construction
acorn
parents: 39714
diff changeset
   265
    } else {
c33ad2ff51de 8163808: Fix asserts and logging for old classfile vtable construction
acorn
parents: 39714
diff changeset
   266
      assert(initialized <= _length, "vtable initialization failed");
c33ad2ff51de 8163808: Fix asserts and logging for old classfile vtable construction
acorn
parents: 39714
diff changeset
   267
      for(;initialized < _length; initialized++) {
c33ad2ff51de 8163808: Fix asserts and logging for old classfile vtable construction
acorn
parents: 39714
diff changeset
   268
        table()[initialized].clear();
c33ad2ff51de 8163808: Fix asserts and logging for old classfile vtable construction
acorn
parents: 39714
diff changeset
   269
      }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   270
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   271
    NOT_PRODUCT(verify(tty, true));
489c9b5090e2 Initial load
duke
parents:
diff changeset
   272
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   273
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   274
2264
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   275
// Called for cases where a method does not override its superclass' vtable entry
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   276
// For bytecodes not produced by javac together it is possible that a method does not override
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   277
// the superclass's method, but might indirectly override a super-super class's vtable entry
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   278
// If none found, return a null superk, else return the superk of the method this does override
25504
69de8357bc53 8032536: JVM resolves wrong method in some unusual cases
hseigel
parents: 24424
diff changeset
   279
// For public and protected methods: if they override a superclass, they will
69de8357bc53 8032536: JVM resolves wrong method in some unusual cases
hseigel
parents: 24424
diff changeset
   280
// also be overridden themselves appropriately.
52276
ad9077f044be 8024368: private methods are allocated vtable slots
sspitsyn
parents: 51959
diff changeset
   281
// Private methods do not override, and are not overridden and are not in the vtable.
25504
69de8357bc53 8032536: JVM resolves wrong method in some unusual cases
hseigel
parents: 24424
diff changeset
   282
// Package Private methods are trickier:
69de8357bc53 8032536: JVM resolves wrong method in some unusual cases
hseigel
parents: 24424
diff changeset
   283
// e.g. P1.A, pub m
69de8357bc53 8032536: JVM resolves wrong method in some unusual cases
hseigel
parents: 24424
diff changeset
   284
// P2.B extends A, package private m
69de8357bc53 8032536: JVM resolves wrong method in some unusual cases
hseigel
parents: 24424
diff changeset
   285
// P1.C extends B, public m
69de8357bc53 8032536: JVM resolves wrong method in some unusual cases
hseigel
parents: 24424
diff changeset
   286
// P1.C.m needs to override P1.A.m and can not override P2.B.m
69de8357bc53 8032536: JVM resolves wrong method in some unusual cases
hseigel
parents: 24424
diff changeset
   287
// Therefore: all package private methods need their own vtable entries for
69de8357bc53 8032536: JVM resolves wrong method in some unusual cases
hseigel
parents: 24424
diff changeset
   288
// them to be the root of an inheritance overriding decision
69de8357bc53 8032536: JVM resolves wrong method in some unusual cases
hseigel
parents: 24424
diff changeset
   289
// Package private methods may also override other vtable entries
46727
6e4a84748e2c 8183039: Re-examine methodHandle methods uninlined by 8144256
coleenp
parents: 46701
diff changeset
   290
InstanceKlass* klassVtable::find_transitive_override(InstanceKlass* initialsuper, const methodHandle& target_method,
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7443
diff changeset
   291
                            int vtable_index, Handle target_loader, Symbol* target_classname, Thread * THREAD) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 9172
diff changeset
   292
  InstanceKlass* superk = initialsuper;
2264
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   293
  while (superk != NULL && superk->super() != NULL) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 9172
diff changeset
   294
    InstanceKlass* supersuperklass = InstanceKlass::cast(superk->super());
46408
70aab0c2ea8b 8178350: klassVtable and klassItable should be ValueObj
iklam
parents: 46329
diff changeset
   295
    klassVtable ssVtable = supersuperklass->vtable();
70aab0c2ea8b 8178350: klassVtable and klassItable should be ValueObj
iklam
parents: 46329
diff changeset
   296
    if (vtable_index < ssVtable.length()) {
70aab0c2ea8b 8178350: klassVtable and klassItable should be ValueObj
iklam
parents: 46329
diff changeset
   297
      Method* super_method = ssVtable.method_at(vtable_index);
2264
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   298
#ifndef PRODUCT
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7443
diff changeset
   299
      Symbol* name= target_method()->name();
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7443
diff changeset
   300
      Symbol* signature = target_method()->signature();
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7443
diff changeset
   301
      assert(super_method->name() == name && super_method->signature() == signature, "vtable entry name/sig mismatch");
2264
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   302
#endif
59056
15936b142f86 8233913: Remove implicit conversion from Method* to methodHandle
coleenp
parents: 58575
diff changeset
   303
      if (supersuperklass->is_override(methodHandle(THREAD, super_method), target_loader, target_classname, THREAD)) {
35901
f5028c67e7cb 8147918: Rename develop_log_is_enabled() to log_develop_is_enabled()
pliden
parents: 35898
diff changeset
   304
        if (log_develop_is_enabled(Trace, vtables)) {
2264
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   305
          ResourceMark rm(THREAD);
46701
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
   306
          LogTarget(Trace, vtables) lt;
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
   307
          LogStream ls(lt);
20391
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   308
          char* sig = target_method()->name_and_sig_as_C_string();
46701
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
   309
          ls.print("transitive overriding superclass %s with %s index %d, original flags: ",
35463
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
   310
                       supersuperklass->internal_name(),
40633
c33ad2ff51de 8163808: Fix asserts and logging for old classfile vtable construction
acorn
parents: 39714
diff changeset
   311
                       sig, vtable_index);
46701
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
   312
          super_method->print_linkage_flags(&ls);
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
   313
          ls.print("overriders flags: ");
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
   314
          target_method->print_linkage_flags(&ls);
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
   315
          ls.cr();
2264
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   316
        }
35463
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
   317
2264
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   318
        break; // return found superk
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   319
      }
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   320
    } else  {
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   321
      // super class has no vtable entry here, stop transitive search
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 9172
diff changeset
   322
      superk = (InstanceKlass*)NULL;
2264
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   323
      break;
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   324
    }
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   325
    // if no override found yet, continue to search up
33602
16053580a684 8139163: InstanceKlass::cast passes through NULL
coleenp
parents: 33148
diff changeset
   326
    superk = superk->super() == NULL ? NULL : InstanceKlass::cast(superk->super());
2264
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   327
  }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   328
2264
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   329
  return superk;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   330
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   331
46727
6e4a84748e2c 8183039: Re-examine methodHandle methods uninlined by 8144256
coleenp
parents: 46701
diff changeset
   332
static void log_vtables(int i, bool overrides, const methodHandle& target_method,
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 41669
diff changeset
   333
                        Klass* target_klass, Method* super_method,
35463
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
   334
                        Thread* thread) {
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
   335
#ifndef PRODUCT
35901
f5028c67e7cb 8147918: Rename develop_log_is_enabled() to log_develop_is_enabled()
pliden
parents: 35898
diff changeset
   336
  if (log_develop_is_enabled(Trace, vtables)) {
35463
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
   337
    ResourceMark rm(thread);
46701
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
   338
    LogTarget(Trace, vtables) lt;
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
   339
    LogStream ls(lt);
35463
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
   340
    char* sig = target_method()->name_and_sig_as_C_string();
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
   341
    if (overrides) {
46701
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
   342
      ls.print("overriding with %s index %d, original flags: ",
40633
c33ad2ff51de 8163808: Fix asserts and logging for old classfile vtable construction
acorn
parents: 39714
diff changeset
   343
                   sig, i);
35463
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
   344
    } else {
46701
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
   345
      ls.print("NOT overriding with %s index %d, original flags: ",
40633
c33ad2ff51de 8163808: Fix asserts and logging for old classfile vtable construction
acorn
parents: 39714
diff changeset
   346
                   sig, i);
35463
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
   347
    }
46701
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
   348
    super_method->print_linkage_flags(&ls);
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
   349
    ls.print("overriders flags: ");
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
   350
    target_method->print_linkage_flags(&ls);
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
   351
    ls.cr();
35463
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
   352
  }
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
   353
#endif
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
   354
}
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
   355
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   356
// Update child's copy of super vtable for overrides
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   357
// OR return true if a new vtable entry is required.
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 9172
diff changeset
   358
// Only called for InstanceKlass's, i.e. not for arrays
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   359
// If that changed, could not use _klass as handle for klass
46727
6e4a84748e2c 8183039: Re-examine methodHandle methods uninlined by 8144256
coleenp
parents: 46701
diff changeset
   360
bool klassVtable::update_inherited_vtable(InstanceKlass* klass, const methodHandle& target_method,
20391
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   361
                                          int super_vtable_len, int default_index,
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   362
                                          bool checkconstraints, TRAPS) {
51096
695dff91a997 8178712: ResourceMark may be missing inside initialize_[vi]table
lfoltan
parents: 50735
diff changeset
   363
  ResourceMark rm(THREAD);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   364
  bool allocate_new = true;
33611
9abd65805e19 8139203: Consistent naming for klass type predicates
coleenp
parents: 33602
diff changeset
   365
  assert(klass->is_instance_klass(), "must be InstanceKlass");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   366
20391
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   367
  Array<int>* def_vtable_indices = NULL;
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   368
  bool is_default = false;
41669
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40633
diff changeset
   369
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40633
diff changeset
   370
  // default methods are non-private concrete methods in superinterfaces which are added
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40633
diff changeset
   371
  // to the vtable with their real method_holder.
20391
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   372
  // Since vtable and itable indices share the same storage, don't touch
41669
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40633
diff changeset
   373
  // the default method's real vtable/itable index.
20391
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   374
  // default_vtable_indices stores the vtable value relative to this inheritor
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   375
  if (default_index >= 0 ) {
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   376
    is_default = true;
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   377
    def_vtable_indices = klass->default_vtable_indices();
41669
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40633
diff changeset
   378
    assert(!target_method()->is_private(), "private interface method flagged as default");
20391
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   379
    assert(def_vtable_indices != NULL, "def vtable alloc?");
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   380
    assert(default_index <= def_vtable_indices->length(), "def vtable len?");
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   381
  } else {
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   382
    assert(klass == target_method()->method_holder(), "caller resp.");
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   383
    // Initialize the method's vtable index to "nonvirtual".
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   384
    // If we allocate a vtable entry, we will update it to a non-negative number.
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   385
    target_method()->set_vtable_index(Method::nonvirtual_vtable_index);
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   386
  }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   387
52276
ad9077f044be 8024368: private methods are allocated vtable slots
sspitsyn
parents: 51959
diff changeset
   388
  // Private, static and <init> methods are never in
ad9077f044be 8024368: private methods are allocated vtable slots
sspitsyn
parents: 51959
diff changeset
   389
  if (target_method()->is_private() || target_method()->is_static() ||
ad9077f044be 8024368: private methods are allocated vtable slots
sspitsyn
parents: 51959
diff changeset
   390
      (target_method()->name()->fast_compare(vmSymbols::object_initializer_name()) == 0)) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   391
    return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   392
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   393
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   394
  if (target_method->is_final_method(klass->access_flags())) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   395
    // a final method never needs a new entry; final methods can be statically
489c9b5090e2 Initial load
duke
parents:
diff changeset
   396
    // resolved and they have to be present in the vtable only if they override
489c9b5090e2 Initial load
duke
parents:
diff changeset
   397
    // a super's method, in which case they re-use its entry
489c9b5090e2 Initial load
duke
parents:
diff changeset
   398
    allocate_new = false;
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   399
  } else if (klass->is_interface()) {
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   400
    allocate_new = false;  // see note below in needs_new_vtable_entry
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   401
    // An interface never allocates new vtable slots, only inherits old ones.
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   402
    // This method will either be assigned its own itable index later,
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   403
    // or be assigned an inherited vtable index in the loop below.
21556
e75cd34a59e0 8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents: 20391
diff changeset
   404
    // default methods inherited by classes store their vtable indices
41669
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40633
diff changeset
   405
    // in the inheritor's default_vtable_indices.
21556
e75cd34a59e0 8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents: 20391
diff changeset
   406
    // default methods inherited by interfaces may already have a
41669
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40633
diff changeset
   407
    // valid itable index, if so, don't change it.
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40633
diff changeset
   408
    // Overpass methods in an interface will be assigned an itable index later
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40633
diff changeset
   409
    // by an inheriting class.
52276
ad9077f044be 8024368: private methods are allocated vtable slots
sspitsyn
parents: 51959
diff changeset
   410
    if ((!is_default || !target_method()->has_itable_index())) {
21556
e75cd34a59e0 8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents: 20391
diff changeset
   411
      target_method()->set_vtable_index(Method::pending_itable_index);
e75cd34a59e0 8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents: 20391
diff changeset
   412
    }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   413
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   414
489c9b5090e2 Initial load
duke
parents:
diff changeset
   415
  // we need a new entry if there is no superclass
39714
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   416
  Klass* super = klass->super();
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   417
  if (super == NULL) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   418
    return allocate_new;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   419
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   420
489c9b5090e2 Initial load
duke
parents:
diff changeset
   421
  // search through the vtable and update overridden entries
489c9b5090e2 Initial load
duke
parents:
diff changeset
   422
  // Since check_signature_loaders acquires SystemDictionary_lock
2264
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   423
  // which can block for gc, once we are in this loop, use handles
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   424
  // For classfiles built with >= jdk7, we now look for transitive overrides
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   425
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7443
diff changeset
   426
  Symbol* name = target_method()->name();
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7443
diff changeset
   427
  Symbol* signature = target_method()->signature();
20391
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   428
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 41669
diff changeset
   429
  Klass* target_klass = target_method()->method_holder();
20391
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   430
  if (target_klass == NULL) {
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   431
    target_klass = _klass;
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   432
  }
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   433
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   434
  Handle target_loader(THREAD, target_klass->class_loader());
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   435
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   436
  Symbol* target_classname = target_klass->name();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   437
  for(int i = 0; i < super_vtable_len; i++) {
39714
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   438
    Method* super_method;
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   439
    if (is_preinitialized_vtable()) {
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   440
      // If this is a shared class, the vtable is already in the final state (fully
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   441
      // initialized). Need to look at the super's vtable.
46408
70aab0c2ea8b 8178350: klassVtable and klassItable should be ValueObj
iklam
parents: 46329
diff changeset
   442
      klassVtable superVtable = super->vtable();
70aab0c2ea8b 8178350: klassVtable and klassItable should be ValueObj
iklam
parents: 46329
diff changeset
   443
      super_method = superVtable.method_at(i);
39714
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   444
    } else {
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   445
      super_method = method_at(i);
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   446
    }
48463
474cec233fb2 8154587: Resolution fails for default method named 'clone'
hseigel
parents: 47765
diff changeset
   447
    // Check if method name matches.  Ignore match if klass is an interface and the
474cec233fb2 8154587: Resolution fails for default method named 'clone'
hseigel
parents: 47765
diff changeset
   448
    // matching method is a non-public java.lang.Object method.  (See JVMS 5.4.3.4)
474cec233fb2 8154587: Resolution fails for default method named 'clone'
hseigel
parents: 47765
diff changeset
   449
    // This is safe because the method at this slot should never get invoked.
474cec233fb2 8154587: Resolution fails for default method named 'clone'
hseigel
parents: 47765
diff changeset
   450
    // (TBD: put in a method to throw NoSuchMethodError if this slot is ever used.)
474cec233fb2 8154587: Resolution fails for default method named 'clone'
hseigel
parents: 47765
diff changeset
   451
    if (super_method->name() == name && super_method->signature() == signature &&
474cec233fb2 8154587: Resolution fails for default method named 'clone'
hseigel
parents: 47765
diff changeset
   452
        (!_klass->is_interface() ||
474cec233fb2 8154587: Resolution fails for default method named 'clone'
hseigel
parents: 47765
diff changeset
   453
         !SystemDictionary::is_nonpublic_Object_method(super_method))) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   454
2264
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   455
      // get super_klass for method_holder for the found method
14391
df0a1573d5bd 8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents: 14385
diff changeset
   456
      InstanceKlass* super_klass =  super_method->method_holder();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   457
35463
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
   458
      // Whether the method is being overridden
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
   459
      bool overrides = false;
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
   460
29871
77e7fe063568 8065366: Better private method resolution
acorn
parents: 29320
diff changeset
   461
      // private methods are also never overridden
77e7fe063568 8065366: Better private method resolution
acorn
parents: 29320
diff changeset
   462
      if (!super_method->is_private() &&
77e7fe063568 8065366: Better private method resolution
acorn
parents: 29320
diff changeset
   463
          (is_default
59056
15936b142f86 8233913: Remove implicit conversion from Method* to methodHandle
coleenp
parents: 58575
diff changeset
   464
          || ((super_klass->is_override(methodHandle(THREAD, super_method), target_loader, target_classname, THREAD))
20391
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   465
          || ((klass->major_version() >= VTABLE_TRANSITIVE_OVERRIDE_VERSION)
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   466
          && ((super_klass = find_transitive_override(super_klass,
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   467
                             target_method, i, target_loader,
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   468
                             target_classname, THREAD))
29871
77e7fe063568 8065366: Better private method resolution
acorn
parents: 29320
diff changeset
   469
                             != (InstanceKlass*)NULL)))))
20391
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   470
        {
25504
69de8357bc53 8032536: JVM resolves wrong method in some unusual cases
hseigel
parents: 24424
diff changeset
   471
        // Package private methods always need a new entry to root their own
69de8357bc53 8032536: JVM resolves wrong method in some unusual cases
hseigel
parents: 24424
diff changeset
   472
        // overriding. They may also override other methods.
69de8357bc53 8032536: JVM resolves wrong method in some unusual cases
hseigel
parents: 24424
diff changeset
   473
        if (!target_method()->is_package_private()) {
69de8357bc53 8032536: JVM resolves wrong method in some unusual cases
hseigel
parents: 24424
diff changeset
   474
          allocate_new = false;
69de8357bc53 8032536: JVM resolves wrong method in some unusual cases
hseigel
parents: 24424
diff changeset
   475
        }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   476
47554
bc112140e089 8186092: Unnecessary loader constraints produced when there are multiple defaults
hseigel
parents: 47216
diff changeset
   477
        // Do not check loader constraints for overpass methods because overpass
bc112140e089 8186092: Unnecessary loader constraints produced when there are multiple defaults
hseigel
parents: 47216
diff changeset
   478
        // methods are created by the jvm to throw exceptions.
bc112140e089 8186092: Unnecessary loader constraints produced when there are multiple defaults
hseigel
parents: 47216
diff changeset
   479
        if (checkconstraints && !target_method()->is_overpass()) {
bc112140e089 8186092: Unnecessary loader constraints produced when there are multiple defaults
hseigel
parents: 47216
diff changeset
   480
          // Override vtable entry if passes loader constraint check
bc112140e089 8186092: Unnecessary loader constraints produced when there are multiple defaults
hseigel
parents: 47216
diff changeset
   481
          // if loader constraint checking requested
bc112140e089 8186092: Unnecessary loader constraints produced when there are multiple defaults
hseigel
parents: 47216
diff changeset
   482
          // No need to visit his super, since he and his super
bc112140e089 8186092: Unnecessary loader constraints produced when there are multiple defaults
hseigel
parents: 47216
diff changeset
   483
          // have already made any needed loader constraints.
bc112140e089 8186092: Unnecessary loader constraints produced when there are multiple defaults
hseigel
parents: 47216
diff changeset
   484
          // Since loader constraints are transitive, it is enough
bc112140e089 8186092: Unnecessary loader constraints produced when there are multiple defaults
hseigel
parents: 47216
diff changeset
   485
          // to link to the first super, and we get all the others.
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   486
          Handle super_loader(THREAD, super_klass->class_loader());
489c9b5090e2 Initial load
duke
parents:
diff changeset
   487
58177
4932dce35882 8230841: Remove oopDesc::equals()
pliden
parents: 55655
diff changeset
   488
          if (target_loader() != super_loader()) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   489
            ResourceMark rm(THREAD);
16591
73047b0eb568 8009731: Confusing error message for loader constraint violation
acorn
parents: 15591
diff changeset
   490
            Symbol* failed_type_symbol =
2264
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   491
              SystemDictionary::check_signature_loaders(signature, target_loader,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   492
                                                        super_loader, true,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   493
                                                        CHECK_(false));
16591
73047b0eb568 8009731: Confusing error message for loader constraint violation
acorn
parents: 15591
diff changeset
   494
            if (failed_type_symbol != NULL) {
51097
bef02342d179 8205611: Improve the wording of LinkageErrors to include module and class loader information
lfoltan
parents: 51096
diff changeset
   495
              stringStream ss;
bef02342d179 8205611: Improve the wording of LinkageErrors to include module and class loader information
lfoltan
parents: 51096
diff changeset
   496
              ss.print("loader constraint violation for class %s: when selecting "
54432
532e88de77eb 8221470: Print methods in exception messages in java-like Syntax.
goetz
parents: 53904
diff changeset
   497
                       "overriding method '", klass->external_name());
532e88de77eb 8221470: Print methods in exception messages in java-like Syntax.
goetz
parents: 53904
diff changeset
   498
              target_method()->print_external_name(&ss),
532e88de77eb 8221470: Print methods in exception messages in java-like Syntax.
goetz
parents: 53904
diff changeset
   499
              ss.print("' the class loader %s of the "
51097
bef02342d179 8205611: Improve the wording of LinkageErrors to include module and class loader information
lfoltan
parents: 51096
diff changeset
   500
                       "selected method's type %s, and the class loader %s for its super "
bef02342d179 8205611: Improve the wording of LinkageErrors to include module and class loader information
lfoltan
parents: 51096
diff changeset
   501
                       "type %s have different Class objects for the type %s used in the signature (%s; %s)",
bef02342d179 8205611: Improve the wording of LinkageErrors to include module and class loader information
lfoltan
parents: 51096
diff changeset
   502
                       target_klass->class_loader_data()->loader_name_and_id(),
bef02342d179 8205611: Improve the wording of LinkageErrors to include module and class loader information
lfoltan
parents: 51096
diff changeset
   503
                       target_klass->external_name(),
bef02342d179 8205611: Improve the wording of LinkageErrors to include module and class loader information
lfoltan
parents: 51096
diff changeset
   504
                       super_klass->class_loader_data()->loader_name_and_id(),
bef02342d179 8205611: Improve the wording of LinkageErrors to include module and class loader information
lfoltan
parents: 51096
diff changeset
   505
                       super_klass->external_name(),
bef02342d179 8205611: Improve the wording of LinkageErrors to include module and class loader information
lfoltan
parents: 51096
diff changeset
   506
                       failed_type_symbol->as_klass_external_name(),
bef02342d179 8205611: Improve the wording of LinkageErrors to include module and class loader information
lfoltan
parents: 51096
diff changeset
   507
                       target_klass->class_in_module_of_loader(false, true),
bef02342d179 8205611: Improve the wording of LinkageErrors to include module and class loader information
lfoltan
parents: 51096
diff changeset
   508
                       super_klass->class_in_module_of_loader(false, true));
bef02342d179 8205611: Improve the wording of LinkageErrors to include module and class loader information
lfoltan
parents: 51096
diff changeset
   509
              THROW_MSG_(vmSymbols::java_lang_LinkageError(), ss.as_string(), false);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   510
            }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   511
          }
35463
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
   512
        }
20391
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   513
35463
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
   514
        put_method_at(target_method(), i);
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
   515
        overrides = true;
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
   516
        if (!is_default) {
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
   517
          target_method()->set_vtable_index(i);
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
   518
        } else {
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
   519
          if (def_vtable_indices != NULL) {
39714
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   520
            if (is_preinitialized_vtable()) {
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   521
              // At runtime initialize_vtable is rerun as part of link_class_impl()
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   522
              // for a shared class loaded by the non-boot loader.
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   523
              // The dumptime vtable index should be the same as the runtime index.
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   524
              assert(def_vtable_indices->at(default_index) == i,
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   525
                     "dump time vtable index is different from runtime index");
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   526
            } else {
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   527
              def_vtable_indices->at_put(default_index, i);
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   528
            }
35463
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
   529
          }
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
   530
          assert(super_method->is_default_method() || super_method->is_overpass()
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
   531
                 || super_method->is_abstract(), "default override error");
2264
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   532
        }
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   533
      } else {
35463
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
   534
        overrides = false;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   535
      }
35463
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
   536
      log_vtables(i, overrides, target_method, target_klass, super_method, THREAD);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   537
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   538
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   539
  return allocate_new;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   540
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   541
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 9172
diff changeset
   542
void klassVtable::put_method_at(Method* m, int index) {
52276
ad9077f044be 8024368: private methods are allocated vtable slots
sspitsyn
parents: 51959
diff changeset
   543
  assert(!m->is_private(), "private methods should not be in vtable");
39714
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   544
  if (is_preinitialized_vtable()) {
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   545
    // At runtime initialize_vtable is rerun as part of link_class_impl()
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   546
    // for shared class loaded by the non-boot loader to obtain the loader
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   547
    // constraints based on the runtime classloaders' context. The dumptime
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   548
    // method at the vtable index should be the same as the runtime method.
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   549
    assert(table()[index].method() == m,
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   550
           "archived method is different from the runtime method");
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   551
  } else {
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   552
    if (log_develop_is_enabled(Trace, vtables)) {
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   553
      ResourceMark rm;
46701
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
   554
      LogTarget(Trace, vtables) lt;
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
   555
      LogStream ls(lt);
39714
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   556
      const char* sig = (m != NULL) ? m->name_and_sig_as_C_string() : "<NULL>";
46701
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
   557
      ls.print("adding %s at index %d, flags: ", sig, index);
39714
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   558
      if (m != NULL) {
46701
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
   559
        m->print_linkage_flags(&ls);
39714
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   560
      }
46701
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
   561
      ls.cr();
21556
e75cd34a59e0 8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents: 20391
diff changeset
   562
    }
39714
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
   563
    table()[index].set(m);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   564
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   565
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   566
489c9b5090e2 Initial load
duke
parents:
diff changeset
   567
// Find out if a method "m" with superclass "super", loader "classloader" and
489c9b5090e2 Initial load
duke
parents:
diff changeset
   568
// name "classname" needs a new vtable entry.  Let P be a class package defined
489c9b5090e2 Initial load
duke
parents:
diff changeset
   569
// by "classloader" and "classname".
489c9b5090e2 Initial load
duke
parents:
diff changeset
   570
// NOTE: The logic used here is very similar to the one used for computing
489c9b5090e2 Initial load
duke
parents:
diff changeset
   571
// the vtables indices for a method. We cannot directly use that function because,
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 9172
diff changeset
   572
// we allocate the InstanceKlass at load time, and that requires that the
2264
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   573
// superclass has been loaded.
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   574
// However, the vtable entries are filled in at link time, and therefore
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   575
// the superclass' vtable may not yet have been filled in.
46727
6e4a84748e2c 8183039: Re-examine methodHandle methods uninlined by 8144256
coleenp
parents: 46701
diff changeset
   576
bool klassVtable::needs_new_vtable_entry(const methodHandle& target_method,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 33611
diff changeset
   577
                                         const Klass* super,
2264
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   578
                                         Handle classloader,
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7443
diff changeset
   579
                                         Symbol* classname,
2264
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   580
                                         AccessFlags class_flags,
40633
c33ad2ff51de 8163808: Fix asserts and logging for old classfile vtable construction
acorn
parents: 39714
diff changeset
   581
                                         u2 major_version,
2264
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   582
                                         TRAPS) {
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   583
  if (class_flags.is_interface()) {
25504
69de8357bc53 8032536: JVM resolves wrong method in some unusual cases
hseigel
parents: 24424
diff changeset
   584
    // Interfaces do not use vtables, except for java.lang.Object methods,
69de8357bc53 8032536: JVM resolves wrong method in some unusual cases
hseigel
parents: 24424
diff changeset
   585
    // so there is no point to assigning
69de8357bc53 8032536: JVM resolves wrong method in some unusual cases
hseigel
parents: 24424
diff changeset
   586
    // a vtable index to any of their local methods.  If we refrain from doing this,
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   587
    // we can use Method::_vtable_index to hold the itable index
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   588
    return false;
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   589
  }
14385
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 13952
diff changeset
   590
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   591
  if (target_method->is_final_method(class_flags) ||
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   592
      // a final method never needs a new entry; final methods can be statically
489c9b5090e2 Initial load
duke
parents:
diff changeset
   593
      // resolved and they have to be present in the vtable only if they override
489c9b5090e2 Initial load
duke
parents:
diff changeset
   594
      // a super's method, in which case they re-use its entry
52276
ad9077f044be 8024368: private methods are allocated vtable slots
sspitsyn
parents: 51959
diff changeset
   595
      (target_method()->is_private()) ||
ad9077f044be 8024368: private methods are allocated vtable slots
sspitsyn
parents: 51959
diff changeset
   596
      // private methods don't need to be in vtable
2264
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   597
      (target_method()->is_static()) ||
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   598
      // static methods don't need to be in vtable
52276
ad9077f044be 8024368: private methods are allocated vtable slots
sspitsyn
parents: 51959
diff changeset
   599
      (target_method()->name()->fast_compare(vmSymbols::object_initializer_name()) == 0)
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   600
      // <init> is never called dynamically-bound
489c9b5090e2 Initial load
duke
parents:
diff changeset
   601
      ) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   602
    return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   603
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   604
20391
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   605
  // Concrete interface methods do not need new entries, they override
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   606
  // abstract method entries using default inheritance rules
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   607
  if (target_method()->method_holder() != NULL &&
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   608
      target_method()->method_holder()->is_interface()  &&
41669
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40633
diff changeset
   609
      !target_method()->is_abstract()) {
52276
ad9077f044be 8024368: private methods are allocated vtable slots
sspitsyn
parents: 51959
diff changeset
   610
    assert(target_method()->is_default_method(),
41669
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40633
diff changeset
   611
           "unexpected interface method type");
20391
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   612
    return false;
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   613
  }
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   614
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   615
  // we need a new entry if there is no superclass
489c9b5090e2 Initial load
duke
parents:
diff changeset
   616
  if (super == NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   617
    return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   618
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   619
25504
69de8357bc53 8032536: JVM resolves wrong method in some unusual cases
hseigel
parents: 24424
diff changeset
   620
  // Package private methods always need a new entry to root their own
69de8357bc53 8032536: JVM resolves wrong method in some unusual cases
hseigel
parents: 24424
diff changeset
   621
  // overriding. This allows transitive overriding to work.
69de8357bc53 8032536: JVM resolves wrong method in some unusual cases
hseigel
parents: 24424
diff changeset
   622
  if (target_method()->is_package_private()) {
69de8357bc53 8032536: JVM resolves wrong method in some unusual cases
hseigel
parents: 24424
diff changeset
   623
    return true;
69de8357bc53 8032536: JVM resolves wrong method in some unusual cases
hseigel
parents: 24424
diff changeset
   624
  }
69de8357bc53 8032536: JVM resolves wrong method in some unusual cases
hseigel
parents: 24424
diff changeset
   625
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   626
  // search through the super class hierarchy to see if we need
489c9b5090e2 Initial load
duke
parents:
diff changeset
   627
  // a new entry
2264
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   628
  ResourceMark rm;
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7443
diff changeset
   629
  Symbol* name = target_method()->name();
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7443
diff changeset
   630
  Symbol* signature = target_method()->signature();
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 33611
diff changeset
   631
  const Klass* k = super;
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 9172
diff changeset
   632
  Method* super_method = NULL;
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 9172
diff changeset
   633
  InstanceKlass *holder = NULL;
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 9172
diff changeset
   634
  Method* recheck_method =  NULL;
55655
419420eb5230 8226798: JVM crash in klassItable::initialize_itable_for_interface(int, InstanceKlass*, bool, Thread*)
hseigel
parents: 54432
diff changeset
   635
  bool found_pkg_prvt_method = false;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   636
  while (k != NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   637
    // lookup through the hierarchy for a method with matching name and sign.
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 9172
diff changeset
   638
    super_method = InstanceKlass::cast(k)->lookup_method(name, signature);
2264
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   639
    if (super_method == NULL) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   640
      break; // we still have to search for a matching miranda method
489c9b5090e2 Initial load
duke
parents:
diff changeset
   641
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   642
    // get the class holding the matching method
2264
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   643
    // make sure you use that class for is_override
14391
df0a1573d5bd 8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents: 14385
diff changeset
   644
    InstanceKlass* superk = super_method->method_holder();
2264
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   645
    // we want only instance method matches
52276
ad9077f044be 8024368: private methods are allocated vtable slots
sspitsyn
parents: 51959
diff changeset
   646
    // ignore private methods found via lookup_method since they do not participate in overriding,
ad9077f044be 8024368: private methods are allocated vtable slots
sspitsyn
parents: 51959
diff changeset
   647
    // and since we do override around them: e.g. a.m pub/b.m private/c.m pub,
2264
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   648
    // ignore private, c.m pub does override a.m pub
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   649
    // For classes that were not javac'd together, we also do transitive overriding around
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   650
    // methods that have less accessibility
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   651
    if ((!super_method->is_static()) &&
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   652
       (!super_method->is_private())) {
59056
15936b142f86 8233913: Remove implicit conversion from Method* to methodHandle
coleenp
parents: 58575
diff changeset
   653
      if (superk->is_override(methodHandle(THREAD, super_method), classloader, classname, THREAD)) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   654
        return false;
2264
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   655
      // else keep looking for transitive overrides
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   656
      }
55655
419420eb5230 8226798: JVM crash in klassItable::initialize_itable_for_interface(int, InstanceKlass*, bool, Thread*)
hseigel
parents: 54432
diff changeset
   657
      // If we get here then one of the super classes has a package private method
419420eb5230 8226798: JVM crash in klassItable::initialize_itable_for_interface(int, InstanceKlass*, bool, Thread*)
hseigel
parents: 54432
diff changeset
   658
      // that will not get overridden because it is in a different package.  But,
419420eb5230 8226798: JVM crash in klassItable::initialize_itable_for_interface(int, InstanceKlass*, bool, Thread*)
hseigel
parents: 54432
diff changeset
   659
      // that package private method does "override" any matching methods in super
419420eb5230 8226798: JVM crash in klassItable::initialize_itable_for_interface(int, InstanceKlass*, bool, Thread*)
hseigel
parents: 54432
diff changeset
   660
      // interfaces, so there will be no miranda vtable entry created.  So, set flag
419420eb5230 8226798: JVM crash in klassItable::initialize_itable_for_interface(int, InstanceKlass*, bool, Thread*)
hseigel
parents: 54432
diff changeset
   661
      // to TRUE for use below, in case there are no methods in super classes that
419420eb5230 8226798: JVM crash in klassItable::initialize_itable_for_interface(int, InstanceKlass*, bool, Thread*)
hseigel
parents: 54432
diff changeset
   662
      // this target method overrides.
419420eb5230 8226798: JVM crash in klassItable::initialize_itable_for_interface(int, InstanceKlass*, bool, Thread*)
hseigel
parents: 54432
diff changeset
   663
      assert(super_method->is_package_private(), "super_method must be package private");
419420eb5230 8226798: JVM crash in klassItable::initialize_itable_for_interface(int, InstanceKlass*, bool, Thread*)
hseigel
parents: 54432
diff changeset
   664
      assert(!superk->is_same_class_package(classloader(), classname),
419420eb5230 8226798: JVM crash in klassItable::initialize_itable_for_interface(int, InstanceKlass*, bool, Thread*)
hseigel
parents: 54432
diff changeset
   665
             "Must be different packages");
419420eb5230 8226798: JVM crash in klassItable::initialize_itable_for_interface(int, InstanceKlass*, bool, Thread*)
hseigel
parents: 54432
diff changeset
   666
      found_pkg_prvt_method = true;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   667
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   668
40633
c33ad2ff51de 8163808: Fix asserts and logging for old classfile vtable construction
acorn
parents: 39714
diff changeset
   669
    // Start with lookup result and continue to search up, for versions supporting transitive override
c33ad2ff51de 8163808: Fix asserts and logging for old classfile vtable construction
acorn
parents: 39714
diff changeset
   670
    if (major_version >= VTABLE_TRANSITIVE_OVERRIDE_VERSION) {
c33ad2ff51de 8163808: Fix asserts and logging for old classfile vtable construction
acorn
parents: 39714
diff changeset
   671
      k = superk->super(); // haven't found an override match yet; continue to look
c33ad2ff51de 8163808: Fix asserts and logging for old classfile vtable construction
acorn
parents: 39714
diff changeset
   672
    } else {
c33ad2ff51de 8163808: Fix asserts and logging for old classfile vtable construction
acorn
parents: 39714
diff changeset
   673
      break;
c33ad2ff51de 8163808: Fix asserts and logging for old classfile vtable construction
acorn
parents: 39714
diff changeset
   674
    }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   675
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   676
55655
419420eb5230 8226798: JVM crash in klassItable::initialize_itable_for_interface(int, InstanceKlass*, bool, Thread*)
hseigel
parents: 54432
diff changeset
   677
  // If found_pkg_prvt_method is set, then the ONLY matching method in the
419420eb5230 8226798: JVM crash in klassItable::initialize_itable_for_interface(int, InstanceKlass*, bool, Thread*)
hseigel
parents: 54432
diff changeset
   678
  // superclasses is package private in another package. That matching method will
419420eb5230 8226798: JVM crash in klassItable::initialize_itable_for_interface(int, InstanceKlass*, bool, Thread*)
hseigel
parents: 54432
diff changeset
   679
  // prevent a miranda vtable entry from being created. Because the target method can not
419420eb5230 8226798: JVM crash in klassItable::initialize_itable_for_interface(int, InstanceKlass*, bool, Thread*)
hseigel
parents: 54432
diff changeset
   680
  // override the package private method in another package, then it needs to be the root
419420eb5230 8226798: JVM crash in klassItable::initialize_itable_for_interface(int, InstanceKlass*, bool, Thread*)
hseigel
parents: 54432
diff changeset
   681
  // for its own vtable entry.
419420eb5230 8226798: JVM crash in klassItable::initialize_itable_for_interface(int, InstanceKlass*, bool, Thread*)
hseigel
parents: 54432
diff changeset
   682
  if (found_pkg_prvt_method) {
419420eb5230 8226798: JVM crash in klassItable::initialize_itable_for_interface(int, InstanceKlass*, bool, Thread*)
hseigel
parents: 54432
diff changeset
   683
     return true;
419420eb5230 8226798: JVM crash in klassItable::initialize_itable_for_interface(int, InstanceKlass*, bool, Thread*)
hseigel
parents: 54432
diff changeset
   684
  }
419420eb5230 8226798: JVM crash in klassItable::initialize_itable_for_interface(int, InstanceKlass*, bool, Thread*)
hseigel
parents: 54432
diff changeset
   685
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   686
  // if the target method is public or protected it may have a matching
489c9b5090e2 Initial load
duke
parents:
diff changeset
   687
  // miranda method in the super, whose entry it should re-use.
2264
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   688
  // Actually, to handle cases that javac would not generate, we need
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   689
  // this check for all access permissions.
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 33611
diff changeset
   690
  const InstanceKlass *sk = InstanceKlass::cast(super);
2264
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
   691
  if (sk->has_miranda_methods()) {
28731
f7339cba0a6a 8067480: Crash in klassItable::initialize_itable_for_interface when running vm.runtime.defmeth.StaticMethodsTest.
lfoltan
parents: 28373
diff changeset
   692
    if (sk->lookup_method_in_all_interfaces(name, signature, Klass::find_defaults) != NULL) {
55655
419420eb5230 8226798: JVM crash in klassItable::initialize_itable_for_interface(int, InstanceKlass*, bool, Thread*)
hseigel
parents: 54432
diff changeset
   693
      return false; // found a matching miranda; we do not need a new entry
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   694
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   695
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   696
  return true; // found no match; we need a new entry
489c9b5090e2 Initial load
duke
parents:
diff changeset
   697
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   698
489c9b5090e2 Initial load
duke
parents:
diff changeset
   699
// Support for miranda methods
489c9b5090e2 Initial load
duke
parents:
diff changeset
   700
489c9b5090e2 Initial load
duke
parents:
diff changeset
   701
// get the vtable index of a miranda method with matching "name" and "signature"
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7443
diff changeset
   702
int klassVtable::index_of_miranda(Symbol* name, Symbol* signature) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   703
  // search from the bottom, might be faster
489c9b5090e2 Initial load
duke
parents:
diff changeset
   704
  for (int i = (length() - 1); i >= 0; i--) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 9172
diff changeset
   705
    Method* m = table()[i].method();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   706
    if (is_miranda_entry_at(i) &&
489c9b5090e2 Initial load
duke
parents:
diff changeset
   707
        m->name() == name && m->signature() == signature) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   708
      return i;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   709
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   710
  }
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 9172
diff changeset
   711
  return Method::invalid_vtable_index;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   712
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   713
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   714
// check if an entry at an index is miranda
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   715
// requires that method m at entry be declared ("held") by an interface.
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   716
bool klassVtable::is_miranda_entry_at(int i) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 9172
diff changeset
   717
  Method* m = method_at(i);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 9172
diff changeset
   718
  Klass* method_holder = m->method_holder();
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 9172
diff changeset
   719
  InstanceKlass *mhk = InstanceKlass::cast(method_holder);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   720
20284
595a25ab9474 8011311: Private interface methods. Default conflicts:ICCE. no erased_super_default.
acorn
parents: 20017
diff changeset
   721
  // miranda methods are public abstract instance interface methods in a class's vtable
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   722
  if (mhk->is_interface()) {
14385
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 13952
diff changeset
   723
    assert(m->is_public(), "should be public");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   724
    assert(ik()->implements_interface(method_holder) , "this class should implement the interface");
48463
474cec233fb2 8154587: Resolution fails for default method named 'clone'
hseigel
parents: 47765
diff changeset
   725
    if (is_miranda(m, ik()->methods(), ik()->default_methods(), ik()->super(), klass()->is_interface())) {
21556
e75cd34a59e0 8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents: 20391
diff changeset
   726
      return true;
e75cd34a59e0 8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents: 20391
diff changeset
   727
    }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   728
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   729
  return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   730
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   731
32189
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   732
// Check if a method is a miranda method, given a class's methods array,
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   733
// its default_method table and its super class.
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   734
// "Miranda" means an abstract non-private method that would not be
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   735
// overridden for the local class.
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   736
// A "miranda" method should only include non-private interface
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   737
// instance methods, i.e. not private methods, not static methods,
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   738
// not default methods (concrete interface methods), not overpass methods.
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   739
// If a given class already has a local (including overpass) method, a
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   740
// default method, or any of its superclasses has the same which would have
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   741
// overridden an abstract method, then this is not a miranda method.
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   742
//
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   743
// Miranda methods are checked multiple times.
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   744
// Pass 1: during class load/class file parsing: before vtable size calculation:
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   745
// include superinterface abstract and default methods (non-private instance).
29871
77e7fe063568 8065366: Better private method resolution
acorn
parents: 29320
diff changeset
   746
// We include potential default methods to give them space in the vtable.
32189
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   747
// During the first run, the current instanceKlass has not yet been
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   748
// created, the superclasses and superinterfaces do have instanceKlasses
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   749
// but may not have vtables, the default_methods list is empty, no overpasses.
48463
474cec233fb2 8154587: Resolution fails for default method named 'clone'
hseigel
parents: 47765
diff changeset
   750
// Default method generation uses the all_mirandas array as the starter set for
474cec233fb2 8154587: Resolution fails for default method named 'clone'
hseigel
parents: 47765
diff changeset
   751
// maximally-specific default method calculation.  So, for both classes and
474cec233fb2 8154587: Resolution fails for default method named 'clone'
hseigel
parents: 47765
diff changeset
   752
// interfaces, it is necessary that the first pass will find all non-private
474cec233fb2 8154587: Resolution fails for default method named 'clone'
hseigel
parents: 47765
diff changeset
   753
// interface instance methods, whether or not they are concrete.
32189
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   754
//
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   755
// Pass 2: recalculated during vtable initialization: only include abstract methods.
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   756
// The goal of pass 2 is to walk through the superinterfaces to see if any of
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   757
// the superinterface methods (which were all abstract pre-default methods)
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   758
// need to be added to the vtable.
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   759
// With the addition of default methods, we have three new challenges:
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   760
// overpasses, static interface methods and private interface methods.
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   761
// Static and private interface methods do not get added to the vtable and
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   762
// are not seen by the method resolution process, so we skip those.
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   763
// Overpass methods are already in the vtable, so vtable lookup will
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   764
// find them and we don't need to add a miranda method to the end of
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   765
// the vtable. So we look for overpass methods and if they are found we
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   766
// return false. Note that we inherit our superclasses vtable, so
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   767
// the superclass' search also needs to use find_overpass so that if
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   768
// one is found we return false.
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   769
// False means - we don't need a miranda method added to the vtable.
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   770
//
29871
77e7fe063568 8065366: Better private method resolution
acorn
parents: 29320
diff changeset
   771
// During the second run, default_methods is set up, so concrete methods from
77e7fe063568 8065366: Better private method resolution
acorn
parents: 29320
diff changeset
   772
// superinterfaces with matching names/signatures to default_methods are already
77e7fe063568 8065366: Better private method resolution
acorn
parents: 29320
diff changeset
   773
// in the default_methods list and do not need to be appended to the vtable
32189
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   774
// as mirandas. Abstract methods may already have been handled via
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   775
// overpasses - either local or superclass overpasses, which may be
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   776
// in the vtable already.
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   777
//
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   778
// Pass 3: They are also checked by link resolution and selection,
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   779
// for invocation on a method (not interface method) reference that
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   780
// resolves to a method with an interface as its method_holder.
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   781
// Used as part of walking from the bottom of the vtable to find
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   782
// the vtable index for the miranda method.
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   783
//
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   784
// Part of the Miranda Rights in the US mean that if you do not have
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   785
// an attorney one will be appointed for you.
20391
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   786
bool klassVtable::is_miranda(Method* m, Array<Method*>* class_methods,
48463
474cec233fb2 8154587: Resolution fails for default method named 'clone'
hseigel
parents: 47765
diff changeset
   787
                             Array<Method*>* default_methods, const Klass* super,
474cec233fb2 8154587: Resolution fails for default method named 'clone'
hseigel
parents: 47765
diff changeset
   788
                             bool is_interface) {
21556
e75cd34a59e0 8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents: 20391
diff changeset
   789
  if (m->is_static() || m->is_private() || m->is_overpass()) {
17092
8d0bef547de9 8013418: assert(i == total_args_passed) in AdapterHandlerLibrary::get_adapter since 8-b87
bharadwaj
parents: 16591
diff changeset
   790
    return false;
8d0bef547de9 8013418: assert(i == total_args_passed) in AdapterHandlerLibrary::get_adapter since 8-b87
bharadwaj
parents: 16591
diff changeset
   791
  }
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7443
diff changeset
   792
  Symbol* name = m->name();
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7443
diff changeset
   793
  Symbol* signature = m->signature();
21913
0e2fd7282ac6 8028438: static superclass method masks default methods
acorn
parents: 21770
diff changeset
   794
32189
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   795
  // First look in local methods to see if already covered
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   796
  if (InstanceKlass::find_local_method(class_methods, name, signature,
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   797
              Klass::find_overpass, Klass::skip_static, Klass::skip_private) != NULL)
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   798
  {
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   799
    return false;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   800
  }
7443
39c85d63abf2 6989076: JVM crashes in klassItable::initialize_itable_for_interface
dsamersoff
parents: 7397
diff changeset
   801
32189
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   802
  // Check local default methods
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   803
  if ((default_methods != NULL) &&
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   804
    (InstanceKlass::find_method(default_methods, name, signature) != NULL))
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   805
   {
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   806
     return false;
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   807
   }
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   808
33602
16053580a684 8139163: InstanceKlass::cast passes through NULL
coleenp
parents: 33148
diff changeset
   809
  // Iterate on all superclasses, which should be InstanceKlasses.
32189
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   810
  // Note that we explicitly look for overpasses at each level.
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   811
  // Overpasses may or may not exist for supers for pass 1,
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   812
  // they should have been created for pass 2 and later.
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   813
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 33611
diff changeset
   814
  for (const Klass* cursuper = super; cursuper != NULL; cursuper = cursuper->super())
32189
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   815
  {
48463
474cec233fb2 8154587: Resolution fails for default method named 'clone'
hseigel
parents: 47765
diff changeset
   816
     Method* found_mth = InstanceKlass::cast(cursuper)->find_local_method(name, signature,
474cec233fb2 8154587: Resolution fails for default method named 'clone'
hseigel
parents: 47765
diff changeset
   817
       Klass::find_overpass, Klass::skip_static, Klass::skip_private);
474cec233fb2 8154587: Resolution fails for default method named 'clone'
hseigel
parents: 47765
diff changeset
   818
     // Ignore non-public methods in java.lang.Object if klass is an interface.
474cec233fb2 8154587: Resolution fails for default method named 'clone'
hseigel
parents: 47765
diff changeset
   819
     if (found_mth != NULL && (!is_interface ||
474cec233fb2 8154587: Resolution fails for default method named 'clone'
hseigel
parents: 47765
diff changeset
   820
         !SystemDictionary::is_nonpublic_Object_method(found_mth))) {
32189
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   821
       return false;
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   822
     }
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   823
  }
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   824
5264b560ab1b 8087342: Crash in klassItable::initialize_itable_for_interface
acorn
parents: 31019
diff changeset
   825
  return true;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   826
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   827
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   828
// Scans current_interface_methods for miranda methods that do not
20391
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   829
// already appear in new_mirandas, or default methods,  and are also not defined-and-non-private
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   830
// in super (superclass).  These mirandas are added to all_mirandas if it is
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   831
// not null; in addition, those that are not duplicates of miranda methods
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   832
// inherited by super from its interfaces are added to new_mirandas.
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   833
// Thus, new_mirandas will be the set of mirandas that this class introduces,
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   834
// all_mirandas will be the set of all mirandas applicable to this class
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   835
// including all defined in superclasses.
14385
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 13952
diff changeset
   836
void klassVtable::add_new_mirandas_to_lists(
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 13952
diff changeset
   837
    GrowableArray<Method*>* new_mirandas, GrowableArray<Method*>* all_mirandas,
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 13952
diff changeset
   838
    Array<Method*>* current_interface_methods, Array<Method*>* class_methods,
48463
474cec233fb2 8154587: Resolution fails for default method named 'clone'
hseigel
parents: 47765
diff changeset
   839
    Array<Method*>* default_methods, const Klass* super, bool is_interface) {
20391
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   840
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   841
  // iterate thru the current interface's method to see if it a miranda
489c9b5090e2 Initial load
duke
parents:
diff changeset
   842
  int num_methods = current_interface_methods->length();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   843
  for (int i = 0; i < num_methods; i++) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 9172
diff changeset
   844
    Method* im = current_interface_methods->at(i);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   845
    bool is_duplicate = false;
14385
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 13952
diff changeset
   846
    int num_of_current_mirandas = new_mirandas->length();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   847
    // check for duplicate mirandas in different interfaces we implement
489c9b5090e2 Initial load
duke
parents:
diff changeset
   848
    for (int j = 0; j < num_of_current_mirandas; j++) {
14385
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 13952
diff changeset
   849
      Method* miranda = new_mirandas->at(j);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   850
      if ((im->name() == miranda->name()) &&
489c9b5090e2 Initial load
duke
parents:
diff changeset
   851
          (im->signature() == miranda->signature())) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   852
        is_duplicate = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   853
        break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   854
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   855
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   856
489c9b5090e2 Initial load
duke
parents:
diff changeset
   857
    if (!is_duplicate) { // we don't want duplicate miranda entries in the vtable
48463
474cec233fb2 8154587: Resolution fails for default method named 'clone'
hseigel
parents: 47765
diff changeset
   858
      if (is_miranda(im, class_methods, default_methods, super, is_interface)) { // is it a miranda at all?
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 33611
diff changeset
   859
        const InstanceKlass *sk = InstanceKlass::cast(super);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   860
        // check if it is a duplicate of a super's miranda
28731
f7339cba0a6a 8067480: Crash in klassItable::initialize_itable_for_interface when running vm.runtime.defmeth.StaticMethodsTest.
lfoltan
parents: 28373
diff changeset
   861
        if (sk->lookup_method_in_all_interfaces(im->name(), im->signature(), Klass::find_defaults) == NULL) {
14385
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 13952
diff changeset
   862
          new_mirandas->append(im);
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 13952
diff changeset
   863
        }
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 13952
diff changeset
   864
        if (all_mirandas != NULL) {
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 13952
diff changeset
   865
          all_mirandas->append(im);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   866
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   867
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   868
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   869
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   870
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   871
14385
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 13952
diff changeset
   872
void klassVtable::get_mirandas(GrowableArray<Method*>* new_mirandas,
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 13952
diff changeset
   873
                               GrowableArray<Method*>* all_mirandas,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 33611
diff changeset
   874
                               const Klass* super,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 33611
diff changeset
   875
                               Array<Method*>* class_methods,
20391
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   876
                               Array<Method*>* default_methods,
51329
9c68699bebe5 8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents: 51097
diff changeset
   877
                               Array<InstanceKlass*>* local_interfaces,
48463
474cec233fb2 8154587: Resolution fails for default method named 'clone'
hseigel
parents: 47765
diff changeset
   878
                               bool is_interface) {
14385
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 13952
diff changeset
   879
  assert((new_mirandas->length() == 0) , "current mirandas must be 0");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   880
489c9b5090e2 Initial load
duke
parents:
diff changeset
   881
  // iterate thru the local interfaces looking for a miranda
489c9b5090e2 Initial load
duke
parents:
diff changeset
   882
  int num_local_ifs = local_interfaces->length();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   883
  for (int i = 0; i < num_local_ifs; i++) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 9172
diff changeset
   884
    InstanceKlass *ik = InstanceKlass::cast(local_interfaces->at(i));
14385
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 13952
diff changeset
   885
    add_new_mirandas_to_lists(new_mirandas, all_mirandas,
20391
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   886
                              ik->methods(), class_methods,
48463
474cec233fb2 8154587: Resolution fails for default method named 'clone'
hseigel
parents: 47765
diff changeset
   887
                              default_methods, super, is_interface);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   888
    // iterate thru each local's super interfaces
51329
9c68699bebe5 8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents: 51097
diff changeset
   889
    Array<InstanceKlass*>* super_ifs = ik->transitive_interfaces();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   890
    int num_super_ifs = super_ifs->length();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   891
    for (int j = 0; j < num_super_ifs; j++) {
51329
9c68699bebe5 8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents: 51097
diff changeset
   892
      InstanceKlass *sik = super_ifs->at(j);
14385
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 13952
diff changeset
   893
      add_new_mirandas_to_lists(new_mirandas, all_mirandas,
20391
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   894
                                sik->methods(), class_methods,
48463
474cec233fb2 8154587: Resolution fails for default method named 'clone'
hseigel
parents: 47765
diff changeset
   895
                                default_methods, super, is_interface);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   896
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   897
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   898
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   899
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   900
// Discover miranda methods ("miranda" = "interface abstract, no binding"),
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   901
// and append them into the vtable starting at index initialized,
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   902
// return the new value of initialized.
21556
e75cd34a59e0 8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents: 20391
diff changeset
   903
// Miranda methods use vtable entries, but do not get assigned a vtable_index
e75cd34a59e0 8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents: 20391
diff changeset
   904
// The vtable_index is discovered by searching from the end of the vtable
51096
695dff91a997 8178712: ResourceMark may be missing inside initialize_[vi]table
lfoltan
parents: 50735
diff changeset
   905
int klassVtable::fill_in_mirandas(int initialized, TRAPS) {
695dff91a997 8178712: ResourceMark may be missing inside initialize_[vi]table
lfoltan
parents: 50735
diff changeset
   906
  ResourceMark rm(THREAD);
14385
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 13952
diff changeset
   907
  GrowableArray<Method*> mirandas(20);
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 13952
diff changeset
   908
  get_mirandas(&mirandas, NULL, ik()->super(), ik()->methods(),
48463
474cec233fb2 8154587: Resolution fails for default method named 'clone'
hseigel
parents: 47765
diff changeset
   909
               ik()->default_methods(), ik()->local_interfaces(),
474cec233fb2 8154587: Resolution fails for default method named 'clone'
hseigel
parents: 47765
diff changeset
   910
               klass()->is_interface());
14385
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 13952
diff changeset
   911
  for (int i = 0; i < mirandas.length(); i++) {
35901
f5028c67e7cb 8147918: Rename develop_log_is_enabled() to log_develop_is_enabled()
pliden
parents: 35898
diff changeset
   912
    if (log_develop_is_enabled(Trace, vtables)) {
20391
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   913
      Method* meth = mirandas.at(i);
46701
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
   914
      LogTarget(Trace, vtables) lt;
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
   915
      LogStream ls(lt);
20391
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   916
      if (meth != NULL) {
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   917
        char* sig = meth->name_and_sig_as_C_string();
46701
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
   918
        ls.print("fill in mirandas with %s index %d, flags: ",
35463
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
   919
                     sig, initialized);
46701
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
   920
        meth->print_linkage_flags(&ls);
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
   921
        ls.cr();
20391
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   922
      }
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   923
    }
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   924
    put_method_at(mirandas.at(i), initialized);
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   925
    ++initialized;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   926
  }
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   927
  return initialized;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   928
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   929
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   930
// Copy this class's vtable to the vtable beginning at start.
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
   931
// Used to copy superclass vtable to prefix of subclass's vtable.
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   932
void klassVtable::copy_vtable_to(vtableEntry* start) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   933
  Copy::disjoint_words((HeapWord*)table(), (HeapWord*)start, _length * vtableEntry::size());
489c9b5090e2 Initial load
duke
parents:
diff changeset
   934
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   935
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
   936
#if INCLUDE_JVMTI
20391
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   937
bool klassVtable::adjust_default_method(int vtable_index, Method* old_method, Method* new_method) {
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   938
  // If old_method is default, find this vtable index in default_vtable_indices
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   939
  // and replace that method in the _default_methods list
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   940
  bool updated = false;
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   941
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   942
  Array<Method*>* default_methods = ik()->default_methods();
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   943
  if (default_methods != NULL) {
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   944
    int len = default_methods->length();
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   945
    for (int idx = 0; idx < len; idx++) {
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   946
      if (vtable_index == ik()->default_vtable_indices()->at(idx)) {
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   947
        if (default_methods->at(idx) == old_method) {
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   948
          default_methods->at_put(idx, new_method);
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   949
          updated = true;
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   950
        }
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   951
        break;
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   952
      }
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   953
    }
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   954
  }
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   955
  return updated;
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
   956
}
29316
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 28731
diff changeset
   957
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 28731
diff changeset
   958
// search the vtable for uses of either obsolete or EMCP methods
53904
9c3fe09f69bc 8078725: method adjustments can be done just once for all classes involved into redefinition
coleenp
parents: 52276
diff changeset
   959
void klassVtable::adjust_method_entries(bool * trace_name_printed) {
29316
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 28731
diff changeset
   960
  int prn_enabled = 0;
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 28731
diff changeset
   961
  for (int index = 0; index < length(); index++) {
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 28731
diff changeset
   962
    Method* old_method = unchecked_method_at(index);
53904
9c3fe09f69bc 8078725: method adjustments can be done just once for all classes involved into redefinition
coleenp
parents: 52276
diff changeset
   963
    if (old_method == NULL || !old_method->is_old()) {
29316
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 28731
diff changeset
   964
      continue; // skip uninteresting entries
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 28731
diff changeset
   965
    }
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 28731
diff changeset
   966
    assert(!old_method->is_deleted(), "vtable methods may not be deleted");
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 28731
diff changeset
   967
53904
9c3fe09f69bc 8078725: method adjustments can be done just once for all classes involved into redefinition
coleenp
parents: 52276
diff changeset
   968
    Method* new_method = old_method->get_new_method();
9c3fe09f69bc 8078725: method adjustments can be done just once for all classes involved into redefinition
coleenp
parents: 52276
diff changeset
   969
    put_method_at(new_method, index);
29316
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 28731
diff changeset
   970
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 28731
diff changeset
   971
    // For default methods, need to update the _default_methods array
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 28731
diff changeset
   972
    // which can only have one method entry for a given signature
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 28731
diff changeset
   973
    bool updated_default = false;
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 28731
diff changeset
   974
    if (old_method->is_default_method()) {
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 28731
diff changeset
   975
      updated_default = adjust_default_method(index, old_method, new_method);
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 28731
diff changeset
   976
    }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   977
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 37242
diff changeset
   978
    if (log_is_enabled(Info, redefine, class, update)) {
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 37242
diff changeset
   979
      ResourceMark rm;
29316
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 28731
diff changeset
   980
      if (!(*trace_name_printed)) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 37242
diff changeset
   981
        log_info(redefine, class, update)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 37242
diff changeset
   982
          ("adjust: klassname=%s for methods from name=%s",
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 41669
diff changeset
   983
           _klass->external_name(), old_method->method_holder()->external_name());
29316
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 28731
diff changeset
   984
        *trace_name_printed = true;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   985
      }
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 37242
diff changeset
   986
      log_debug(redefine, class, update, vtables)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 37242
diff changeset
   987
        ("vtable method update: %s(%s), updated default = %s",
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 37242
diff changeset
   988
         new_method->name()->as_C_string(), new_method->signature()->as_C_string(), updated_default ? "true" : "false");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   989
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   990
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   991
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   992
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
   993
// a vtable should never contain old or obsolete methods
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
   994
bool klassVtable::check_no_old_or_obsolete_entries() {
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
   995
  for (int i = 0; i < length(); i++) {
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
   996
    Method* m = unchecked_method_at(i);
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
   997
    if (m != NULL &&
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
   998
        (NOT_PRODUCT(!m->is_valid() ||) m->is_old() || m->is_obsolete())) {
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
   999
      return false;
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1000
    }
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1001
  }
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1002
  return true;
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1003
}
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1004
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1005
void klassVtable::dump_vtable() {
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1006
  tty->print_cr("vtable dump --");
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1007
  for (int i = 0; i < length(); i++) {
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1008
    Method* m = unchecked_method_at(i);
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1009
    if (m != NULL) {
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1010
      tty->print("      (%5d)  ", i);
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1011
      m->access_flags().print_on(tty);
20391
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
  1012
      if (m->is_default_method()) {
21556
e75cd34a59e0 8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents: 20391
diff changeset
  1013
        tty->print("default ");
20391
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
  1014
      }
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
  1015
      if (m->is_overpass()) {
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
  1016
        tty->print("overpass");
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
  1017
      }
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1018
      tty->print(" --  ");
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1019
      m->print_name(tty);
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1020
      tty->cr();
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1021
    }
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1022
  }
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1023
}
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1024
#endif // INCLUDE_JVMTI
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1025
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1026
//-----------------------------------------------------------------------------------------
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1027
// Itable code
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1028
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1029
// Initialize a itableMethodEntry
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 9172
diff changeset
  1030
void itableMethodEntry::initialize(Method* m) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1031
  if (m == NULL) return;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1032
46413
b0f67ec8f6be 8178543: Optimize Klass::is_shared()
iklam
parents: 46408
diff changeset
  1033
#ifdef ASSERT
48794
ea0d0781c63c 8178351: Simplify MetaspaceShared::is_in_shared_space and MetaspaceObj::is_shared
iklam
parents: 48463
diff changeset
  1034
  if (MetaspaceShared::is_in_shared_metaspace((void*)&_method) &&
39714
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
  1035
     !MetaspaceShared::remapped_readwrite()) {
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
  1036
    // At runtime initialize_itable is rerun as part of link_class_impl()
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
  1037
    // for a shared class loaded by the non-boot loader.
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
  1038
    // The dumptime itable method entry should be the same as the runtime entry.
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
  1039
    assert(_method == m, "sanity");
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
  1040
  }
46413
b0f67ec8f6be 8178543: Optimize Klass::is_shared()
iklam
parents: 46408
diff changeset
  1041
#endif
b0f67ec8f6be 8178543: Optimize Klass::is_shared()
iklam
parents: 46408
diff changeset
  1042
  _method = m;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1043
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1044
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 41669
diff changeset
  1045
klassItable::klassItable(InstanceKlass* klass) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1046
  _klass = klass;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1047
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1048
  if (klass->itable_length() > 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1049
    itableOffsetEntry* offset_entry = (itableOffsetEntry*)klass->start_of_itable();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1050
    if (offset_entry  != NULL && offset_entry->interface_klass() != NULL) { // Check that itable is initialized
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1051
      // First offset entry points to the first method_entry
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 41669
diff changeset
  1052
      intptr_t* method_entry  = (intptr_t *)(((address)klass) + offset_entry->offset());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1053
      intptr_t* end         = klass->end_of_itable();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1054
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 41669
diff changeset
  1055
      _table_offset      = (intptr_t*)offset_entry - (intptr_t*)klass;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1056
      _size_offset_table = (method_entry - ((intptr_t*)offset_entry)) / itableOffsetEntry::size();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1057
      _size_method_table = (end - method_entry)                  / itableMethodEntry::size();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1058
      assert(_table_offset >= 0 && _size_offset_table >= 0 && _size_method_table >= 0, "wrong computation");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1059
      return;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1060
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1061
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1062
189
4248c8e21063 6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents: 1
diff changeset
  1063
  // The length of the itable was either zero, or it has not yet been initialized.
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1064
  _table_offset      = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1065
  _size_offset_table = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1066
  _size_method_table = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1067
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1068
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1069
static int initialize_count = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1070
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1071
// Initialization
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1072
void klassItable::initialize_itable(bool checkconstraints, TRAPS) {
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1073
  if (_klass->is_interface()) {
20391
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
  1074
    // This needs to go after vtable indices are assigned but
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
  1075
    // before implementors need to know the number of itable indices.
51329
9c68699bebe5 8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents: 51097
diff changeset
  1076
    assign_itable_indices_for_interface(InstanceKlass::cast(_klass), THREAD);
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1077
  }
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1078
189
4248c8e21063 6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents: 1
diff changeset
  1079
  // Cannot be setup doing bootstrapping, interfaces don't have
4248c8e21063 6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents: 1
diff changeset
  1080
  // itables, and klass with only ones entry have empty itables
4248c8e21063 6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents: 1
diff changeset
  1081
  if (Universe::is_bootstrapping() ||
4248c8e21063 6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents: 1
diff changeset
  1082
      _klass->is_interface() ||
4248c8e21063 6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents: 1
diff changeset
  1083
      _klass->itable_length() == itableOffsetEntry::size()) return;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1084
189
4248c8e21063 6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents: 1
diff changeset
  1085
  // There's alway an extra itable entry so we can null-terminate it.
4248c8e21063 6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents: 1
diff changeset
  1086
  guarantee(size_offset_table() >= 1, "too small");
4248c8e21063 6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents: 1
diff changeset
  1087
  int num_interfaces = size_offset_table() - 1;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1088
  if (num_interfaces > 0) {
51096
695dff91a997 8178712: ResourceMark may be missing inside initialize_[vi]table
lfoltan
parents: 50735
diff changeset
  1089
    ResourceMark rm(THREAD);
35463
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
  1090
    log_develop_debug(itables)("%3d: Initializing itables for %s", ++initialize_count,
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
  1091
                       _klass->name()->as_C_string());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1092
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1093
2264
55d0115a54fe 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 2136
diff changeset
  1094
    // Iterate through all interfaces
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1095
    int i;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1096
    for(i = 0; i < num_interfaces; i++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1097
      itableOffsetEntry* ioe = offset_entry(i);
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 9172
diff changeset
  1098
      HandleMark hm(THREAD);
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 41669
diff changeset
  1099
      Klass* interf = ioe->interface_klass();
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 41669
diff changeset
  1100
      assert(interf != NULL && ioe->offset() != 0, "bad offset entry in itable");
51329
9c68699bebe5 8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents: 51097
diff changeset
  1101
      initialize_itable_for_interface(ioe->offset(), InstanceKlass::cast(interf), checkconstraints, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1102
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1103
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1104
  }
189
4248c8e21063 6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents: 1
diff changeset
  1105
  // Check that the last entry is empty
4248c8e21063 6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents: 1
diff changeset
  1106
  itableOffsetEntry* ioe = offset_entry(size_offset_table() - 1);
4248c8e21063 6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents: 1
diff changeset
  1107
  guarantee(ioe->interface_klass() == NULL && ioe->offset() == 0, "terminator entry missing");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1108
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1109
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1110
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1111
inline bool interface_method_needs_itable_index(Method* m) {
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1112
  if (m->is_static())           return false;   // e.g., Stream.empty
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1113
  if (m->is_initializer())      return false;   // <init> or <clinit>
50735
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 50036
diff changeset
  1114
  if (m->is_private())          return false;   // uses direct call
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1115
  // If an interface redeclares a method from java.lang.Object,
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1116
  // it should already have a vtable index, don't touch it.
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1117
  // e.g., CharSequence.toString (from initialize_vtable)
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1118
  // if (m->has_vtable_index())  return false; // NO!
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1119
  return true;
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1120
}
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1121
51329
9c68699bebe5 8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents: 51097
diff changeset
  1122
int klassItable::assign_itable_indices_for_interface(InstanceKlass* klass, TRAPS) {
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1123
  // an interface does not have an itable, but its methods need to be numbered
51096
695dff91a997 8178712: ResourceMark may be missing inside initialize_[vi]table
lfoltan
parents: 50735
diff changeset
  1124
  ResourceMark rm(THREAD);
35463
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
  1125
  log_develop_debug(itables)("%3d: Initializing itable indices for interface %s",
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
  1126
                             ++initialize_count, klass->name()->as_C_string());
51329
9c68699bebe5 8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents: 51097
diff changeset
  1127
  Array<Method*>* methods = klass->methods();
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1128
  int nof_methods = methods->length();
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1129
  int ime_num = 0;
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1130
  for (int i = 0; i < nof_methods; i++) {
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1131
    Method* m = methods->at(i);
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1132
    if (interface_method_needs_itable_index(m)) {
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1133
      assert(!m->is_final_method(), "no final interface methods");
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1134
      // If m is already assigned a vtable index, do not disturb it.
35901
f5028c67e7cb 8147918: Rename develop_log_is_enabled() to log_develop_is_enabled()
pliden
parents: 35898
diff changeset
  1135
      if (log_develop_is_enabled(Trace, itables)) {
46701
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
  1136
        LogTarget(Trace, itables) lt;
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
  1137
        LogStream ls(lt);
35463
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
  1138
        assert(m != NULL, "methods can never be null");
b32e362563bb 8141564: Convert TraceItables and PrintVtables to Unified Logging
rprotacio
parents: 34666
diff changeset
  1139
        const char* sig = m->name_and_sig_as_C_string();
21556
e75cd34a59e0 8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents: 20391
diff changeset
  1140
        if (m->has_vtable_index()) {
46701
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
  1141
          ls.print("vtable index %d for method: %s, flags: ", m->vtable_index(), sig);
21556
e75cd34a59e0 8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents: 20391
diff changeset
  1142
        } else {
46701
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
  1143
          ls.print("itable index %d for method: %s, flags: ", ime_num, sig);
21556
e75cd34a59e0 8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents: 20391
diff changeset
  1144
        }
46701
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
  1145
        m->print_linkage_flags(&ls);
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
  1146
        ls.cr();
21556
e75cd34a59e0 8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents: 20391
diff changeset
  1147
      }
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1148
      if (!m->has_vtable_index()) {
39714
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
  1149
        // A shared method could have an initialized itable_index that
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
  1150
        // is < 0.
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
  1151
        assert(m->vtable_index() == Method::pending_itable_index ||
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
  1152
               m->is_shared(),
976b97b59d87 8153312: Constrain AppCDS behavior
jiangli
parents: 38259
diff changeset
  1153
               "set by initialize_vtable");
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1154
        m->set_itable_index(ime_num);
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1155
        // Progress to next itable entry
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1156
        ime_num++;
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1157
      }
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1158
    }
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1159
  }
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1160
  assert(ime_num == method_count_for_interface(klass), "proper sizing");
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1161
  return ime_num;
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1162
}
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1163
51329
9c68699bebe5 8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents: 51097
diff changeset
  1164
int klassItable::method_count_for_interface(InstanceKlass* interf) {
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1165
  assert(interf->is_interface(), "must be");
51329
9c68699bebe5 8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents: 51097
diff changeset
  1166
  Array<Method*>* methods = interf->methods();
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1167
  int nof_methods = methods->length();
30615
4713e7c7b96f 8030680: 292 cleanup from default method code assessment
acorn
parents: 29871
diff changeset
  1168
  int length = 0;
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1169
  while (nof_methods > 0) {
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1170
    Method* m = methods->at(nof_methods-1);
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1171
    if (m->has_itable_index()) {
30615
4713e7c7b96f 8030680: 292 cleanup from default method code assessment
acorn
parents: 29871
diff changeset
  1172
      length = m->itable_index() + 1;
4713e7c7b96f 8030680: 292 cleanup from default method code assessment
acorn
parents: 29871
diff changeset
  1173
      break;
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1174
    }
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1175
    nof_methods -= 1;
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1176
  }
30615
4713e7c7b96f 8030680: 292 cleanup from default method code assessment
acorn
parents: 29871
diff changeset
  1177
#ifdef ASSERT
4713e7c7b96f 8030680: 292 cleanup from default method code assessment
acorn
parents: 29871
diff changeset
  1178
  int nof_methods_copy = nof_methods;
4713e7c7b96f 8030680: 292 cleanup from default method code assessment
acorn
parents: 29871
diff changeset
  1179
  while (nof_methods_copy > 0) {
4713e7c7b96f 8030680: 292 cleanup from default method code assessment
acorn
parents: 29871
diff changeset
  1180
    Method* mm = methods->at(--nof_methods_copy);
4713e7c7b96f 8030680: 292 cleanup from default method code assessment
acorn
parents: 29871
diff changeset
  1181
    assert(!mm->has_itable_index() || mm->itable_index() < length, "");
4713e7c7b96f 8030680: 292 cleanup from default method code assessment
acorn
parents: 29871
diff changeset
  1182
  }
4713e7c7b96f 8030680: 292 cleanup from default method code assessment
acorn
parents: 29871
diff changeset
  1183
#endif //ASSERT
4713e7c7b96f 8030680: 292 cleanup from default method code assessment
acorn
parents: 29871
diff changeset
  1184
  // return the rightmost itable index, plus one; or 0 if no methods have
4713e7c7b96f 8030680: 292 cleanup from default method code assessment
acorn
parents: 29871
diff changeset
  1185
  // itable indices
4713e7c7b96f 8030680: 292 cleanup from default method code assessment
acorn
parents: 29871
diff changeset
  1186
  return length;
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1187
}
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1188
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1189
51329
9c68699bebe5 8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents: 51097
diff changeset
  1190
void klassItable::initialize_itable_for_interface(int method_table_offset, InstanceKlass* interf, bool checkconstraints, TRAPS) {
9c68699bebe5 8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents: 51097
diff changeset
  1191
  assert(interf->is_interface(), "must be");
9c68699bebe5 8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents: 51097
diff changeset
  1192
  Array<Method*>* methods = interf->methods();
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 9172
diff changeset
  1193
  int nof_methods = methods->length();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1194
  HandleMark hm;
51329
9c68699bebe5 8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents: 51097
diff changeset
  1195
  Handle interface_loader (THREAD, interf->class_loader());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1196
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 41669
diff changeset
  1197
  int ime_count = method_count_for_interface(interf);
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1198
  for (int i = 0; i < nof_methods; i++) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 9172
diff changeset
  1199
    Method* m = methods->at(i);
59056
15936b142f86 8233913: Remove implicit conversion from Method* to methodHandle
coleenp
parents: 58575
diff changeset
  1200
    Method* target = NULL;
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1201
    if (m->has_itable_index()) {
22232
26acfad336c0 8027804: JCK resolveMethod test fails expecting AbstractMethodError
hseigel
parents: 21913
diff changeset
  1202
      // This search must match the runtime resolution, i.e. selection search for invokeinterface
50735
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 50036
diff changeset
  1203
      // to correctly enforce loader constraints for interface method inheritance.
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 50036
diff changeset
  1204
      // Private methods are skipped as a private class method can never be the implementation
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 50036
diff changeset
  1205
      // of an interface method.
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 50036
diff changeset
  1206
      // Invokespecial does not perform selection based on the receiver, so it does not use
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 50036
diff changeset
  1207
      // the cached itable.
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 50036
diff changeset
  1208
      target = LinkResolver::lookup_instance_method_in_klasses(_klass, m->name(), m->signature(),
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 50036
diff changeset
  1209
                                                               Klass::skip_private, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1210
    }
47554
bc112140e089 8186092: Unnecessary loader constraints produced when there are multiple defaults
hseigel
parents: 47216
diff changeset
  1211
    if (target == NULL || !target->is_public() || target->is_abstract() || target->is_overpass()) {
bc112140e089 8186092: Unnecessary loader constraints produced when there are multiple defaults
hseigel
parents: 47216
diff changeset
  1212
      assert(target == NULL || !target->is_overpass() || target->is_public(),
bc112140e089 8186092: Unnecessary loader constraints produced when there are multiple defaults
hseigel
parents: 47216
diff changeset
  1213
             "Non-public overpass method!");
bc112140e089 8186092: Unnecessary loader constraints produced when there are multiple defaults
hseigel
parents: 47216
diff changeset
  1214
      // Entry does not resolve. Leave it empty for AbstractMethodError or other error.
bc112140e089 8186092: Unnecessary loader constraints produced when there are multiple defaults
hseigel
parents: 47216
diff changeset
  1215
      if (!(target == NULL) && !target->is_public()) {
bc112140e089 8186092: Unnecessary loader constraints produced when there are multiple defaults
hseigel
parents: 47216
diff changeset
  1216
        // Stuff an IllegalAccessError throwing method in there instead.
bc112140e089 8186092: Unnecessary loader constraints produced when there are multiple defaults
hseigel
parents: 47216
diff changeset
  1217
        itableOffsetEntry::method_entry(_klass, method_table_offset)[m->itable_index()].
bc112140e089 8186092: Unnecessary loader constraints produced when there are multiple defaults
hseigel
parents: 47216
diff changeset
  1218
            initialize(Universe::throw_illegal_access_error());
bc112140e089 8186092: Unnecessary loader constraints produced when there are multiple defaults
hseigel
parents: 47216
diff changeset
  1219
      }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1220
    } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1221
      // Entry did resolve, check loader constraints before initializing
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1222
      // if checkconstraints requested
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1223
      if (checkconstraints) {
14391
df0a1573d5bd 8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents: 14385
diff changeset
  1224
        Handle method_holder_loader (THREAD, target->method_holder()->class_loader());
59056
15936b142f86 8233913: Remove implicit conversion from Method* to methodHandle
coleenp
parents: 58575
diff changeset
  1225
        InstanceKlass* method_holder = target->method_holder();
58177
4932dce35882 8230841: Remove oopDesc::equals()
pliden
parents: 55655
diff changeset
  1226
        if (method_holder_loader() != interface_loader()) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1227
          ResourceMark rm(THREAD);
16591
73047b0eb568 8009731: Confusing error message for loader constraint violation
acorn
parents: 15591
diff changeset
  1228
          Symbol* failed_type_symbol =
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1229
            SystemDictionary::check_signature_loaders(m->signature(),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1230
                                                      method_holder_loader,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1231
                                                      interface_loader,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1232
                                                      true, CHECK);
16591
73047b0eb568 8009731: Confusing error message for loader constraint violation
acorn
parents: 15591
diff changeset
  1233
          if (failed_type_symbol != NULL) {
51097
bef02342d179 8205611: Improve the wording of LinkageErrors to include module and class loader information
lfoltan
parents: 51096
diff changeset
  1234
            stringStream ss;
bef02342d179 8205611: Improve the wording of LinkageErrors to include module and class loader information
lfoltan
parents: 51096
diff changeset
  1235
            ss.print("loader constraint violation in interface itable"
54432
532e88de77eb 8221470: Print methods in exception messages in java-like Syntax.
goetz
parents: 53904
diff changeset
  1236
                     " initialization for class %s: when selecting method '",
532e88de77eb 8221470: Print methods in exception messages in java-like Syntax.
goetz
parents: 53904
diff changeset
  1237
                     _klass->external_name());
532e88de77eb 8221470: Print methods in exception messages in java-like Syntax.
goetz
parents: 53904
diff changeset
  1238
            m->print_external_name(&ss),
532e88de77eb 8221470: Print methods in exception messages in java-like Syntax.
goetz
parents: 53904
diff changeset
  1239
            ss.print("' the class loader %s for super interface %s, and the class"
532e88de77eb 8221470: Print methods in exception messages in java-like Syntax.
goetz
parents: 53904
diff changeset
  1240
                     " loader %s of the selected method's %s, %s have"
51097
bef02342d179 8205611: Improve the wording of LinkageErrors to include module and class loader information
lfoltan
parents: 51096
diff changeset
  1241
                     " different Class objects for the type %s used in the signature (%s; %s)",
bef02342d179 8205611: Improve the wording of LinkageErrors to include module and class loader information
lfoltan
parents: 51096
diff changeset
  1242
                     interf->class_loader_data()->loader_name_and_id(),
bef02342d179 8205611: Improve the wording of LinkageErrors to include module and class loader information
lfoltan
parents: 51096
diff changeset
  1243
                     interf->external_name(),
59056
15936b142f86 8233913: Remove implicit conversion from Method* to methodHandle
coleenp
parents: 58575
diff changeset
  1244
                     method_holder->class_loader_data()->loader_name_and_id(),
15936b142f86 8233913: Remove implicit conversion from Method* to methodHandle
coleenp
parents: 58575
diff changeset
  1245
                     method_holder->external_kind(),
15936b142f86 8233913: Remove implicit conversion from Method* to methodHandle
coleenp
parents: 58575
diff changeset
  1246
                     method_holder->external_name(),
51097
bef02342d179 8205611: Improve the wording of LinkageErrors to include module and class loader information
lfoltan
parents: 51096
diff changeset
  1247
                     failed_type_symbol->as_klass_external_name(),
bef02342d179 8205611: Improve the wording of LinkageErrors to include module and class loader information
lfoltan
parents: 51096
diff changeset
  1248
                     interf->class_in_module_of_loader(false, true),
59056
15936b142f86 8233913: Remove implicit conversion from Method* to methodHandle
coleenp
parents: 58575
diff changeset
  1249
                     method_holder->class_in_module_of_loader(false, true));
51097
bef02342d179 8205611: Improve the wording of LinkageErrors to include module and class loader information
lfoltan
parents: 51096
diff changeset
  1250
            THROW_MSG(vmSymbols::java_lang_LinkageError(), ss.as_string());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1251
          }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1252
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1253
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1254
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1255
      // ime may have moved during GC so recalculate address
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1256
      int ime_num = m->itable_index();
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1257
      assert(ime_num < ime_count, "oob");
59056
15936b142f86 8233913: Remove implicit conversion from Method* to methodHandle
coleenp
parents: 58575
diff changeset
  1258
      itableOffsetEntry::method_entry(_klass, method_table_offset)[ime_num].initialize(target);
35901
f5028c67e7cb 8147918: Rename develop_log_is_enabled() to log_develop_is_enabled()
pliden
parents: 35898
diff changeset
  1259
      if (log_develop_is_enabled(Trace, itables)) {
20391
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
  1260
        ResourceMark rm(THREAD);
59056
15936b142f86 8233913: Remove implicit conversion from Method* to methodHandle
coleenp
parents: 58575
diff changeset
  1261
        if (target != NULL) {
46701
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
  1262
          LogTarget(Trace, itables) lt;
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
  1263
          LogStream ls(lt);
59056
15936b142f86 8233913: Remove implicit conversion from Method* to methodHandle
coleenp
parents: 58575
diff changeset
  1264
          char* sig = target->name_and_sig_as_C_string();
46701
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
  1265
          ls.print("interface: %s, ime_num: %d, target: %s, method_holder: %s ",
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 41669
diff changeset
  1266
                       interf->internal_name(), ime_num, sig,
59056
15936b142f86 8233913: Remove implicit conversion from Method* to methodHandle
coleenp
parents: 58575
diff changeset
  1267
                       target->method_holder()->internal_name());
46701
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
  1268
          ls.print("target_method flags: ");
59056
15936b142f86 8233913: Remove implicit conversion from Method* to methodHandle
coleenp
parents: 58575
diff changeset
  1269
          target->print_linkage_flags(&ls);
46701
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46560
diff changeset
  1270
          ls.cr();
20391
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
  1271
        }
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
  1272
      }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1273
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1274
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1275
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1276
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1277
#if INCLUDE_JVMTI
29316
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 28731
diff changeset
  1278
// search the itable for uses of either obsolete or EMCP methods
53904
9c3fe09f69bc 8078725: method adjustments can be done just once for all classes involved into redefinition
coleenp
parents: 52276
diff changeset
  1279
void klassItable::adjust_method_entries(bool * trace_name_printed) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1280
29316
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 28731
diff changeset
  1281
  itableMethodEntry* ime = method_entry(0);
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 28731
diff changeset
  1282
  for (int i = 0; i < _size_method_table; i++, ime++) {
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 28731
diff changeset
  1283
    Method* old_method = ime->method();
53904
9c3fe09f69bc 8078725: method adjustments can be done just once for all classes involved into redefinition
coleenp
parents: 52276
diff changeset
  1284
    if (old_method == NULL || !old_method->is_old()) {
29316
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 28731
diff changeset
  1285
      continue; // skip uninteresting entries
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 28731
diff changeset
  1286
    }
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 28731
diff changeset
  1287
    assert(!old_method->is_deleted(), "itable methods may not be deleted");
53904
9c3fe09f69bc 8078725: method adjustments can be done just once for all classes involved into redefinition
coleenp
parents: 52276
diff changeset
  1288
    Method* new_method = old_method->get_new_method();
29316
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 28731
diff changeset
  1289
    ime->initialize(new_method);
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 28731
diff changeset
  1290
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 37242
diff changeset
  1291
    if (log_is_enabled(Info, redefine, class, update)) {
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 37242
diff changeset
  1292
      ResourceMark rm;
29316
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 28731
diff changeset
  1293
      if (!(*trace_name_printed)) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 37242
diff changeset
  1294
        log_info(redefine, class, update)("adjust: name=%s", old_method->method_holder()->external_name());
29316
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 28731
diff changeset
  1295
        *trace_name_printed = true;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1296
      }
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 37242
diff changeset
  1297
      log_trace(redefine, class, update, itables)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 37242
diff changeset
  1298
        ("itable method update: %s(%s)", new_method->name()->as_C_string(), new_method->signature()->as_C_string());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1299
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1300
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1301
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1302
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1303
// an itable should never contain old or obsolete methods
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1304
bool klassItable::check_no_old_or_obsolete_entries() {
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1305
  itableMethodEntry* ime = method_entry(0);
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1306
  for (int i = 0; i < _size_method_table; i++) {
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1307
    Method* m = ime->method();
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1308
    if (m != NULL &&
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1309
        (NOT_PRODUCT(!m->is_valid() ||) m->is_old() || m->is_obsolete())) {
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1310
      return false;
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1311
    }
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1312
    ime++;
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1313
  }
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1314
  return true;
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1315
}
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1316
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1317
void klassItable::dump_itable() {
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1318
  itableMethodEntry* ime = method_entry(0);
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1319
  tty->print_cr("itable dump --");
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1320
  for (int i = 0; i < _size_method_table; i++) {
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1321
    Method* m = ime->method();
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1322
    if (m != NULL) {
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1323
      tty->print("      (%5d)  ", i);
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1324
      m->access_flags().print_on(tty);
20391
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
  1325
      if (m->is_default_method()) {
21556
e75cd34a59e0 8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents: 20391
diff changeset
  1326
        tty->print("default ");
20391
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20284
diff changeset
  1327
      }
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1328
      tty->print(" --  ");
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1329
      m->print_name(tty);
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1330
      tty->cr();
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1331
    }
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1332
    ime++;
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1333
  }
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1334
}
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1335
#endif // INCLUDE_JVMTI
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 14488
diff changeset
  1336
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1337
// Setup
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1338
class InterfaceVisiterClosure : public StackObj {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1339
 public:
51329
9c68699bebe5 8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents: 51097
diff changeset
  1340
  virtual void doit(InstanceKlass* intf, int method_count) = 0;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1341
};
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1342
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1343
// Visit all interfaces with at least one itable method
51329
9c68699bebe5 8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents: 51097
diff changeset
  1344
void visit_all_interfaces(Array<InstanceKlass*>* transitive_intf, InterfaceVisiterClosure *blk) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1345
  // Handle array argument
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1346
  for(int i = 0; i < transitive_intf->length(); i++) {
51329
9c68699bebe5 8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents: 51097
diff changeset
  1347
    InstanceKlass* intf = transitive_intf->at(i);
14488
ab48109f7d1b 8001471: Klass::cast() does nothing
hseigel
parents: 14391
diff changeset
  1348
    assert(intf->is_interface(), "sanity check");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1349
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1350
    // Find no. of itable methods
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1351
    int method_count = 0;
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1352
    // method_count = klassItable::method_count_for_interface(intf);
51329
9c68699bebe5 8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents: 51097
diff changeset
  1353
    Array<Method*>* methods = intf->methods();
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1354
    if (methods->length() > 0) {
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1355
      for (int i = methods->length(); --i >= 0; ) {
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1356
        if (interface_method_needs_itable_index(methods->at(i))) {
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1357
          method_count++;
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 17092
diff changeset
  1358
        }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1359
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1360
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1361
48557
2e867226b914 8174962: Better interface invocations
vlivanov
parents: 47765
diff changeset
  1362
    // Visit all interfaces which either have any methods or can participate in receiver type check.
2e867226b914 8174962: Better interface invocations
vlivanov
parents: 47765
diff changeset
  1363
    // We do not bother to count methods in transitive interfaces, although that would allow us to skip
2e867226b914 8174962: Better interface invocations
vlivanov
parents: 47765
diff changeset
  1364
    // this step in the rare case of a zero-method interface extending another zero-method interface.
51329
9c68699bebe5 8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents: 51097
diff changeset
  1365
    if (method_count > 0 || intf->transitive_interfaces()->length() > 0) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1366
      blk->doit(intf, method_count);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1367
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1368
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1369
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1370
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1371
class CountInterfacesClosure : public InterfaceVisiterClosure {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1372
 private:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1373
  int _nof_methods;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1374
  int _nof_interfaces;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1375
 public:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1376
   CountInterfacesClosure() { _nof_methods = 0; _nof_interfaces = 0; }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1377
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1378
   int nof_methods() const    { return _nof_methods; }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1379
   int nof_interfaces() const { return _nof_interfaces; }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1380
51329
9c68699bebe5 8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents: 51097
diff changeset
  1381
   void doit(InstanceKlass* intf, int method_count) { _nof_methods += method_count; _nof_interfaces++; }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1382
};
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1383
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1384
class SetupItableClosure : public InterfaceVisiterClosure  {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1385
 private:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1386
  itableOffsetEntry* _offset_entry;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1387
  itableMethodEntry* _method_entry;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1388
  address            _klass_begin;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1389
 public:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1390
  SetupItableClosure(address klass_begin, itableOffsetEntry* offset_entry, itableMethodEntry* method_entry) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1391
    _klass_begin  = klass_begin;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1392
    _offset_entry = offset_entry;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1393
    _method_entry = method_entry;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1394
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1395
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1396
  itableMethodEntry* method_entry() const { return _method_entry; }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1397
51329
9c68699bebe5 8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents: 51097
diff changeset
  1398
  void doit(InstanceKlass* intf, int method_count) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1399
    int offset = ((address)_method_entry) - _klass_begin;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1400
    _offset_entry->initialize(intf, offset);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1401
    _offset_entry++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1402
    _method_entry += method_count;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1403
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1404
};
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1405
51329
9c68699bebe5 8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents: 51097
diff changeset
  1406
int klassItable::compute_itable_size(Array<InstanceKlass*>* transitive_interfaces) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1407
  // Count no of interfaces and total number of interface methods
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1408
  CountInterfacesClosure cic;
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 9172
diff changeset
  1409
  visit_all_interfaces(transitive_interfaces, &cic);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1410
189
4248c8e21063 6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents: 1
diff changeset
  1411
  // There's alway an extra itable entry so we can null-terminate it.
4248c8e21063 6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents: 1
diff changeset
  1412
  int itable_size = calc_itable_size(cic.nof_interfaces() + 1, cic.nof_methods());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1413
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1414
  // Statistics
35898
ddc274f0052f 8145628: hotspot metadata classes shouldn't use HeapWordSize or heap related macros like align_object_size
coleenp
parents: 35492
diff changeset
  1415
  update_stats(itable_size * wordSize);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1416
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1417
  return itable_size;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1418
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1419
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1420
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1421
// Fill out offset table and interface klasses into the itable space
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 41669
diff changeset
  1422
void klassItable::setup_itable_offset_table(InstanceKlass* klass) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1423
  if (klass->itable_length() == 0) return;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1424
  assert(!klass->is_interface(), "Should have zero length itable");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1425
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1426
  // Count no of interfaces and total number of interface methods
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1427
  CountInterfacesClosure cic;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1428
  visit_all_interfaces(klass->transitive_interfaces(), &cic);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1429
  int nof_methods    = cic.nof_methods();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1430
  int nof_interfaces = cic.nof_interfaces();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1431
189
4248c8e21063 6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents: 1
diff changeset
  1432
  // Add one extra entry so we can null-terminate the table
4248c8e21063 6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents: 1
diff changeset
  1433
  nof_interfaces++;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1434
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 9172
diff changeset
  1435
  assert(compute_itable_size(klass->transitive_interfaces()) ==
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1436
         calc_itable_size(nof_interfaces, nof_methods),
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1437
         "mismatch calculation of itable size");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1438
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1439
  // Fill-out offset table
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1440
  itableOffsetEntry* ioe = (itableOffsetEntry*)klass->start_of_itable();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1441
  itableMethodEntry* ime = (itableMethodEntry*)(ioe + nof_interfaces);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1442
  intptr_t* end               = klass->end_of_itable();
8725
8c1e3dd5fe1b 7017732: move static fields into Class to prepare for perm gen removal
never
parents: 8653
diff changeset
  1443
  assert((oop*)(ime + nof_methods) <= (oop*)klass->start_of_nonstatic_oop_maps(), "wrong offset calculation (1)");
360
21d113ecbf6a 6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents: 189
diff changeset
  1444
  assert((oop*)(end) == (oop*)(ime + nof_methods),                      "wrong offset calculation (2)");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1445
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1446
  // Visit all interfaces and initialize itable offset table
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 41669
diff changeset
  1447
  SetupItableClosure sic((address)klass, ioe, ime);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1448
  visit_all_interfaces(klass->transitive_interfaces(), &sic);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1449
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1450
#ifdef ASSERT
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1451
  ime  = sic.method_entry();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1452
  oop* v = (oop*) klass->end_of_itable();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1453
  assert( (oop*)(ime) == v, "wrong offset calculation (2)");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1454
#endif
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1455
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1456
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1457
void klassVtable::verify(outputStream* st, bool forced) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1458
  // make sure table is initialized
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1459
  if (!Universe::is_fully_initialized()) return;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1460
#ifndef PRODUCT
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1461
  // avoid redundant verifies
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1462
  if (!forced && _verify_count == Universe::verify_count()) return;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1463
  _verify_count = Universe::verify_count();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1464
#endif
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 41669
diff changeset
  1465
  oop* end_of_obj = (oop*)_klass + _klass->size();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1466
  oop* end_of_vtable = (oop *)&table()[_length];
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1467
  if (end_of_vtable > end_of_obj) {
51096
695dff91a997 8178712: ResourceMark may be missing inside initialize_[vi]table
lfoltan
parents: 50735
diff changeset
  1468
    ResourceMark rm;
33105
294e48b4f704 8080775: Better argument formatting for assert() and friends
david
parents: 32189
diff changeset
  1469
    fatal("klass %s: klass object too short (vtable extends beyond end)",
294e48b4f704 8080775: Better argument formatting for assert() and friends
david
parents: 32189
diff changeset
  1470
          _klass->internal_name());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1471
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1472
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1473
  for (int i = 0; i < _length; i++) table()[i].verify(this, st);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1474
  // verify consistency with superKlass vtable
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 9172
diff changeset
  1475
  Klass* super = _klass->super();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1476
  if (super != NULL) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 9172
diff changeset
  1477
    InstanceKlass* sk = InstanceKlass::cast(super);
46408
70aab0c2ea8b 8178350: klassVtable and klassItable should be ValueObj
iklam
parents: 46329
diff changeset
  1478
    klassVtable vt = sk->vtable();
70aab0c2ea8b 8178350: klassVtable and klassItable should be ValueObj
iklam
parents: 46329
diff changeset
  1479
    for (int i = 0; i < vt.length(); i++) {
70aab0c2ea8b 8178350: klassVtable and klassItable should be ValueObj
iklam
parents: 46329
diff changeset
  1480
      verify_against(st, &vt, i);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1481
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1482
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1483
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1484
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1485
void klassVtable::verify_against(outputStream* st, klassVtable* vt, int index) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1486
  vtableEntry* vte = &vt->table()[index];
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1487
  if (vte->method()->name()      != table()[index].method()->name() ||
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1488
      vte->method()->signature() != table()[index].method()->signature()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1489
    fatal("mismatched name/signature of vtable entries");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1490
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1491
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1492
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1493
#ifndef PRODUCT
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1494
void klassVtable::print() {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1495
  ResourceMark rm;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1496
  tty->print("klassVtable for klass %s (length %d):\n", _klass->internal_name(), length());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1497
  for (int i = 0; i < length(); i++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1498
    table()[i].print();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1499
    tty->cr();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1500
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1501
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1502
#endif
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1503
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1504
void vtableEntry::verify(klassVtable* vt, outputStream* st) {
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 41669
diff changeset
  1505
  Klass* vtklass = vt->klass();
40633
c33ad2ff51de 8163808: Fix asserts and logging for old classfile vtable construction
acorn
parents: 39714
diff changeset
  1506
  if (vtklass->is_instance_klass() &&
c33ad2ff51de 8163808: Fix asserts and logging for old classfile vtable construction
acorn
parents: 39714
diff changeset
  1507
     (InstanceKlass::cast(vtklass)->major_version() >= klassVtable::VTABLE_TRANSITIVE_OVERRIDE_VERSION)) {
c33ad2ff51de 8163808: Fix asserts and logging for old classfile vtable construction
acorn
parents: 39714
diff changeset
  1508
    assert(method() != NULL, "must have set method");
c33ad2ff51de 8163808: Fix asserts and logging for old classfile vtable construction
acorn
parents: 39714
diff changeset
  1509
  }
c33ad2ff51de 8163808: Fix asserts and logging for old classfile vtable construction
acorn
parents: 39714
diff changeset
  1510
  if (method() != NULL) {
c33ad2ff51de 8163808: Fix asserts and logging for old classfile vtable construction
acorn
parents: 39714
diff changeset
  1511
    method()->verify();
c33ad2ff51de 8163808: Fix asserts and logging for old classfile vtable construction
acorn
parents: 39714
diff changeset
  1512
    // we sub_type, because it could be a miranda method
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 41669
diff changeset
  1513
    if (!vtklass->is_subtype_of(method()->method_holder())) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1514
#ifndef PRODUCT
40633
c33ad2ff51de 8163808: Fix asserts and logging for old classfile vtable construction
acorn
parents: 39714
diff changeset
  1515
      print();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1516
#endif
40633
c33ad2ff51de 8163808: Fix asserts and logging for old classfile vtable construction
acorn
parents: 39714
diff changeset
  1517
      fatal("vtableEntry " PTR_FORMAT ": method is from subclass", p2i(this));
c33ad2ff51de 8163808: Fix asserts and logging for old classfile vtable construction
acorn
parents: 39714
diff changeset
  1518
    }
c33ad2ff51de 8163808: Fix asserts and logging for old classfile vtable construction
acorn
parents: 39714
diff changeset
  1519
 }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1520
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1521
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1522
#ifndef PRODUCT
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1523
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1524
void vtableEntry::print() {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1525
  ResourceMark rm;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1526
  tty->print("vtableEntry %s: ", method()->name()->as_C_string());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1527
  if (Verbose) {
33148
68fa8b6c4340 8042893: compiler: PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC needs to be removed from source files
david
parents: 33105
diff changeset
  1528
    tty->print("m " PTR_FORMAT " ", p2i(method()));
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1529
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1530
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1531
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1532
class VtableStats : AllStatic {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1533
 public:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1534
  static int no_klasses;                // # classes with vtables
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1535
  static int no_array_klasses;          // # array classes
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1536
  static int no_instance_klasses;       // # instanceKlasses
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1537
  static int sum_of_vtable_len;         // total # of vtable entries
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1538
  static int sum_of_array_vtable_len;   // total # of vtable entries in array klasses only
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1539
  static int fixed;                     // total fixed overhead in bytes
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1540
  static int filler;                    // overhead caused by filler bytes
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1541
  static int entries;                   // total bytes consumed by vtable entries
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1542
  static int array_entries;             // total bytes consumed by array vtable entries
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1543
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 9172
diff changeset
  1544
  static void do_class(Klass* k) {
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 9172
diff changeset
  1545
    Klass* kl = k;
46408
70aab0c2ea8b 8178350: klassVtable and klassItable should be ValueObj
iklam
parents: 46329
diff changeset
  1546
    klassVtable vt = kl->vtable();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1547
    no_klasses++;
33611
9abd65805e19 8139203: Consistent naming for klass type predicates
coleenp
parents: 33602
diff changeset
  1548
    if (kl->is_instance_klass()) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1549
      no_instance_klasses++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1550
      kl->array_klasses_do(do_class);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1551
    }
33611
9abd65805e19 8139203: Consistent naming for klass type predicates
coleenp
parents: 33602
diff changeset
  1552
    if (kl->is_array_klass()) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1553
      no_array_klasses++;
46408
70aab0c2ea8b 8178350: klassVtable and klassItable should be ValueObj
iklam
parents: 46329
diff changeset
  1554
      sum_of_array_vtable_len += vt.length();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1555
    }
46408
70aab0c2ea8b 8178350: klassVtable and klassItable should be ValueObj
iklam
parents: 46329
diff changeset
  1556
    sum_of_vtable_len += vt.length();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1557
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1558
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1559
  static void compute() {
51608
625a5bdde0c5 8210155: Lock ClassLoaderDataGraph
coleenp
parents: 51329
diff changeset
  1560
    LockedClassesDo locked_do_class(&do_class);
625a5bdde0c5 8210155: Lock ClassLoaderDataGraph
coleenp
parents: 51329
diff changeset
  1561
    ClassLoaderDataGraph::classes_do(&locked_do_class);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1562
    fixed  = no_klasses * oopSize;      // vtable length
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1563
    // filler size is a conservative approximation
13952
e3cf184080bc 8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents: 13728
diff changeset
  1564
    filler = oopSize * (no_klasses - no_instance_klasses) * (sizeof(InstanceKlass) - sizeof(ArrayKlass) - 1);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1565
    entries = sizeof(vtableEntry) * sum_of_vtable_len;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1566
    array_entries = sizeof(vtableEntry) * sum_of_array_vtable_len;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1567
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1568
};
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1569
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1570
int VtableStats::no_klasses = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1571
int VtableStats::no_array_klasses = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1572
int VtableStats::no_instance_klasses = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1573
int VtableStats::sum_of_vtable_len = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1574
int VtableStats::sum_of_array_vtable_len = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1575
int VtableStats::fixed = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1576
int VtableStats::filler = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1577
int VtableStats::entries = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1578
int VtableStats::array_entries = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1579
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1580
void klassVtable::print_statistics() {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1581
  ResourceMark rm;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1582
  HandleMark hm;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1583
  VtableStats::compute();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1584
  tty->print_cr("vtable statistics:");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1585
  tty->print_cr("%6d classes (%d instance, %d array)", VtableStats::no_klasses, VtableStats::no_instance_klasses, VtableStats::no_array_klasses);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1586
  int total = VtableStats::fixed + VtableStats::filler + VtableStats::entries;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1587
  tty->print_cr("%6d bytes fixed overhead (refs + vtable object header)", VtableStats::fixed);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1588
  tty->print_cr("%6d bytes filler overhead", VtableStats::filler);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1589
  tty->print_cr("%6d bytes for vtable entries (%d for arrays)", VtableStats::entries, VtableStats::array_entries);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1590
  tty->print_cr("%6d bytes total", total);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1591
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1592
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1593
int  klassItable::_total_classes;   // Total no. of classes with itables
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1594
long klassItable::_total_size;      // Total no. of bytes used for itables
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1595
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1596
void klassItable::print_statistics() {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1597
 tty->print_cr("itable statistics:");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1598
 tty->print_cr("%6d classes with itables", _total_classes);
33148
68fa8b6c4340 8042893: compiler: PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC needs to be removed from source files
david
parents: 33105
diff changeset
  1599
 tty->print_cr("%6lu K uses for itables (average by class: %ld bytes)", _total_size / K, _total_size / _total_classes);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1600
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1601
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1602
#endif // PRODUCT