author | coleenp |
Wed, 23 Dec 2015 20:07:39 +0000 | |
changeset 35222 | fc89375d788d |
parent 34666 | 1c7168ea0034 |
child 35219 | b9ef87beb87c |
permissions | -rw-r--r-- |
1 | 1 |
/* |
28741
1f10b1bd612d
8008678: JSR 292: constant pool reconstitution must support pseudo strings
sspitsyn
parents:
27680
diff
changeset
|
2 |
* Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. |
1 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
7 |
* published by the Free Software Foundation. |
|
8 |
* |
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
13 |
* accompanied this code). |
|
14 |
* |
|
15 |
* You should have received a copy of the GNU General Public License version |
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
18 |
* |
|
5547
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
4571
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
4571
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:
4571
diff
changeset
|
21 |
* questions. |
1 | 22 |
* |
23 |
*/ |
|
24 |
||
7397 | 25 |
#include "precompiled.hpp" |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
26 |
#include "classfile/classLoaderData.hpp" |
29081
c61eb4914428
8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents:
28741
diff
changeset
|
27 |
#include "classfile/javaClasses.inline.hpp" |
15430
7c35f12cf1e5
8006040: NPG: on_stack processing wastes space in ConstantPool
coleenp
parents:
15229
diff
changeset
|
28 |
#include "classfile/metadataOnStackMark.hpp" |
24426
0a69c8cdfca9
8038654: Separate SymbolTable and StringTable code
gziemski
parents:
24334
diff
changeset
|
29 |
#include "classfile/stringTable.hpp" |
7397 | 30 |
#include "classfile/systemDictionary.hpp" |
31 |
#include "classfile/vmSymbols.hpp" |
|
32 |
#include "interpreter/linkResolver.hpp" |
|
15437 | 33 |
#include "memory/heapInspection.hpp" |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
34 |
#include "memory/metadataFactory.hpp" |
7397 | 35 |
#include "memory/oopFactory.hpp" |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
36 |
#include "oops/constantPool.hpp" |
7397 | 37 |
#include "oops/instanceKlass.hpp" |
38 |
#include "oops/objArrayKlass.hpp" |
|
29081
c61eb4914428
8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents:
28741
diff
changeset
|
39 |
#include "oops/objArrayOop.inline.hpp" |
c61eb4914428
8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents:
28741
diff
changeset
|
40 |
#include "oops/oop.inline.hpp" |
7397 | 41 |
#include "runtime/fieldType.hpp" |
42 |
#include "runtime/init.hpp" |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
43 |
#include "runtime/javaCalls.hpp" |
7397 | 44 |
#include "runtime/signature.hpp" |
45 |
#include "runtime/vframe.hpp" |
|
29081
c61eb4914428
8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents:
28741
diff
changeset
|
46 |
#include "utilities/copy.hpp" |
1 | 47 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
48 |
ConstantPool* ConstantPool::allocate(ClassLoaderData* loader_data, int length, TRAPS) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
49 |
// Tags are RW but comment below applies to tags also. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
50 |
Array<u1>* tags = MetadataFactory::new_writeable_array<u1>(loader_data, length, 0, CHECK_NULL); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
51 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
52 |
int size = ConstantPool::size(length); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
53 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
54 |
// CDS considerations: |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
55 |
// Allocate read-write but may be able to move to read-only at dumping time |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
56 |
// if all the klasses are resolved. The only other field that is writable is |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
57 |
// the resolved_references array, which is recreated at startup time. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
58 |
// But that could be moved to InstanceKlass (although a pain to access from |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
59 |
// assembly code). Maybe it could be moved to the cpCache which is RW. |
17858
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17833
diff
changeset
|
60 |
return new (loader_data, size, false, MetaspaceObj::ConstantPoolType, THREAD) ConstantPool(tags); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
61 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
62 |
|
34666 | 63 |
#ifdef ASSERT |
15430
7c35f12cf1e5
8006040: NPG: on_stack processing wastes space in ConstantPool
coleenp
parents:
15229
diff
changeset
|
64 |
|
34666 | 65 |
// MetaspaceObj allocation invariant is calloc equivalent memory |
66 |
// simple verification of this here (JVM_CONSTANT_Invalid == 0 ) |
|
67 |
static bool tag_array_is_zero_initialized(Array<u1>* tags) { |
|
68 |
assert(tags != NULL, "invariant"); |
|
69 |
const int length = tags->length(); |
|
70 |
for (int index = 0; index < length; ++index) { |
|
71 |
if (JVM_CONSTANT_Invalid != tags->at(index)) { |
|
72 |
return false; |
|
73 |
} |
|
74 |
} |
|
75 |
return true; |
|
76 |
} |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
77 |
|
34666 | 78 |
#endif |
79 |
||
80 |
ConstantPool::ConstantPool(Array<u1>* tags) : |
|
81 |
_tags(tags), |
|
82 |
_length(tags->length()) { |
|
83 |
||
84 |
assert(_tags != NULL, "invariant"); |
|
85 |
assert(tags->length() == _length, "invariant"); |
|
86 |
assert(tag_array_is_zero_initialized(tags), "invariant"); |
|
87 |
assert(0 == _flags, "invariant"); |
|
88 |
assert(0 == version(), "invariant"); |
|
89 |
assert(NULL == _pool_holder, "invariant"); |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
90 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
91 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
92 |
void ConstantPool::deallocate_contents(ClassLoaderData* loader_data) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
93 |
MetadataFactory::free_metadata(loader_data, cache()); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
94 |
set_cache(NULL); |
22750
a3c879b18f22
8033528: assert(0 <= i && i < length()) failed: index out of bounds
coleenp
parents:
22539
diff
changeset
|
95 |
MetadataFactory::free_array<u2>(loader_data, reference_map()); |
a3c879b18f22
8033528: assert(0 <= i && i < length()) failed: index out of bounds
coleenp
parents:
22539
diff
changeset
|
96 |
set_reference_map(NULL); |
a3c879b18f22
8033528: assert(0 <= i && i < length()) failed: index out of bounds
coleenp
parents:
22539
diff
changeset
|
97 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
98 |
MetadataFactory::free_array<jushort>(loader_data, operands()); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
99 |
set_operands(NULL); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
100 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
101 |
release_C_heap_structures(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
102 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
103 |
// free tag array |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
104 |
MetadataFactory::free_array<u1>(loader_data, tags()); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
105 |
set_tags(NULL); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
106 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
107 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
108 |
void ConstantPool::release_C_heap_structures() { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
109 |
// walk constant pool and decrement symbol reference counts |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
110 |
unreference_symbols(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
111 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
112 |
|
31046
d01ad7a0ecb0
8081320: Backout JDK-8059340: ConstantPool::_resolved_references is missing in heap dump
vlivanov
parents:
31038
diff
changeset
|
113 |
objArrayOop ConstantPool::resolved_references() const { |
d01ad7a0ecb0
8081320: Backout JDK-8059340: ConstantPool::_resolved_references is missing in heap dump
vlivanov
parents:
31038
diff
changeset
|
114 |
return (objArrayOop)JNIHandles::resolve(_resolved_references); |
d01ad7a0ecb0
8081320: Backout JDK-8059340: ConstantPool::_resolved_references is missing in heap dump
vlivanov
parents:
31038
diff
changeset
|
115 |
} |
d01ad7a0ecb0
8081320: Backout JDK-8059340: ConstantPool::_resolved_references is missing in heap dump
vlivanov
parents:
31038
diff
changeset
|
116 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
117 |
// Create resolved_references array and mapping array for original cp indexes |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
118 |
// The ldc bytecode was rewritten to have the resolved reference array index so need a way |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
119 |
// to map it back for resolving and some unlikely miscellaneous uses. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
120 |
// The objects created by invokedynamic are appended to this list. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
121 |
void ConstantPool::initialize_resolved_references(ClassLoaderData* loader_data, |
33232
75e0112d3eb5
8140452: Internal Error memory/allocation.cpp:179
mgerdin
parents:
33148
diff
changeset
|
122 |
const intStack& reference_map, |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
123 |
int constant_pool_map_length, |
20063
8965b97fcbb2
8014956: nashorn/api/javaaccess/MethodAccessTest.java test fails on sparc-solaris 64
coleenp
parents:
18439
diff
changeset
|
124 |
TRAPS) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
125 |
// Initialized the resolved object cache. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
126 |
int map_length = reference_map.length(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
127 |
if (map_length > 0) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
128 |
// Only need mapping back to constant pool entries. The map isn't used for |
20063
8965b97fcbb2
8014956: nashorn/api/javaaccess/MethodAccessTest.java test fails on sparc-solaris 64
coleenp
parents:
18439
diff
changeset
|
129 |
// invokedynamic resolved_reference entries. For invokedynamic entries, |
8965b97fcbb2
8014956: nashorn/api/javaaccess/MethodAccessTest.java test fails on sparc-solaris 64
coleenp
parents:
18439
diff
changeset
|
130 |
// the constant pool cache index has the mapping back to both the constant |
8965b97fcbb2
8014956: nashorn/api/javaaccess/MethodAccessTest.java test fails on sparc-solaris 64
coleenp
parents:
18439
diff
changeset
|
131 |
// pool and to the resolved reference index. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
132 |
if (constant_pool_map_length > 0) { |
20063
8965b97fcbb2
8014956: nashorn/api/javaaccess/MethodAccessTest.java test fails on sparc-solaris 64
coleenp
parents:
18439
diff
changeset
|
133 |
Array<u2>* om = MetadataFactory::new_array<u2>(loader_data, constant_pool_map_length, CHECK); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
134 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
135 |
for (int i = 0; i < constant_pool_map_length; i++) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
136 |
int x = reference_map.at(i); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
137 |
assert(x == (int)(jushort) x, "klass index is too big"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
138 |
om->at_put(i, (jushort)x); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
139 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
140 |
set_reference_map(om); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
141 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
142 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
143 |
// Create Java array for holding resolved strings, methodHandles, |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
144 |
// methodTypes, invokedynamic and invokehandle appendix objects, etc. |
31046
d01ad7a0ecb0
8081320: Backout JDK-8059340: ConstantPool::_resolved_references is missing in heap dump
vlivanov
parents:
31038
diff
changeset
|
145 |
objArrayOop stom = oopFactory::new_objArray(SystemDictionary::Object_klass(), map_length, CHECK); |
d01ad7a0ecb0
8081320: Backout JDK-8059340: ConstantPool::_resolved_references is missing in heap dump
vlivanov
parents:
31038
diff
changeset
|
146 |
Handle refs_handle (THREAD, (oop)stom); // must handleize. |
d01ad7a0ecb0
8081320: Backout JDK-8059340: ConstantPool::_resolved_references is missing in heap dump
vlivanov
parents:
31038
diff
changeset
|
147 |
set_resolved_references(loader_data->add_handle(refs_handle)); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
148 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
149 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
150 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
151 |
// CDS support. Create a new resolved_references array. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
152 |
void ConstantPool::restore_unshareable_info(TRAPS) { |
31046
d01ad7a0ecb0
8081320: Backout JDK-8059340: ConstantPool::_resolved_references is missing in heap dump
vlivanov
parents:
31038
diff
changeset
|
153 |
|
d01ad7a0ecb0
8081320: Backout JDK-8059340: ConstantPool::_resolved_references is missing in heap dump
vlivanov
parents:
31038
diff
changeset
|
154 |
// Only create the new resolved references array if it hasn't been attempted before |
d01ad7a0ecb0
8081320: Backout JDK-8059340: ConstantPool::_resolved_references is missing in heap dump
vlivanov
parents:
31038
diff
changeset
|
155 |
if (resolved_references() != NULL) return; |
d01ad7a0ecb0
8081320: Backout JDK-8059340: ConstantPool::_resolved_references is missing in heap dump
vlivanov
parents:
31038
diff
changeset
|
156 |
|
31038
2fd2fdc6a70a
8059340: ConstantPool::_resolved_references is missing in heap dump
vlivanov
parents:
29576
diff
changeset
|
157 |
// restore the C++ vtable from the shared archive |
2fd2fdc6a70a
8059340: ConstantPool::_resolved_references is missing in heap dump
vlivanov
parents:
29576
diff
changeset
|
158 |
restore_vtable(); |
2fd2fdc6a70a
8059340: ConstantPool::_resolved_references is missing in heap dump
vlivanov
parents:
29576
diff
changeset
|
159 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
160 |
if (SystemDictionary::Object_klass_loaded()) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
161 |
// Recreate the object array and add to ClassLoaderData. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
162 |
int map_length = resolved_reference_length(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
163 |
if (map_length > 0) { |
31046
d01ad7a0ecb0
8081320: Backout JDK-8059340: ConstantPool::_resolved_references is missing in heap dump
vlivanov
parents:
31038
diff
changeset
|
164 |
objArrayOop stom = oopFactory::new_objArray(SystemDictionary::Object_klass(), map_length, CHECK); |
d01ad7a0ecb0
8081320: Backout JDK-8059340: ConstantPool::_resolved_references is missing in heap dump
vlivanov
parents:
31038
diff
changeset
|
165 |
Handle refs_handle (THREAD, (oop)stom); // must handleize. |
d01ad7a0ecb0
8081320: Backout JDK-8059340: ConstantPool::_resolved_references is missing in heap dump
vlivanov
parents:
31038
diff
changeset
|
166 |
|
d01ad7a0ecb0
8081320: Backout JDK-8059340: ConstantPool::_resolved_references is missing in heap dump
vlivanov
parents:
31038
diff
changeset
|
167 |
ClassLoaderData* loader_data = pool_holder()->class_loader_data(); |
d01ad7a0ecb0
8081320: Backout JDK-8059340: ConstantPool::_resolved_references is missing in heap dump
vlivanov
parents:
31038
diff
changeset
|
168 |
set_resolved_references(loader_data->add_handle(refs_handle)); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
169 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
170 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
171 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
172 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
173 |
void ConstantPool::remove_unshareable_info() { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
174 |
// Resolved references are not in the shared archive. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
175 |
// Save the length for restoration. It is not necessarily the same length |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
176 |
// as reference_map.length() if invokedynamic is saved. |
31046
d01ad7a0ecb0
8081320: Backout JDK-8059340: ConstantPool::_resolved_references is missing in heap dump
vlivanov
parents:
31038
diff
changeset
|
177 |
set_resolved_reference_length( |
d01ad7a0ecb0
8081320: Backout JDK-8059340: ConstantPool::_resolved_references is missing in heap dump
vlivanov
parents:
31038
diff
changeset
|
178 |
resolved_references() != NULL ? resolved_references()->length() : 0); |
d01ad7a0ecb0
8081320: Backout JDK-8059340: ConstantPool::_resolved_references is missing in heap dump
vlivanov
parents:
31038
diff
changeset
|
179 |
set_resolved_references(NULL); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
180 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
181 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
182 |
int ConstantPool::cp_to_object_index(int cp_index) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
183 |
// this is harder don't do this so much. |
20063
8965b97fcbb2
8014956: nashorn/api/javaaccess/MethodAccessTest.java test fails on sparc-solaris 64
coleenp
parents:
18439
diff
changeset
|
184 |
int i = reference_map()->find(cp_index); |
8965b97fcbb2
8014956: nashorn/api/javaaccess/MethodAccessTest.java test fails on sparc-solaris 64
coleenp
parents:
18439
diff
changeset
|
185 |
// We might not find the index for jsr292 call. |
8965b97fcbb2
8014956: nashorn/api/javaaccess/MethodAccessTest.java test fails on sparc-solaris 64
coleenp
parents:
18439
diff
changeset
|
186 |
return (i < 0) ? _no_index_sentinel : i; |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
187 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
188 |
|
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
189 |
void ConstantPool::trace_class_resolution(const constantPoolHandle& this_cp, KlassHandle k) { |
25325 | 190 |
ResourceMark rm; |
191 |
int line_number = -1; |
|
192 |
const char * source_file = NULL; |
|
193 |
if (JavaThread::current()->has_last_Java_frame()) { |
|
194 |
// try to identify the method which called this function. |
|
195 |
vframeStream vfst(JavaThread::current()); |
|
196 |
if (!vfst.at_end()) { |
|
197 |
line_number = vfst.method()->line_number_from_bci(vfst.bci()); |
|
198 |
Symbol* s = vfst.method()->method_holder()->source_file_name(); |
|
199 |
if (s != NULL) { |
|
200 |
source_file = s->as_C_string(); |
|
201 |
} |
|
202 |
} |
|
203 |
} |
|
204 |
if (k() != this_cp->pool_holder()) { |
|
205 |
// only print something if the classes are different |
|
206 |
if (source_file != NULL) { |
|
207 |
tty->print("RESOLVE %s %s %s:%d\n", |
|
208 |
this_cp->pool_holder()->external_name(), |
|
33602 | 209 |
k->external_name(), source_file, line_number); |
25325 | 210 |
} else { |
211 |
tty->print("RESOLVE %s %s\n", |
|
212 |
this_cp->pool_holder()->external_name(), |
|
33602 | 213 |
k->external_name()); |
25325 | 214 |
} |
215 |
} |
|
216 |
} |
|
217 |
||
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
218 |
Klass* ConstantPool::klass_at_impl(const constantPoolHandle& this_cp, int which, |
27408
9a8090dd6ec3
8058093: Test nsk/stress/jck60/jck60014: assert in src/share/vm/oops/constantPool.cpp: should not be resolved otherwise
coleenp
parents:
27247
diff
changeset
|
219 |
bool save_resolution_error, TRAPS) { |
25325 | 220 |
assert(THREAD->is_Java_thread(), "must be a Java thread"); |
221 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
222 |
// A resolved constantPool entry will contain a Klass*, otherwise a Symbol*. |
25325 | 223 |
// It is not safe to rely on the tag bit's here, since we don't have a lock, and |
224 |
// the entry and tag is not updated atomicly. |
|
23515
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
225 |
CPSlot entry = this_cp->slot_at(which); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
226 |
if (entry.is_resolved()) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
227 |
assert(entry.get_klass()->is_klass(), "must be"); |
1 | 228 |
// Already resolved - return entry. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
229 |
return entry.get_klass(); |
1 | 230 |
} |
231 |
||
25325 | 232 |
// This tag doesn't change back to unresolved class unless at a safepoint. |
233 |
if (this_cp->tag_at(which).is_unresolved_klass_in_error()) { |
|
234 |
// The original attempt to resolve this constant pool entry failed so find the |
|
235 |
// class of the original error and throw another error of the same class |
|
236 |
// (JVMS 5.4.3). |
|
237 |
// If there is a detail message, pass that detail message to the error. |
|
238 |
// The JVMS does not strictly require us to duplicate the same detail message, |
|
239 |
// or any internal exception fields such as cause or stacktrace. But since the |
|
240 |
// detail message is often a class name or other literal string, we will repeat it |
|
241 |
// if we can find it in the symbol table. |
|
24334
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
242 |
throw_resolution_error(this_cp, which, CHECK_0); |
25325 | 243 |
ShouldNotReachHere(); |
1 | 244 |
} |
245 |
||
25325 | 246 |
Handle mirror_handle; |
247 |
Symbol* name = entry.get_symbol(); |
|
248 |
Handle loader (THREAD, this_cp->pool_holder()->class_loader()); |
|
249 |
Handle protection_domain (THREAD, this_cp->pool_holder()->protection_domain()); |
|
250 |
Klass* kk = SystemDictionary::resolve_or_fail(name, loader, protection_domain, true, THREAD); |
|
251 |
KlassHandle k (THREAD, kk); |
|
252 |
if (!HAS_PENDING_EXCEPTION) { |
|
253 |
// preserve the resolved klass from unloading |
|
254 |
mirror_handle = Handle(THREAD, kk->java_mirror()); |
|
255 |
// Do access check for klasses |
|
256 |
verify_constant_pool_resolve(this_cp, k, THREAD); |
|
257 |
} |
|
1 | 258 |
|
25325 | 259 |
// Failed to resolve class. We must record the errors so that subsequent attempts |
260 |
// to resolve this constant pool entry fail with the same error (JVMS 5.4.3). |
|
261 |
if (HAS_PENDING_EXCEPTION) { |
|
27408
9a8090dd6ec3
8058093: Test nsk/stress/jck60/jck60014: assert in src/share/vm/oops/constantPool.cpp: should not be resolved otherwise
coleenp
parents:
27247
diff
changeset
|
262 |
if (save_resolution_error) { |
9a8090dd6ec3
8058093: Test nsk/stress/jck60/jck60014: assert in src/share/vm/oops/constantPool.cpp: should not be resolved otherwise
coleenp
parents:
27247
diff
changeset
|
263 |
save_and_throw_exception(this_cp, which, constantTag(JVM_CONSTANT_UnresolvedClass), CHECK_NULL); |
9a8090dd6ec3
8058093: Test nsk/stress/jck60/jck60014: assert in src/share/vm/oops/constantPool.cpp: should not be resolved otherwise
coleenp
parents:
27247
diff
changeset
|
264 |
// If CHECK_NULL above doesn't return the exception, that means that |
9a8090dd6ec3
8058093: Test nsk/stress/jck60/jck60014: assert in src/share/vm/oops/constantPool.cpp: should not be resolved otherwise
coleenp
parents:
27247
diff
changeset
|
265 |
// some other thread has beaten us and has resolved the class. |
9a8090dd6ec3
8058093: Test nsk/stress/jck60/jck60014: assert in src/share/vm/oops/constantPool.cpp: should not be resolved otherwise
coleenp
parents:
27247
diff
changeset
|
266 |
// To preserve old behavior, we return the resolved class. |
9a8090dd6ec3
8058093: Test nsk/stress/jck60/jck60014: assert in src/share/vm/oops/constantPool.cpp: should not be resolved otherwise
coleenp
parents:
27247
diff
changeset
|
267 |
entry = this_cp->resolved_klass_at(which); |
9a8090dd6ec3
8058093: Test nsk/stress/jck60/jck60014: assert in src/share/vm/oops/constantPool.cpp: should not be resolved otherwise
coleenp
parents:
27247
diff
changeset
|
268 |
assert(entry.is_resolved(), "must be resolved if exception was cleared"); |
9a8090dd6ec3
8058093: Test nsk/stress/jck60/jck60014: assert in src/share/vm/oops/constantPool.cpp: should not be resolved otherwise
coleenp
parents:
27247
diff
changeset
|
269 |
assert(entry.get_klass()->is_klass(), "must be resolved to a klass"); |
9a8090dd6ec3
8058093: Test nsk/stress/jck60/jck60014: assert in src/share/vm/oops/constantPool.cpp: should not be resolved otherwise
coleenp
parents:
27247
diff
changeset
|
270 |
return entry.get_klass(); |
9a8090dd6ec3
8058093: Test nsk/stress/jck60/jck60014: assert in src/share/vm/oops/constantPool.cpp: should not be resolved otherwise
coleenp
parents:
27247
diff
changeset
|
271 |
} else { |
9a8090dd6ec3
8058093: Test nsk/stress/jck60/jck60014: assert in src/share/vm/oops/constantPool.cpp: should not be resolved otherwise
coleenp
parents:
27247
diff
changeset
|
272 |
return NULL; // return the pending exception |
9a8090dd6ec3
8058093: Test nsk/stress/jck60/jck60014: assert in src/share/vm/oops/constantPool.cpp: should not be resolved otherwise
coleenp
parents:
27247
diff
changeset
|
273 |
} |
25325 | 274 |
} |
1 | 275 |
|
25325 | 276 |
// Make this class loader depend upon the class loader owning the class reference |
277 |
ClassLoaderData* this_key = this_cp->pool_holder()->class_loader_data(); |
|
278 |
this_key->record_dependency(k(), CHECK_NULL); // Can throw OOM |
|
279 |
||
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33602
diff
changeset
|
280 |
if (TraceClassResolution && !k->is_array_klass()) { |
25325 | 281 |
// skip resolving the constant pool so that this code gets |
282 |
// called the next time some bytecodes refer to this class. |
|
283 |
trace_class_resolution(this_cp, k); |
|
27408
9a8090dd6ec3
8058093: Test nsk/stress/jck60/jck60014: assert in src/share/vm/oops/constantPool.cpp: should not be resolved otherwise
coleenp
parents:
27247
diff
changeset
|
284 |
return k(); |
9a8090dd6ec3
8058093: Test nsk/stress/jck60/jck60014: assert in src/share/vm/oops/constantPool.cpp: should not be resolved otherwise
coleenp
parents:
27247
diff
changeset
|
285 |
} else { |
9a8090dd6ec3
8058093: Test nsk/stress/jck60/jck60014: assert in src/share/vm/oops/constantPool.cpp: should not be resolved otherwise
coleenp
parents:
27247
diff
changeset
|
286 |
this_cp->klass_at_put(which, k()); |
9a8090dd6ec3
8058093: Test nsk/stress/jck60/jck60014: assert in src/share/vm/oops/constantPool.cpp: should not be resolved otherwise
coleenp
parents:
27247
diff
changeset
|
287 |
} |
1 | 288 |
|
23515
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
289 |
entry = this_cp->resolved_klass_at(which); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
290 |
assert(entry.is_resolved() && entry.get_klass()->is_klass(), "must be resolved at this point"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
291 |
return entry.get_klass(); |
1 | 292 |
} |
293 |
||
294 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
295 |
// Does not update ConstantPool* - to avoid any exception throwing. Used |
1 | 296 |
// by compiler and exception handling. Also used to avoid classloads for |
297 |
// instanceof operations. Returns NULL if the class has not been loaded or |
|
298 |
// if the verification of constant pool failed |
|
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
299 |
Klass* ConstantPool::klass_at_if_loaded(const constantPoolHandle& this_cp, int which) { |
23515
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
300 |
CPSlot entry = this_cp->slot_at(which); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
301 |
if (entry.is_resolved()) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
302 |
assert(entry.get_klass()->is_klass(), "must be"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
303 |
return entry.get_klass(); |
1 | 304 |
} else { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
305 |
assert(entry.is_unresolved(), "must be either symbol or klass"); |
1 | 306 |
Thread *thread = Thread::current(); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7436
diff
changeset
|
307 |
Symbol* name = entry.get_symbol(); |
23515
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
308 |
oop loader = this_cp->pool_holder()->class_loader(); |
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
309 |
oop protection_domain = this_cp->pool_holder()->protection_domain(); |
1 | 310 |
Handle h_prot (thread, protection_domain); |
311 |
Handle h_loader (thread, loader); |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
312 |
Klass* k = SystemDictionary::find(name, h_loader, h_prot, thread); |
1 | 313 |
|
314 |
if (k != NULL) { |
|
315 |
// Make sure that resolving is legal |
|
316 |
EXCEPTION_MARK; |
|
317 |
KlassHandle klass(THREAD, k); |
|
318 |
// return NULL if verification fails |
|
23515
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
319 |
verify_constant_pool_resolve(this_cp, klass, THREAD); |
1 | 320 |
if (HAS_PENDING_EXCEPTION) { |
321 |
CLEAR_PENDING_EXCEPTION; |
|
322 |
return NULL; |
|
323 |
} |
|
324 |
return klass(); |
|
325 |
} else { |
|
326 |
return k; |
|
327 |
} |
|
328 |
} |
|
329 |
} |
|
330 |
||
331 |
||
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
332 |
Klass* ConstantPool::klass_ref_at_if_loaded(const constantPoolHandle& this_cp, int which) { |
23515
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
333 |
return klass_at_if_loaded(this_cp, this_cp->klass_ref_index_at(which)); |
1 | 334 |
} |
335 |
||
336 |
||
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
337 |
Method* ConstantPool::method_at_if_loaded(const constantPoolHandle& cpool, |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
338 |
int which) { |
11626
7423003cc783
7140882: Don't return booleans from methods returning pointers
brutisso
parents:
10565
diff
changeset
|
339 |
if (cpool->cache() == NULL) return NULL; // nothing to load yet |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
340 |
int cache_index = decode_cpcache_index(which, true); |
10008
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9116
diff
changeset
|
341 |
if (!(cache_index >= 0 && cache_index < cpool->cache()->length())) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
342 |
// FIXME: should be an assert |
10008
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9116
diff
changeset
|
343 |
if (PrintMiscellaneous && (Verbose||WizardMode)) { |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
344 |
tty->print_cr("bad operand %d in:", which); cpool->print(); |
10008
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9116
diff
changeset
|
345 |
} |
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9116
diff
changeset
|
346 |
return NULL; |
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9116
diff
changeset
|
347 |
} |
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9116
diff
changeset
|
348 |
ConstantPoolCacheEntry* e = cpool->cache()->entry_at(cache_index); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
349 |
return e->method_if_resolved(cpool); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
350 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
351 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
352 |
|
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
353 |
bool ConstantPool::has_appendix_at_if_loaded(const constantPoolHandle& cpool, int which) { |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
354 |
if (cpool->cache() == NULL) return false; // nothing to load yet |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
355 |
int cache_index = decode_cpcache_index(which, true); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
356 |
ConstantPoolCacheEntry* e = cpool->cache()->entry_at(cache_index); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
357 |
return e->has_appendix(); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
358 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
359 |
|
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
360 |
oop ConstantPool::appendix_at_if_loaded(const constantPoolHandle& cpool, int which) { |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
361 |
if (cpool->cache() == NULL) return NULL; // nothing to load yet |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
362 |
int cache_index = decode_cpcache_index(which, true); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
363 |
ConstantPoolCacheEntry* e = cpool->cache()->entry_at(cache_index); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
364 |
return e->appendix_if_resolved(cpool); |
10008
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9116
diff
changeset
|
365 |
} |
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9116
diff
changeset
|
366 |
|
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9116
diff
changeset
|
367 |
|
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
368 |
bool ConstantPool::has_method_type_at_if_loaded(const constantPoolHandle& cpool, int which) { |
13929
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13736
diff
changeset
|
369 |
if (cpool->cache() == NULL) return false; // nothing to load yet |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13736
diff
changeset
|
370 |
int cache_index = decode_cpcache_index(which, true); |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13736
diff
changeset
|
371 |
ConstantPoolCacheEntry* e = cpool->cache()->entry_at(cache_index); |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13736
diff
changeset
|
372 |
return e->has_method_type(); |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13736
diff
changeset
|
373 |
} |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13736
diff
changeset
|
374 |
|
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
375 |
oop ConstantPool::method_type_at_if_loaded(const constantPoolHandle& cpool, int which) { |
13929
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13736
diff
changeset
|
376 |
if (cpool->cache() == NULL) return NULL; // nothing to load yet |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13736
diff
changeset
|
377 |
int cache_index = decode_cpcache_index(which, true); |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13736
diff
changeset
|
378 |
ConstantPoolCacheEntry* e = cpool->cache()->entry_at(cache_index); |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13736
diff
changeset
|
379 |
return e->method_type_if_resolved(cpool); |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13736
diff
changeset
|
380 |
} |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13736
diff
changeset
|
381 |
|
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13736
diff
changeset
|
382 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
383 |
Symbol* ConstantPool::impl_name_ref_at(int which, bool uncached) { |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
384 |
int name_index = name_ref_index_at(impl_name_and_type_ref_index_at(which, uncached)); |
1 | 385 |
return symbol_at(name_index); |
386 |
} |
|
387 |
||
388 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
389 |
Symbol* ConstantPool::impl_signature_ref_at(int which, bool uncached) { |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
390 |
int signature_index = signature_ref_index_at(impl_name_and_type_ref_index_at(which, uncached)); |
1 | 391 |
return symbol_at(signature_index); |
392 |
} |
|
393 |
||
394 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
395 |
int ConstantPool::impl_name_and_type_ref_index_at(int which, bool uncached) { |
4429
d7eb4e2099aa
6858164: invokedynamic code needs some cleanup (post-6655638)
jrose
parents:
2860
diff
changeset
|
396 |
int i = which; |
d7eb4e2099aa
6858164: invokedynamic code needs some cleanup (post-6655638)
jrose
parents:
2860
diff
changeset
|
397 |
if (!uncached && cache() != NULL) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
398 |
if (ConstantPool::is_invokedynamic_index(which)) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
399 |
// Invokedynamic index is index into resolved_references |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
400 |
int pool_index = invokedynamic_cp_cache_entry_at(which)->constant_pool_index(); |
9116 | 401 |
pool_index = invoke_dynamic_name_and_type_ref_index_at(pool_index); |
6062
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5882
diff
changeset
|
402 |
assert(tag_at(pool_index).is_name_and_type(), ""); |
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5882
diff
changeset
|
403 |
return pool_index; |
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5882
diff
changeset
|
404 |
} |
4429
d7eb4e2099aa
6858164: invokedynamic code needs some cleanup (post-6655638)
jrose
parents:
2860
diff
changeset
|
405 |
// change byte-ordering and go via cache |
d7eb4e2099aa
6858164: invokedynamic code needs some cleanup (post-6655638)
jrose
parents:
2860
diff
changeset
|
406 |
i = remap_instruction_operand_from_cache(which); |
d7eb4e2099aa
6858164: invokedynamic code needs some cleanup (post-6655638)
jrose
parents:
2860
diff
changeset
|
407 |
} else { |
7114
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
408 |
if (tag_at(which).is_invoke_dynamic()) { |
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
409 |
int pool_index = invoke_dynamic_name_and_type_ref_index_at(which); |
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
410 |
assert(tag_at(pool_index).is_name_and_type(), ""); |
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
411 |
return pool_index; |
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
412 |
} |
4429
d7eb4e2099aa
6858164: invokedynamic code needs some cleanup (post-6655638)
jrose
parents:
2860
diff
changeset
|
413 |
} |
d7eb4e2099aa
6858164: invokedynamic code needs some cleanup (post-6655638)
jrose
parents:
2860
diff
changeset
|
414 |
assert(tag_at(i).is_field_or_method(), "Corrupted constant pool"); |
7114
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
415 |
assert(!tag_at(i).is_invoke_dynamic(), "Must be handled above"); |
4429
d7eb4e2099aa
6858164: invokedynamic code needs some cleanup (post-6655638)
jrose
parents:
2860
diff
changeset
|
416 |
jint ref_index = *int_at_addr(i); |
1 | 417 |
return extract_high_short_from_int(ref_index); |
418 |
} |
|
419 |
||
420 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
421 |
int ConstantPool::impl_klass_ref_index_at(int which, bool uncached) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
422 |
guarantee(!ConstantPool::is_invokedynamic_index(which), |
4429
d7eb4e2099aa
6858164: invokedynamic code needs some cleanup (post-6655638)
jrose
parents:
2860
diff
changeset
|
423 |
"an invokedynamic instruction does not have a klass"); |
d7eb4e2099aa
6858164: invokedynamic code needs some cleanup (post-6655638)
jrose
parents:
2860
diff
changeset
|
424 |
int i = which; |
d7eb4e2099aa
6858164: invokedynamic code needs some cleanup (post-6655638)
jrose
parents:
2860
diff
changeset
|
425 |
if (!uncached && cache() != NULL) { |
d7eb4e2099aa
6858164: invokedynamic code needs some cleanup (post-6655638)
jrose
parents:
2860
diff
changeset
|
426 |
// change byte-ordering and go via cache |
d7eb4e2099aa
6858164: invokedynamic code needs some cleanup (post-6655638)
jrose
parents:
2860
diff
changeset
|
427 |
i = remap_instruction_operand_from_cache(which); |
d7eb4e2099aa
6858164: invokedynamic code needs some cleanup (post-6655638)
jrose
parents:
2860
diff
changeset
|
428 |
} |
d7eb4e2099aa
6858164: invokedynamic code needs some cleanup (post-6655638)
jrose
parents:
2860
diff
changeset
|
429 |
assert(tag_at(i).is_field_or_method(), "Corrupted constant pool"); |
d7eb4e2099aa
6858164: invokedynamic code needs some cleanup (post-6655638)
jrose
parents:
2860
diff
changeset
|
430 |
jint ref_index = *int_at_addr(i); |
1 | 431 |
return extract_low_short_from_int(ref_index); |
432 |
} |
|
433 |
||
434 |
||
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
435 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
436 |
int ConstantPool::remap_instruction_operand_from_cache(int operand) { |
5688 | 437 |
int cpc_index = operand; |
438 |
DEBUG_ONLY(cpc_index -= CPCACHE_INDEX_TAG); |
|
439 |
assert((int)(u2)cpc_index == cpc_index, "clean u2"); |
|
4429
d7eb4e2099aa
6858164: invokedynamic code needs some cleanup (post-6655638)
jrose
parents:
2860
diff
changeset
|
440 |
int member_index = cache()->entry_at(cpc_index)->constant_pool_index(); |
d7eb4e2099aa
6858164: invokedynamic code needs some cleanup (post-6655638)
jrose
parents:
2860
diff
changeset
|
441 |
return member_index; |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
442 |
} |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
443 |
|
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
444 |
|
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
445 |
void ConstantPool::verify_constant_pool_resolve(const constantPoolHandle& this_cp, KlassHandle k, TRAPS) { |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33602
diff
changeset
|
446 |
if (k->is_instance_klass() || k->is_objArray_klass()) { |
23515
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
447 |
instanceKlassHandle holder (THREAD, this_cp->pool_holder()); |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33602
diff
changeset
|
448 |
Klass* elem = k->is_instance_klass() ? k() : ObjArrayKlass::cast(k())->bottom_klass(); |
23515
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
449 |
KlassHandle element (THREAD, elem); |
1 | 450 |
|
451 |
// The element type could be a typeArray - we only need the access check if it is |
|
452 |
// an reference to another class |
|
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33602
diff
changeset
|
453 |
if (element->is_instance_klass()) { |
1 | 454 |
LinkResolver::check_klass_accessability(holder, element, CHECK); |
455 |
} |
|
456 |
} |
|
457 |
} |
|
458 |
||
459 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
460 |
int ConstantPool::name_ref_index_at(int which_nt) { |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
461 |
jint ref_index = name_and_type_at(which_nt); |
1 | 462 |
return extract_low_short_from_int(ref_index); |
463 |
} |
|
464 |
||
465 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
466 |
int ConstantPool::signature_ref_index_at(int which_nt) { |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
467 |
jint ref_index = name_and_type_at(which_nt); |
1 | 468 |
return extract_high_short_from_int(ref_index); |
469 |
} |
|
470 |
||
471 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
472 |
Klass* ConstantPool::klass_ref_at(int which, TRAPS) { |
27680
8ecc0871c18e
8064811: Use THREAD instead of CHECK_NULL in return statements
stefank
parents:
27408
diff
changeset
|
473 |
return klass_at(klass_ref_index_at(which), THREAD); |
1 | 474 |
} |
475 |
||
476 |
||
34666 | 477 |
Symbol* ConstantPool::klass_name_at(int which) const { |
1 | 478 |
assert(tag_at(which).is_unresolved_klass() || tag_at(which).is_klass(), |
479 |
"Corrupted constant pool"); |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
480 |
// A resolved constantPool entry will contain a Klass*, otherwise a Symbol*. |
1 | 481 |
// It is not safe to rely on the tag bit's here, since we don't have a lock, and the entry and |
482 |
// tag is not updated atomicly. |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7436
diff
changeset
|
483 |
CPSlot entry = slot_at(which); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
484 |
if (entry.is_resolved()) { |
1 | 485 |
// Already resolved - return entry's name. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
486 |
assert(entry.get_klass()->is_klass(), "must be"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
487 |
return entry.get_klass()->name(); |
1 | 488 |
} else { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
489 |
assert(entry.is_unresolved(), "must be either symbol or klass"); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7436
diff
changeset
|
490 |
return entry.get_symbol(); |
1 | 491 |
} |
492 |
} |
|
493 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
494 |
Symbol* ConstantPool::klass_ref_at_noresolve(int which) { |
1 | 495 |
jint ref_index = klass_ref_index_at(which); |
496 |
return klass_at_noresolve(ref_index); |
|
497 |
} |
|
498 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
499 |
Symbol* ConstantPool::uncached_klass_ref_at_noresolve(int which) { |
5882 | 500 |
jint ref_index = uncached_klass_ref_index_at(which); |
501 |
return klass_at_noresolve(ref_index); |
|
502 |
} |
|
503 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
504 |
char* ConstantPool::string_at_noresolve(int which) { |
28741
1f10b1bd612d
8008678: JSR 292: constant pool reconstitution must support pseudo strings
sspitsyn
parents:
27680
diff
changeset
|
505 |
return unresolved_string_at(which)->as_C_string(); |
1 | 506 |
} |
507 |
||
34666 | 508 |
BasicType ConstantPool::basic_type_for_signature_at(int which) const { |
1 | 509 |
return FieldType::basic_type(symbol_at(which)); |
510 |
} |
|
511 |
||
512 |
||
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
513 |
void ConstantPool::resolve_string_constants_impl(const constantPoolHandle& this_cp, TRAPS) { |
23515
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
514 |
for (int index = 1; index < this_cp->length(); index++) { // Index 0 is unused |
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
515 |
if (this_cp->tag_at(index).is_string()) { |
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
516 |
this_cp->string_at(index, CHECK); |
1 | 517 |
} |
518 |
} |
|
519 |
} |
|
520 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
521 |
// Resolve all the classes in the constant pool. If they are all resolved, |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
522 |
// the constant pool is read-only. Enhancement: allocate cp entries to |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
523 |
// another metaspace, and copy to read-only or read-write space if this |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
524 |
// bit is set. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
525 |
bool ConstantPool::resolve_class_constants(TRAPS) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
526 |
constantPoolHandle cp(THREAD, this); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
527 |
for (int index = 1; index < length(); index++) { // Index 0 is unused |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
528 |
if (tag_at(index).is_unresolved_klass() && |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
529 |
klass_at_if_loaded(cp, index) == NULL) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
530 |
return false; |
7114
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
531 |
} |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
532 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
533 |
// set_preresolution(); or some bit for future use |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
534 |
return true; |
7114
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
535 |
} |
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
536 |
|
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
537 |
Symbol* ConstantPool::exception_message(const constantPoolHandle& this_cp, int which, constantTag tag, oop pending_exception) { |
24334
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
538 |
// Dig out the detailed message to reuse if possible |
25624
b3bd733f04e9
8048933: -XX:+TraceExceptions output should include the message
coleenp
parents:
25325
diff
changeset
|
539 |
Symbol* message = java_lang_Throwable::detail_message(pending_exception); |
b3bd733f04e9
8048933: -XX:+TraceExceptions output should include the message
coleenp
parents:
25325
diff
changeset
|
540 |
if (message != NULL) { |
b3bd733f04e9
8048933: -XX:+TraceExceptions output should include the message
coleenp
parents:
25325
diff
changeset
|
541 |
return message; |
24334
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
542 |
} |
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
543 |
|
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
544 |
// Return specific message for the tag |
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
545 |
switch (tag.value()) { |
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
546 |
case JVM_CONSTANT_UnresolvedClass: |
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
547 |
// return the class name in the error message |
25325 | 548 |
message = this_cp->klass_name_at(which); |
24334
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
549 |
break; |
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
550 |
case JVM_CONSTANT_MethodHandle: |
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
551 |
// return the method handle name in the error message |
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
552 |
message = this_cp->method_handle_name_ref_at(which); |
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
553 |
break; |
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
554 |
case JVM_CONSTANT_MethodType: |
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
555 |
// return the method type signature in the error message |
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
556 |
message = this_cp->method_type_signature_at(which); |
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
557 |
break; |
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
558 |
default: |
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
559 |
ShouldNotReachHere(); |
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
560 |
} |
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
561 |
|
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
562 |
return message; |
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
563 |
} |
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
564 |
|
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
565 |
void ConstantPool::throw_resolution_error(const constantPoolHandle& this_cp, int which, TRAPS) { |
24334
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
566 |
Symbol* message = NULL; |
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
567 |
Symbol* error = SystemDictionary::find_resolution_error(this_cp, which, &message); |
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
568 |
assert(error != NULL && message != NULL, "checking"); |
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
569 |
CLEAR_PENDING_EXCEPTION; |
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
570 |
ResourceMark rm; |
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
571 |
THROW_MSG(error, message->as_C_string()); |
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
572 |
} |
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
573 |
|
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
574 |
// If resolution for Class, MethodHandle or MethodType fails, save the exception |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
575 |
// in the resolution error table, so that the same exception is thrown again. |
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
576 |
void ConstantPool::save_and_throw_exception(const constantPoolHandle& this_cp, int which, |
24334
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
577 |
constantTag tag, TRAPS) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
578 |
Symbol* error = PENDING_EXCEPTION->klass()->name(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
579 |
|
24334
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
580 |
int error_tag = tag.error_value(); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
581 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
582 |
if (!PENDING_EXCEPTION-> |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
583 |
is_a(SystemDictionary::LinkageError_klass())) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
584 |
// Just throw the exception and don't prevent these classes from |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
585 |
// being loaded due to virtual machine errors like StackOverflow |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
586 |
// and OutOfMemoryError, etc, or if the thread was hit by stop() |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
587 |
// Needs clarification to section 5.4.3 of the VM spec (see 6308271) |
23515
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
588 |
} else if (this_cp->tag_at(which).value() != error_tag) { |
24334
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
589 |
Symbol* message = exception_message(this_cp, which, tag, PENDING_EXCEPTION); |
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
590 |
SystemDictionary::add_resolution_error(this_cp, which, error, message); |
25325 | 591 |
// CAS in the tag. If a thread beat us to registering this error that's fine. |
27408
9a8090dd6ec3
8058093: Test nsk/stress/jck60/jck60014: assert in src/share/vm/oops/constantPool.cpp: should not be resolved otherwise
coleenp
parents:
27247
diff
changeset
|
592 |
// If another thread resolved the reference, this is a race condition. This |
9a8090dd6ec3
8058093: Test nsk/stress/jck60/jck60014: assert in src/share/vm/oops/constantPool.cpp: should not be resolved otherwise
coleenp
parents:
27247
diff
changeset
|
593 |
// thread may have had a security manager or something temporary. |
9a8090dd6ec3
8058093: Test nsk/stress/jck60/jck60014: assert in src/share/vm/oops/constantPool.cpp: should not be resolved otherwise
coleenp
parents:
27247
diff
changeset
|
594 |
// This doesn't deterministically get an error. So why do we save this? |
9a8090dd6ec3
8058093: Test nsk/stress/jck60/jck60014: assert in src/share/vm/oops/constantPool.cpp: should not be resolved otherwise
coleenp
parents:
27247
diff
changeset
|
595 |
// We save this because jvmti can add classes to the bootclass path after |
9a8090dd6ec3
8058093: Test nsk/stress/jck60/jck60014: assert in src/share/vm/oops/constantPool.cpp: should not be resolved otherwise
coleenp
parents:
27247
diff
changeset
|
596 |
// this error, so it needs to get the same error if the error is first. |
25325 | 597 |
jbyte old_tag = Atomic::cmpxchg((jbyte)error_tag, |
598 |
(jbyte*)this_cp->tag_addr_at(which), (jbyte)tag.value()); |
|
27408
9a8090dd6ec3
8058093: Test nsk/stress/jck60/jck60014: assert in src/share/vm/oops/constantPool.cpp: should not be resolved otherwise
coleenp
parents:
27247
diff
changeset
|
599 |
if (old_tag != error_tag && old_tag != tag.value()) { |
9a8090dd6ec3
8058093: Test nsk/stress/jck60/jck60014: assert in src/share/vm/oops/constantPool.cpp: should not be resolved otherwise
coleenp
parents:
27247
diff
changeset
|
600 |
// MethodHandles and MethodType doesn't change to resolved version. |
9a8090dd6ec3
8058093: Test nsk/stress/jck60/jck60014: assert in src/share/vm/oops/constantPool.cpp: should not be resolved otherwise
coleenp
parents:
27247
diff
changeset
|
601 |
assert(this_cp->tag_at(which).is_klass(), "Wrong tag value"); |
9a8090dd6ec3
8058093: Test nsk/stress/jck60/jck60014: assert in src/share/vm/oops/constantPool.cpp: should not be resolved otherwise
coleenp
parents:
27247
diff
changeset
|
602 |
// Forget the exception and use the resolved class. |
9a8090dd6ec3
8058093: Test nsk/stress/jck60/jck60014: assert in src/share/vm/oops/constantPool.cpp: should not be resolved otherwise
coleenp
parents:
27247
diff
changeset
|
603 |
CLEAR_PENDING_EXCEPTION; |
9a8090dd6ec3
8058093: Test nsk/stress/jck60/jck60014: assert in src/share/vm/oops/constantPool.cpp: should not be resolved otherwise
coleenp
parents:
27247
diff
changeset
|
604 |
} |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
605 |
} else { |
24334
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
606 |
// some other thread put this in error state |
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
607 |
throw_resolution_error(this_cp, which, CHECK); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
608 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
609 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
610 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
611 |
// Called to resolve constants in the constant pool and return an oop. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
612 |
// Some constant pool entries cache their resolved oop. This is also |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
613 |
// called to create oops from constants to use in arguments for invokedynamic |
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
614 |
oop ConstantPool::resolve_constant_at_impl(const constantPoolHandle& this_cp, int index, int cache_index, TRAPS) { |
5882 | 615 |
oop result_oop = NULL; |
7114
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
616 |
Handle throw_exception; |
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
617 |
|
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
618 |
if (cache_index == _possible_index_sentinel) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
619 |
// It is possible that this constant is one which is cached in the objects. |
7114
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
620 |
// We'll do a linear search. This should be OK because this usage is rare. |
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
621 |
assert(index > 0, "valid index"); |
23515
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
622 |
cache_index = this_cp->cp_to_object_index(index); |
7114
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
623 |
} |
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
624 |
assert(cache_index == _no_index_sentinel || cache_index >= 0, ""); |
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
625 |
assert(index == _no_index_sentinel || index >= 0, ""); |
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
626 |
|
5882 | 627 |
if (cache_index >= 0) { |
23515
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
628 |
result_oop = this_cp->resolved_references()->obj_at(cache_index); |
5882 | 629 |
if (result_oop != NULL) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
630 |
return result_oop; |
7114
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
631 |
// That was easy... |
5882 | 632 |
} |
23515
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
633 |
index = this_cp->object_to_cp_index(cache_index); |
5882 | 634 |
} |
635 |
||
7114
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
636 |
jvalue prim_value; // temp used only in a few cases below |
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
637 |
|
24334
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
638 |
constantTag tag = this_cp->tag_at(index); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
639 |
|
24334
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
640 |
switch (tag.value()) { |
5882 | 641 |
|
642 |
case JVM_CONSTANT_UnresolvedClass: |
|
643 |
case JVM_CONSTANT_UnresolvedClassInError: |
|
644 |
case JVM_CONSTANT_Class: |
|
645 |
{ |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
646 |
assert(cache_index == _no_index_sentinel, "should not have been set"); |
27408
9a8090dd6ec3
8058093: Test nsk/stress/jck60/jck60014: assert in src/share/vm/oops/constantPool.cpp: should not be resolved otherwise
coleenp
parents:
27247
diff
changeset
|
647 |
Klass* resolved = klass_at_impl(this_cp, index, true, CHECK_NULL); |
5882 | 648 |
// ldc wants the java mirror. |
8725
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8651
diff
changeset
|
649 |
result_oop = resolved->java_mirror(); |
5882 | 650 |
break; |
651 |
} |
|
652 |
||
653 |
case JVM_CONSTANT_String: |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
654 |
assert(cache_index != _no_index_sentinel, "should have been set"); |
23515
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
655 |
if (this_cp->is_pseudo_string_at(index)) { |
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
656 |
result_oop = this_cp->pseudo_string_at(index, cache_index); |
5882 | 657 |
break; |
658 |
} |
|
23515
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
659 |
result_oop = string_at_impl(this_cp, index, cache_index, CHECK_NULL); |
5882 | 660 |
break; |
661 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
662 |
case JVM_CONSTANT_MethodHandleInError: |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
663 |
case JVM_CONSTANT_MethodTypeInError: |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
664 |
{ |
24334
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
665 |
throw_resolution_error(this_cp, index, CHECK_NULL); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
666 |
break; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
667 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
668 |
|
5882 | 669 |
case JVM_CONSTANT_MethodHandle: |
670 |
{ |
|
23515
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
671 |
int ref_kind = this_cp->method_handle_ref_kind_at(index); |
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
672 |
int callee_index = this_cp->method_handle_klass_index_at(index); |
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
673 |
Symbol* name = this_cp->method_handle_name_ref_at(index); |
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
674 |
Symbol* signature = this_cp->method_handle_signature_ref_at(index); |
5882 | 675 |
if (PrintMiscellaneous) |
676 |
tty->print_cr("resolve JVM_CONSTANT_MethodHandle:%d [%d/%d/%d] %s.%s", |
|
23515
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
677 |
ref_kind, index, this_cp->method_handle_index_at(index), |
5882 | 678 |
callee_index, name->as_C_string(), signature->as_C_string()); |
679 |
KlassHandle callee; |
|
27408
9a8090dd6ec3
8058093: Test nsk/stress/jck60/jck60014: assert in src/share/vm/oops/constantPool.cpp: should not be resolved otherwise
coleenp
parents:
27247
diff
changeset
|
680 |
{ Klass* k = klass_at_impl(this_cp, callee_index, true, CHECK_NULL); |
5882 | 681 |
callee = KlassHandle(THREAD, k); |
682 |
} |
|
23515
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
683 |
KlassHandle klass(THREAD, this_cp->pool_holder()); |
5882 | 684 |
Handle value = SystemDictionary::link_method_handle_constant(klass, ref_kind, |
685 |
callee, name, signature, |
|
7114
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
686 |
THREAD); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
687 |
result_oop = value(); |
7114
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
688 |
if (HAS_PENDING_EXCEPTION) { |
24334
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
689 |
save_and_throw_exception(this_cp, index, tag, CHECK_NULL); |
7114
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
690 |
} |
5882 | 691 |
break; |
692 |
} |
|
693 |
||
694 |
case JVM_CONSTANT_MethodType: |
|
695 |
{ |
|
23515
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
696 |
Symbol* signature = this_cp->method_type_signature_at(index); |
5882 | 697 |
if (PrintMiscellaneous) |
698 |
tty->print_cr("resolve JVM_CONSTANT_MethodType [%d/%d] %s", |
|
23515
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
699 |
index, this_cp->method_type_index_at(index), |
5882 | 700 |
signature->as_C_string()); |
23515
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
701 |
KlassHandle klass(THREAD, this_cp->pool_holder()); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
702 |
Handle value = SystemDictionary::find_method_handle_type(signature, klass, THREAD); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
703 |
result_oop = value(); |
7114
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
704 |
if (HAS_PENDING_EXCEPTION) { |
24334
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
705 |
save_and_throw_exception(this_cp, index, tag, CHECK_NULL); |
7114
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
706 |
} |
5882 | 707 |
break; |
708 |
} |
|
709 |
||
710 |
case JVM_CONSTANT_Integer: |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
711 |
assert(cache_index == _no_index_sentinel, "should not have been set"); |
23515
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
712 |
prim_value.i = this_cp->int_at(index); |
7114
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
713 |
result_oop = java_lang_boxing_object::create(T_INT, &prim_value, CHECK_NULL); |
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
714 |
break; |
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
715 |
|
5882 | 716 |
case JVM_CONSTANT_Float: |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
717 |
assert(cache_index == _no_index_sentinel, "should not have been set"); |
23515
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
718 |
prim_value.f = this_cp->float_at(index); |
7114
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
719 |
result_oop = java_lang_boxing_object::create(T_FLOAT, &prim_value, CHECK_NULL); |
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
720 |
break; |
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
721 |
|
5882 | 722 |
case JVM_CONSTANT_Long: |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
723 |
assert(cache_index == _no_index_sentinel, "should not have been set"); |
23515
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
724 |
prim_value.j = this_cp->long_at(index); |
7114
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
725 |
result_oop = java_lang_boxing_object::create(T_LONG, &prim_value, CHECK_NULL); |
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
726 |
break; |
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
727 |
|
5882 | 728 |
case JVM_CONSTANT_Double: |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
729 |
assert(cache_index == _no_index_sentinel, "should not have been set"); |
23515
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
730 |
prim_value.d = this_cp->double_at(index); |
7114
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
731 |
result_oop = java_lang_boxing_object::create(T_DOUBLE, &prim_value, CHECK_NULL); |
5882 | 732 |
break; |
733 |
||
734 |
default: |
|
735 |
DEBUG_ONLY( tty->print_cr("*** %p: tag at CP[%d/%d] = %d", |
|
24334
36096f7271f4
8023697: failed class resolution reports different class name in detail message for the first and subsequent times
coleenp
parents:
23872
diff
changeset
|
736 |
this_cp(), index, cache_index, tag.value())); |
5882 | 737 |
assert(false, "unexpected constant tag"); |
738 |
break; |
|
739 |
} |
|
740 |
||
741 |
if (cache_index >= 0) { |
|
25325 | 742 |
// Benign race condition: resolved_references may already be filled in. |
7114
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
743 |
// The important thing here is that all threads pick up the same result. |
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
744 |
// It doesn't matter which racing thread wins, as long as only one |
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
745 |
// result is used by all threads, and all future queries. |
25325 | 746 |
oop old_result = this_cp->resolved_references()->atomic_compare_exchange_oop(cache_index, result_oop, NULL); |
747 |
if (old_result == NULL) { |
|
748 |
return result_oop; // was installed |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
749 |
} else { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
750 |
// Return the winning thread's result. This can be different than |
25325 | 751 |
// the result here for MethodHandles. |
752 |
return old_result; |
|
5882 | 753 |
} |
754 |
} else { |
|
755 |
return result_oop; |
|
756 |
} |
|
757 |
} |
|
758 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
759 |
oop ConstantPool::uncached_string_at(int which, TRAPS) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
760 |
Symbol* sym = unresolved_string_at(which); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
761 |
oop str = StringTable::intern(sym, CHECK_(NULL)); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
762 |
assert(java_lang_String::is_instance(str), "must be string"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
763 |
return str; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
764 |
} |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
765 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
766 |
|
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
767 |
oop ConstantPool::resolve_bootstrap_specifier_at_impl(const constantPoolHandle& this_cp, int index, TRAPS) { |
23515
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
768 |
assert(this_cp->tag_at(index).is_invoke_dynamic(), "Corrupted constant pool"); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
769 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
770 |
Handle bsm; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
771 |
int argc; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
772 |
{ |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
773 |
// JVM_CONSTANT_InvokeDynamic is an ordered pair of [bootm, name&type], plus optional arguments |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
774 |
// The bootm, being a JVM_CONSTANT_MethodHandle, has its own cache entry. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
775 |
// It is accompanied by the optional arguments. |
23515
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
776 |
int bsm_index = this_cp->invoke_dynamic_bootstrap_method_ref_index_at(index); |
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
777 |
oop bsm_oop = this_cp->resolve_possibly_cached_constant_at(bsm_index, CHECK_NULL); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
778 |
if (!java_lang_invoke_MethodHandle::is_instance(bsm_oop)) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
779 |
THROW_MSG_NULL(vmSymbols::java_lang_LinkageError(), "BSM not an MethodHandle"); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
780 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
781 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
782 |
// Extract the optional static arguments. |
23515
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
783 |
argc = this_cp->invoke_dynamic_argument_count_at(index); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
784 |
if (argc == 0) return bsm_oop; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
785 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
786 |
bsm = Handle(THREAD, bsm_oop); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
787 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
788 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
789 |
objArrayHandle info; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
790 |
{ |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
791 |
objArrayOop info_oop = oopFactory::new_objArray(SystemDictionary::Object_klass(), 1+argc, CHECK_NULL); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
792 |
info = objArrayHandle(THREAD, info_oop); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
793 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
794 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
795 |
info->obj_at_put(0, bsm()); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
796 |
for (int i = 0; i < argc; i++) { |
23515
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
797 |
int arg_index = this_cp->invoke_dynamic_argument_index_at(index, i); |
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
798 |
oop arg_oop = this_cp->resolve_possibly_cached_constant_at(arg_index, CHECK_NULL); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
799 |
info->obj_at_put(1+i, arg_oop); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
800 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
801 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
802 |
return info(); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
803 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11626
diff
changeset
|
804 |
|
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
805 |
oop ConstantPool::string_at_impl(const constantPoolHandle& this_cp, int which, int obj_index, TRAPS) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
806 |
// If the string has already been interned, this entry will be non-null |
23515
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
807 |
oop str = this_cp->resolved_references()->obj_at(obj_index); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
808 |
if (str != NULL) return str; |
23515
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
809 |
Symbol* sym = this_cp->unresolved_string_at(which); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
810 |
str = StringTable::intern(sym, CHECK_(NULL)); |
23515
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
23175
diff
changeset
|
811 |
this_cp->string_at_put(which, obj_index, str); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7436
diff
changeset
|
812 |
assert(java_lang_String::is_instance(str), "must be string"); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7436
diff
changeset
|
813 |
return str; |
1 | 814 |
} |
815 |
||
816 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
817 |
bool ConstantPool::klass_name_at_matches(instanceKlassHandle k, |
1 | 818 |
int which) { |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7436
diff
changeset
|
819 |
// Names are interned, so we can compare Symbol*s directly |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7436
diff
changeset
|
820 |
Symbol* cp_name = klass_name_at(which); |
1 | 821 |
return (cp_name == k->name()); |
822 |
} |
|
823 |
||
824 |
||
25325 | 825 |
// Iterate over symbols and decrement ones which are Symbol*s |
826 |
// This is done during GC. |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7436
diff
changeset
|
827 |
// Only decrement the UTF8 symbols. Unresolved classes and strings point to |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7436
diff
changeset
|
828 |
// these symbols but didn't increment the reference count. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
829 |
void ConstantPool::unreference_symbols() { |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7436
diff
changeset
|
830 |
for (int index = 1; index < length(); index++) { // Index 0 is unused |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7436
diff
changeset
|
831 |
constantTag tag = tag_at(index); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7436
diff
changeset
|
832 |
if (tag.is_symbol()) { |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7436
diff
changeset
|
833 |
symbol_at(index)->decrement_refcount(); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7436
diff
changeset
|
834 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7436
diff
changeset
|
835 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7436
diff
changeset
|
836 |
} |
1 | 837 |
|
838 |
||
839 |
// Compare this constant pool's entry at index1 to the constant pool |
|
840 |
// cp2's entry at index2. |
|
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
841 |
bool ConstantPool::compare_entry_to(int index1, const constantPoolHandle& cp2, |
1 | 842 |
int index2, TRAPS) { |
843 |
||
20677
ff4fc393de4c
8022592: assert at constantTag.cpp:57: ShouldNotReachHere()
coleenp
parents:
20672
diff
changeset
|
844 |
// The error tags are equivalent to non-error tags when comparing |
ff4fc393de4c
8022592: assert at constantTag.cpp:57: ShouldNotReachHere()
coleenp
parents:
20672
diff
changeset
|
845 |
jbyte t1 = tag_at(index1).non_error_value(); |
ff4fc393de4c
8022592: assert at constantTag.cpp:57: ShouldNotReachHere()
coleenp
parents:
20672
diff
changeset
|
846 |
jbyte t2 = cp2->tag_at(index2).non_error_value(); |
1 | 847 |
|
848 |
if (t1 != t2) { |
|
849 |
// Not the same entry type so there is nothing else to check. Note |
|
850 |
// that this style of checking will consider resolved/unresolved |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
851 |
// class pairs as different. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
852 |
// From the ConstantPool* API point of view, this is correct |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
853 |
// behavior. See VM_RedefineClasses::merge_constant_pools() to see how this |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
854 |
// plays out in the context of ConstantPool* merging. |
1 | 855 |
return false; |
856 |
} |
|
857 |
||
858 |
switch (t1) { |
|
859 |
case JVM_CONSTANT_Class: |
|
860 |
{ |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
861 |
Klass* k1 = klass_at(index1, CHECK_false); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
862 |
Klass* k2 = cp2->klass_at(index2, CHECK_false); |
1 | 863 |
if (k1 == k2) { |
864 |
return true; |
|
865 |
} |
|
866 |
} break; |
|
867 |
||
868 |
case JVM_CONSTANT_ClassIndex: |
|
869 |
{ |
|
870 |
int recur1 = klass_index_at(index1); |
|
871 |
int recur2 = cp2->klass_index_at(index2); |
|
872 |
bool match = compare_entry_to(recur1, cp2, recur2, CHECK_false); |
|
873 |
if (match) { |
|
874 |
return true; |
|
875 |
} |
|
876 |
} break; |
|
877 |
||
878 |
case JVM_CONSTANT_Double: |
|
879 |
{ |
|
880 |
jdouble d1 = double_at(index1); |
|
881 |
jdouble d2 = cp2->double_at(index2); |
|
882 |
if (d1 == d2) { |
|
883 |
return true; |
|
884 |
} |
|
885 |
} break; |
|
886 |
||
887 |
case JVM_CONSTANT_Fieldref: |
|
888 |
case JVM_CONSTANT_InterfaceMethodref: |
|
889 |
case JVM_CONSTANT_Methodref: |
|
890 |
{ |
|
891 |
int recur1 = uncached_klass_ref_index_at(index1); |
|
892 |
int recur2 = cp2->uncached_klass_ref_index_at(index2); |
|
893 |
bool match = compare_entry_to(recur1, cp2, recur2, CHECK_false); |
|
894 |
if (match) { |
|
895 |
recur1 = uncached_name_and_type_ref_index_at(index1); |
|
896 |
recur2 = cp2->uncached_name_and_type_ref_index_at(index2); |
|
897 |
match = compare_entry_to(recur1, cp2, recur2, CHECK_false); |
|
898 |
if (match) { |
|
899 |
return true; |
|
900 |
} |
|
901 |
} |
|
902 |
} break; |
|
903 |
||
904 |
case JVM_CONSTANT_Float: |
|
905 |
{ |
|
906 |
jfloat f1 = float_at(index1); |
|
907 |
jfloat f2 = cp2->float_at(index2); |
|
908 |
if (f1 == f2) { |
|
909 |
return true; |
|
910 |
} |
|
911 |
} break; |
|
912 |
||
913 |
case JVM_CONSTANT_Integer: |
|
914 |
{ |
|
915 |
jint i1 = int_at(index1); |
|
916 |
jint i2 = cp2->int_at(index2); |
|
917 |
if (i1 == i2) { |
|
918 |
return true; |
|
919 |
} |
|
920 |
} break; |
|
921 |
||
922 |
case JVM_CONSTANT_Long: |
|
923 |
{ |
|
924 |
jlong l1 = long_at(index1); |
|
925 |
jlong l2 = cp2->long_at(index2); |
|
926 |
if (l1 == l2) { |
|
927 |
return true; |
|
928 |
} |
|
929 |
} break; |
|
930 |
||
931 |
case JVM_CONSTANT_NameAndType: |
|
932 |
{ |
|
933 |
int recur1 = name_ref_index_at(index1); |
|
934 |
int recur2 = cp2->name_ref_index_at(index2); |
|
935 |
bool match = compare_entry_to(recur1, cp2, recur2, CHECK_false); |
|
936 |
if (match) { |
|
937 |
recur1 = signature_ref_index_at(index1); |
|
938 |
recur2 = cp2->signature_ref_index_at(index2); |
|
939 |
match = compare_entry_to(recur1, cp2, recur2, CHECK_false); |
|
940 |
if (match) { |
|
941 |
return true; |
|
942 |
} |
|
943 |
} |
|
944 |
} break; |
|
945 |
||
946 |
case JVM_CONSTANT_StringIndex: |
|
947 |
{ |
|
948 |
int recur1 = string_index_at(index1); |
|
949 |
int recur2 = cp2->string_index_at(index2); |
|
950 |
bool match = compare_entry_to(recur1, cp2, recur2, CHECK_false); |
|
951 |
if (match) { |
|
952 |
return true; |
|
953 |
} |
|
954 |
} break; |
|
955 |
||
956 |
case JVM_CONSTANT_UnresolvedClass: |
|
957 |
{ |
|
25325 | 958 |
Symbol* k1 = klass_name_at(index1); |
959 |
Symbol* k2 = cp2->klass_name_at(index2); |
|
1 | 960 |
if (k1 == k2) { |
961 |
return true; |
|
962 |
} |
|
963 |
} break; |
|
964 |
||
5882 | 965 |
case JVM_CONSTANT_MethodType: |
966 |
{ |
|
20672
9340852feeef
8025185: MethodHandleInError and MethodTypeInError not handled in ConstantPool::compare_entry_to and copy_entry_to
coleenp
parents:
20282
diff
changeset
|
967 |
int k1 = method_type_index_at_error_ok(index1); |
9340852feeef
8025185: MethodHandleInError and MethodTypeInError not handled in ConstantPool::compare_entry_to and copy_entry_to
coleenp
parents:
20282
diff
changeset
|
968 |
int k2 = cp2->method_type_index_at_error_ok(index2); |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
969 |
bool match = compare_entry_to(k1, cp2, k2, CHECK_false); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
970 |
if (match) { |
5882 | 971 |
return true; |
972 |
} |
|
973 |
} break; |
|
974 |
||
975 |
case JVM_CONSTANT_MethodHandle: |
|
976 |
{ |
|
20672
9340852feeef
8025185: MethodHandleInError and MethodTypeInError not handled in ConstantPool::compare_entry_to and copy_entry_to
coleenp
parents:
20282
diff
changeset
|
977 |
int k1 = method_handle_ref_kind_at_error_ok(index1); |
9340852feeef
8025185: MethodHandleInError and MethodTypeInError not handled in ConstantPool::compare_entry_to and copy_entry_to
coleenp
parents:
20282
diff
changeset
|
978 |
int k2 = cp2->method_handle_ref_kind_at_error_ok(index2); |
5882 | 979 |
if (k1 == k2) { |
20672
9340852feeef
8025185: MethodHandleInError and MethodTypeInError not handled in ConstantPool::compare_entry_to and copy_entry_to
coleenp
parents:
20282
diff
changeset
|
980 |
int i1 = method_handle_index_at_error_ok(index1); |
9340852feeef
8025185: MethodHandleInError and MethodTypeInError not handled in ConstantPool::compare_entry_to and copy_entry_to
coleenp
parents:
20282
diff
changeset
|
981 |
int i2 = cp2->method_handle_index_at_error_ok(index2); |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
982 |
bool match = compare_entry_to(i1, cp2, i2, CHECK_false); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
983 |
if (match) { |
5882 | 984 |
return true; |
985 |
} |
|
986 |
} |
|
987 |
} break; |
|
988 |
||
6062
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5882
diff
changeset
|
989 |
case JVM_CONSTANT_InvokeDynamic: |
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5882
diff
changeset
|
990 |
{ |
17077
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
991 |
int k1 = invoke_dynamic_name_and_type_ref_index_at(index1); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
992 |
int k2 = cp2->invoke_dynamic_name_and_type_ref_index_at(index2); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
993 |
int i1 = invoke_dynamic_bootstrap_specifier_index(index1); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
994 |
int i2 = cp2->invoke_dynamic_bootstrap_specifier_index(index2); |
17833 | 995 |
// separate statements and variables because CHECK_false is used |
996 |
bool match_entry = compare_entry_to(k1, cp2, k2, CHECK_false); |
|
997 |
bool match_operand = compare_operand_to(i1, cp2, i2, CHECK_false); |
|
998 |
return (match_entry && match_operand); |
|
6062
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5882
diff
changeset
|
999 |
} break; |
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5882
diff
changeset
|
1000 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1001 |
case JVM_CONSTANT_String: |
1 | 1002 |
{ |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7436
diff
changeset
|
1003 |
Symbol* s1 = unresolved_string_at(index1); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7436
diff
changeset
|
1004 |
Symbol* s2 = cp2->unresolved_string_at(index2); |
1 | 1005 |
if (s1 == s2) { |
1006 |
return true; |
|
1007 |
} |
|
1008 |
} break; |
|
1009 |
||
1010 |
case JVM_CONSTANT_Utf8: |
|
1011 |
{ |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7436
diff
changeset
|
1012 |
Symbol* s1 = symbol_at(index1); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7436
diff
changeset
|
1013 |
Symbol* s2 = cp2->symbol_at(index2); |
1 | 1014 |
if (s1 == s2) { |
1015 |
return true; |
|
1016 |
} |
|
1017 |
} break; |
|
1018 |
||
1019 |
// Invalid is used as the tag for the second constant pool entry |
|
1020 |
// occupied by JVM_CONSTANT_Double or JVM_CONSTANT_Long. It should |
|
1021 |
// not be seen by itself. |
|
1022 |
case JVM_CONSTANT_Invalid: // fall through |
|
1023 |
||
1024 |
default: |
|
1025 |
ShouldNotReachHere(); |
|
1026 |
break; |
|
1027 |
} |
|
1028 |
||
1029 |
return false; |
|
1030 |
} // end compare_entry_to() |
|
1031 |
||
1032 |
||
17077
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1033 |
// Resize the operands array with delta_len and delta_size. |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1034 |
// Used in RedefineClasses for CP merge. |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1035 |
void ConstantPool::resize_operands(int delta_len, int delta_size, TRAPS) { |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1036 |
int old_len = operand_array_length(operands()); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1037 |
int new_len = old_len + delta_len; |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1038 |
int min_len = (delta_len > 0) ? old_len : new_len; |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1039 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1040 |
int old_size = operands()->length(); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1041 |
int new_size = old_size + delta_size; |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1042 |
int min_size = (delta_size > 0) ? old_size : new_size; |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1043 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1044 |
ClassLoaderData* loader_data = pool_holder()->class_loader_data(); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1045 |
Array<u2>* new_ops = MetadataFactory::new_array<u2>(loader_data, new_size, CHECK); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1046 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1047 |
// Set index in the resized array for existing elements only |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1048 |
for (int idx = 0; idx < min_len; idx++) { |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1049 |
int offset = operand_offset_at(idx); // offset in original array |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1050 |
operand_offset_at_put(new_ops, idx, offset + 2*delta_len); // offset in resized array |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1051 |
} |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1052 |
// Copy the bootstrap specifiers only |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1053 |
Copy::conjoint_memory_atomic(operands()->adr_at(2*old_len), |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1054 |
new_ops->adr_at(2*new_len), |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1055 |
(min_size - 2*min_len) * sizeof(u2)); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1056 |
// Explicitly deallocate old operands array. |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1057 |
// Note, it is not needed for 7u backport. |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1058 |
if ( operands() != NULL) { // the safety check |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1059 |
MetadataFactory::free_array<u2>(loader_data, operands()); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1060 |
} |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1061 |
set_operands(new_ops); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1062 |
} // end resize_operands() |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1063 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1064 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1065 |
// Extend the operands array with the length and size of the ext_cp operands. |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1066 |
// Used in RedefineClasses for CP merge. |
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
1067 |
void ConstantPool::extend_operands(const constantPoolHandle& ext_cp, TRAPS) { |
17077
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1068 |
int delta_len = operand_array_length(ext_cp->operands()); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1069 |
if (delta_len == 0) { |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1070 |
return; // nothing to do |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1071 |
} |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1072 |
int delta_size = ext_cp->operands()->length(); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1073 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1074 |
assert(delta_len > 0 && delta_size > 0, "extended operands array must be bigger"); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1075 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1076 |
if (operand_array_length(operands()) == 0) { |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1077 |
ClassLoaderData* loader_data = pool_holder()->class_loader_data(); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1078 |
Array<u2>* new_ops = MetadataFactory::new_array<u2>(loader_data, delta_size, CHECK); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1079 |
// The first element index defines the offset of second part |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1080 |
operand_offset_at_put(new_ops, 0, 2*delta_len); // offset in new array |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1081 |
set_operands(new_ops); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1082 |
} else { |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1083 |
resize_operands(delta_len, delta_size, CHECK); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1084 |
} |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1085 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1086 |
} // end extend_operands() |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1087 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1088 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1089 |
// Shrink the operands array to a smaller array with new_len length. |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1090 |
// Used in RedefineClasses for CP merge. |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1091 |
void ConstantPool::shrink_operands(int new_len, TRAPS) { |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1092 |
int old_len = operand_array_length(operands()); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1093 |
if (new_len == old_len) { |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1094 |
return; // nothing to do |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1095 |
} |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1096 |
assert(new_len < old_len, "shrunken operands array must be smaller"); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1097 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1098 |
int free_base = operand_next_offset_at(new_len - 1); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1099 |
int delta_len = new_len - old_len; |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1100 |
int delta_size = 2*delta_len + free_base - operands()->length(); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1101 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1102 |
resize_operands(delta_len, delta_size, CHECK); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1103 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1104 |
} // end shrink_operands() |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1105 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1106 |
|
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
1107 |
void ConstantPool::copy_operands(const constantPoolHandle& from_cp, |
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
1108 |
const constantPoolHandle& to_cp, |
15433
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1109 |
TRAPS) { |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1110 |
|
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1111 |
int from_oplen = operand_array_length(from_cp->operands()); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1112 |
int old_oplen = operand_array_length(to_cp->operands()); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1113 |
if (from_oplen != 0) { |
14385 | 1114 |
ClassLoaderData* loader_data = to_cp->pool_holder()->class_loader_data(); |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1115 |
// append my operands to the target's operands array |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1116 |
if (old_oplen == 0) { |
14385 | 1117 |
// Can't just reuse from_cp's operand list because of deallocation issues |
1118 |
int len = from_cp->operands()->length(); |
|
1119 |
Array<u2>* new_ops = MetadataFactory::new_array<u2>(loader_data, len, CHECK); |
|
1120 |
Copy::conjoint_memory_atomic( |
|
1121 |
from_cp->operands()->adr_at(0), new_ops->adr_at(0), len * sizeof(u2)); |
|
1122 |
to_cp->set_operands(new_ops); |
|
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1123 |
} else { |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1124 |
int old_len = to_cp->operands()->length(); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1125 |
int from_len = from_cp->operands()->length(); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1126 |
int old_off = old_oplen * sizeof(u2); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1127 |
int from_off = from_oplen * sizeof(u2); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1128 |
// Use the metaspace for the destination constant pool |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1129 |
Array<u2>* new_operands = MetadataFactory::new_array<u2>(loader_data, old_len + from_len, CHECK); |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1130 |
int fillp = 0, len = 0; |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1131 |
// first part of dest |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1132 |
Copy::conjoint_memory_atomic(to_cp->operands()->adr_at(0), |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1133 |
new_operands->adr_at(fillp), |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1134 |
(len = old_off) * sizeof(u2)); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1135 |
fillp += len; |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1136 |
// first part of src |
15445
3a166138739c
8006546: JSR 292: typos in the ConstantPool::copy_cp_impl()
sspitsyn
parents:
15438
diff
changeset
|
1137 |
Copy::conjoint_memory_atomic(from_cp->operands()->adr_at(0), |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1138 |
new_operands->adr_at(fillp), |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1139 |
(len = from_off) * sizeof(u2)); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1140 |
fillp += len; |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1141 |
// second part of dest |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1142 |
Copy::conjoint_memory_atomic(to_cp->operands()->adr_at(old_off), |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1143 |
new_operands->adr_at(fillp), |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1144 |
(len = old_len - old_off) * sizeof(u2)); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1145 |
fillp += len; |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1146 |
// second part of src |
15445
3a166138739c
8006546: JSR 292: typos in the ConstantPool::copy_cp_impl()
sspitsyn
parents:
15438
diff
changeset
|
1147 |
Copy::conjoint_memory_atomic(from_cp->operands()->adr_at(from_off), |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1148 |
new_operands->adr_at(fillp), |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1149 |
(len = from_len - from_off) * sizeof(u2)); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1150 |
fillp += len; |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1151 |
assert(fillp == new_operands->length(), ""); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1152 |
|
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1153 |
// Adjust indexes in the first part of the copied operands array. |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1154 |
for (int j = 0; j < from_oplen; j++) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1155 |
int offset = operand_offset_at(new_operands, old_oplen + j); |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1156 |
assert(offset == operand_offset_at(from_cp->operands(), j), "correct copy"); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1157 |
offset += old_len; // every new tuple is preceded by old_len extra u2's |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1158 |
operand_offset_at_put(new_operands, old_oplen + j, offset); |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1159 |
} |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1160 |
|
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1161 |
// replace target operands array with combined array |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1162 |
to_cp->set_operands(new_operands); |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1163 |
} |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1164 |
} |
15433
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1165 |
} // end copy_operands() |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1166 |
|
15433
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1167 |
|
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1168 |
// Copy this constant pool's entries at start_i to end_i (inclusive) |
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1169 |
// to the constant pool to_cp's entries starting at to_i. A total of |
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1170 |
// (end_i - start_i) + 1 entries are copied. |
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
1171 |
void ConstantPool::copy_cp_to_impl(const constantPoolHandle& from_cp, int start_i, int end_i, |
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
1172 |
const constantPoolHandle& to_cp, int to_i, TRAPS) { |
15433
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1173 |
|
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1174 |
|
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1175 |
int dest_i = to_i; // leave original alone for debug purposes |
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1176 |
|
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1177 |
for (int src_i = start_i; src_i <= end_i; /* see loop bottom */ ) { |
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1178 |
copy_entry_to(from_cp, src_i, to_cp, dest_i, CHECK); |
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1179 |
|
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1180 |
switch (from_cp->tag_at(src_i).value()) { |
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1181 |
case JVM_CONSTANT_Double: |
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1182 |
case JVM_CONSTANT_Long: |
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1183 |
// double and long take two constant pool entries |
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1184 |
src_i += 2; |
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1185 |
dest_i += 2; |
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1186 |
break; |
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1187 |
|
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1188 |
default: |
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1189 |
// all others take one constant pool entry |
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1190 |
src_i++; |
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1191 |
dest_i++; |
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1192 |
break; |
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1193 |
} |
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1194 |
} |
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1195 |
copy_operands(from_cp, to_cp, CHECK); |
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1196 |
|
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1197 |
} // end copy_cp_to_impl() |
1 | 1198 |
|
1199 |
||
1200 |
// Copy this constant pool's entry at from_i to the constant pool |
|
1201 |
// to_cp's entry at to_i. |
|
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
1202 |
void ConstantPool::copy_entry_to(const constantPoolHandle& from_cp, int from_i, |
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
1203 |
const constantPoolHandle& to_cp, int to_i, |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1204 |
TRAPS) { |
1 | 1205 |
|
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1206 |
int tag = from_cp->tag_at(from_i).value(); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1207 |
switch (tag) { |
1 | 1208 |
case JVM_CONSTANT_Class: |
1209 |
{ |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1210 |
Klass* k = from_cp->klass_at(from_i, CHECK); |
1 | 1211 |
to_cp->klass_at_put(to_i, k); |
1212 |
} break; |
|
1213 |
||
1214 |
case JVM_CONSTANT_ClassIndex: |
|
1215 |
{ |
|
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1216 |
jint ki = from_cp->klass_index_at(from_i); |
1 | 1217 |
to_cp->klass_index_at_put(to_i, ki); |
1218 |
} break; |
|
1219 |
||
1220 |
case JVM_CONSTANT_Double: |
|
1221 |
{ |
|
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1222 |
jdouble d = from_cp->double_at(from_i); |
1 | 1223 |
to_cp->double_at_put(to_i, d); |
1224 |
// double takes two constant pool entries so init second entry's tag |
|
1225 |
to_cp->tag_at_put(to_i + 1, JVM_CONSTANT_Invalid); |
|
1226 |
} break; |
|
1227 |
||
1228 |
case JVM_CONSTANT_Fieldref: |
|
1229 |
{ |
|
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1230 |
int class_index = from_cp->uncached_klass_ref_index_at(from_i); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1231 |
int name_and_type_index = from_cp->uncached_name_and_type_ref_index_at(from_i); |
1 | 1232 |
to_cp->field_at_put(to_i, class_index, name_and_type_index); |
1233 |
} break; |
|
1234 |
||
1235 |
case JVM_CONSTANT_Float: |
|
1236 |
{ |
|
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1237 |
jfloat f = from_cp->float_at(from_i); |
1 | 1238 |
to_cp->float_at_put(to_i, f); |
1239 |
} break; |
|
1240 |
||
1241 |
case JVM_CONSTANT_Integer: |
|
1242 |
{ |
|
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1243 |
jint i = from_cp->int_at(from_i); |
1 | 1244 |
to_cp->int_at_put(to_i, i); |
1245 |
} break; |
|
1246 |
||
1247 |
case JVM_CONSTANT_InterfaceMethodref: |
|
1248 |
{ |
|
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1249 |
int class_index = from_cp->uncached_klass_ref_index_at(from_i); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1250 |
int name_and_type_index = from_cp->uncached_name_and_type_ref_index_at(from_i); |
1 | 1251 |
to_cp->interface_method_at_put(to_i, class_index, name_and_type_index); |
1252 |
} break; |
|
1253 |
||
1254 |
case JVM_CONSTANT_Long: |
|
1255 |
{ |
|
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1256 |
jlong l = from_cp->long_at(from_i); |
1 | 1257 |
to_cp->long_at_put(to_i, l); |
1258 |
// long takes two constant pool entries so init second entry's tag |
|
1259 |
to_cp->tag_at_put(to_i + 1, JVM_CONSTANT_Invalid); |
|
1260 |
} break; |
|
1261 |
||
1262 |
case JVM_CONSTANT_Methodref: |
|
1263 |
{ |
|
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1264 |
int class_index = from_cp->uncached_klass_ref_index_at(from_i); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1265 |
int name_and_type_index = from_cp->uncached_name_and_type_ref_index_at(from_i); |
1 | 1266 |
to_cp->method_at_put(to_i, class_index, name_and_type_index); |
1267 |
} break; |
|
1268 |
||
1269 |
case JVM_CONSTANT_NameAndType: |
|
1270 |
{ |
|
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1271 |
int name_ref_index = from_cp->name_ref_index_at(from_i); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1272 |
int signature_ref_index = from_cp->signature_ref_index_at(from_i); |
1 | 1273 |
to_cp->name_and_type_at_put(to_i, name_ref_index, signature_ref_index); |
1274 |
} break; |
|
1275 |
||
1276 |
case JVM_CONSTANT_StringIndex: |
|
1277 |
{ |
|
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1278 |
jint si = from_cp->string_index_at(from_i); |
1 | 1279 |
to_cp->string_index_at_put(to_i, si); |
1280 |
} break; |
|
1281 |
||
1282 |
case JVM_CONSTANT_UnresolvedClass: |
|
23175
892220ab2ae1
8035150: ShouldNotReachHere() in ConstantPool::copy_entry_to
sla
parents:
22750
diff
changeset
|
1283 |
case JVM_CONSTANT_UnresolvedClassInError: |
1 | 1284 |
{ |
8651
81b517a9249f
6512830: Error: assert(tag_at(which).is_unresolved_klass(), "Corrupted constant pool")
coleenp
parents:
8076
diff
changeset
|
1285 |
// Can be resolved after checking tag, so check the slot first. |
81b517a9249f
6512830: Error: assert(tag_at(which).is_unresolved_klass(), "Corrupted constant pool")
coleenp
parents:
8076
diff
changeset
|
1286 |
CPSlot entry = from_cp->slot_at(from_i); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1287 |
if (entry.is_resolved()) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1288 |
assert(entry.get_klass()->is_klass(), "must be"); |
8651
81b517a9249f
6512830: Error: assert(tag_at(which).is_unresolved_klass(), "Corrupted constant pool")
coleenp
parents:
8076
diff
changeset
|
1289 |
// Already resolved |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1290 |
to_cp->klass_at_put(to_i, entry.get_klass()); |
8651
81b517a9249f
6512830: Error: assert(tag_at(which).is_unresolved_klass(), "Corrupted constant pool")
coleenp
parents:
8076
diff
changeset
|
1291 |
} else { |
81b517a9249f
6512830: Error: assert(tag_at(which).is_unresolved_klass(), "Corrupted constant pool")
coleenp
parents:
8076
diff
changeset
|
1292 |
to_cp->unresolved_klass_at_put(to_i, entry.get_symbol()); |
81b517a9249f
6512830: Error: assert(tag_at(which).is_unresolved_klass(), "Corrupted constant pool")
coleenp
parents:
8076
diff
changeset
|
1293 |
} |
1 | 1294 |
} break; |
1295 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1296 |
case JVM_CONSTANT_String: |
1 | 1297 |
{ |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1298 |
Symbol* s = from_cp->unresolved_string_at(from_i); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1299 |
to_cp->unresolved_string_at_put(to_i, s); |
1 | 1300 |
} break; |
1301 |
||
1302 |
case JVM_CONSTANT_Utf8: |
|
1303 |
{ |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7436
diff
changeset
|
1304 |
Symbol* s = from_cp->symbol_at(from_i); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1305 |
// Need to increase refcount, the old one will be thrown away and deferenced |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1306 |
s->increment_refcount(); |
1 | 1307 |
to_cp->symbol_at_put(to_i, s); |
1308 |
} break; |
|
1309 |
||
5882 | 1310 |
case JVM_CONSTANT_MethodType: |
20672
9340852feeef
8025185: MethodHandleInError and MethodTypeInError not handled in ConstantPool::compare_entry_to and copy_entry_to
coleenp
parents:
20282
diff
changeset
|
1311 |
case JVM_CONSTANT_MethodTypeInError: |
5882 | 1312 |
{ |
20672
9340852feeef
8025185: MethodHandleInError and MethodTypeInError not handled in ConstantPool::compare_entry_to and copy_entry_to
coleenp
parents:
20282
diff
changeset
|
1313 |
jint k = from_cp->method_type_index_at_error_ok(from_i); |
5882 | 1314 |
to_cp->method_type_index_at_put(to_i, k); |
1315 |
} break; |
|
1316 |
||
1317 |
case JVM_CONSTANT_MethodHandle: |
|
20672
9340852feeef
8025185: MethodHandleInError and MethodTypeInError not handled in ConstantPool::compare_entry_to and copy_entry_to
coleenp
parents:
20282
diff
changeset
|
1318 |
case JVM_CONSTANT_MethodHandleInError: |
5882 | 1319 |
{ |
20672
9340852feeef
8025185: MethodHandleInError and MethodTypeInError not handled in ConstantPool::compare_entry_to and copy_entry_to
coleenp
parents:
20282
diff
changeset
|
1320 |
int k1 = from_cp->method_handle_ref_kind_at_error_ok(from_i); |
9340852feeef
8025185: MethodHandleInError and MethodTypeInError not handled in ConstantPool::compare_entry_to and copy_entry_to
coleenp
parents:
20282
diff
changeset
|
1321 |
int k2 = from_cp->method_handle_index_at_error_ok(from_i); |
5882 | 1322 |
to_cp->method_handle_index_at_put(to_i, k1, k2); |
1323 |
} break; |
|
1324 |
||
6062
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5882
diff
changeset
|
1325 |
case JVM_CONSTANT_InvokeDynamic: |
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5882
diff
changeset
|
1326 |
{ |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1327 |
int k1 = from_cp->invoke_dynamic_bootstrap_specifier_index(from_i); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1328 |
int k2 = from_cp->invoke_dynamic_name_and_type_ref_index_at(from_i); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1329 |
k1 += operand_array_length(to_cp->operands()); // to_cp might already have operands |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1330 |
to_cp->invoke_dynamic_at_put(to_i, k1, k2); |
6062
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5882
diff
changeset
|
1331 |
} break; |
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5882
diff
changeset
|
1332 |
|
1 | 1333 |
// Invalid is used as the tag for the second constant pool entry |
1334 |
// occupied by JVM_CONSTANT_Double or JVM_CONSTANT_Long. It should |
|
1335 |
// not be seen by itself. |
|
1336 |
case JVM_CONSTANT_Invalid: // fall through |
|
1337 |
||
1338 |
default: |
|
1339 |
{ |
|
1340 |
ShouldNotReachHere(); |
|
1341 |
} break; |
|
1342 |
} |
|
1343 |
} // end copy_entry_to() |
|
1344 |
||
1345 |
||
1346 |
// Search constant pool search_cp for an entry that matches this |
|
1347 |
// constant pool's entry at pattern_i. Returns the index of a |
|
1348 |
// matching entry or zero (0) if there is no matching entry. |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1349 |
int ConstantPool::find_matching_entry(int pattern_i, |
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
1350 |
const constantPoolHandle& search_cp, TRAPS) { |
1 | 1351 |
|
1352 |
// index zero (0) is not used |
|
1353 |
for (int i = 1; i < search_cp->length(); i++) { |
|
1354 |
bool found = compare_entry_to(pattern_i, search_cp, i, CHECK_0); |
|
1355 |
if (found) { |
|
1356 |
return i; |
|
1357 |
} |
|
1358 |
} |
|
1359 |
||
1360 |
return 0; // entry not found; return unused index zero (0) |
|
1361 |
} // end find_matching_entry() |
|
1362 |
||
1363 |
||
17077
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1364 |
// Compare this constant pool's bootstrap specifier at idx1 to the constant pool |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1365 |
// cp2's bootstrap specifier at idx2. |
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
1366 |
bool ConstantPool::compare_operand_to(int idx1, const constantPoolHandle& cp2, int idx2, TRAPS) { |
17077
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1367 |
int k1 = operand_bootstrap_method_ref_index_at(idx1); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1368 |
int k2 = cp2->operand_bootstrap_method_ref_index_at(idx2); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1369 |
bool match = compare_entry_to(k1, cp2, k2, CHECK_false); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1370 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1371 |
if (!match) { |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1372 |
return false; |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1373 |
} |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1374 |
int argc = operand_argument_count_at(idx1); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1375 |
if (argc == cp2->operand_argument_count_at(idx2)) { |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1376 |
for (int j = 0; j < argc; j++) { |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1377 |
k1 = operand_argument_index_at(idx1, j); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1378 |
k2 = cp2->operand_argument_index_at(idx2, j); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1379 |
match = compare_entry_to(k1, cp2, k2, CHECK_false); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1380 |
if (!match) { |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1381 |
return false; |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1382 |
} |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1383 |
} |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1384 |
return true; // got through loop; all elements equal |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1385 |
} |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1386 |
return false; |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1387 |
} // end compare_operand_to() |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1388 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1389 |
// Search constant pool search_cp for a bootstrap specifier that matches |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1390 |
// this constant pool's bootstrap specifier at pattern_i index. |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1391 |
// Return the index of a matching bootstrap specifier or (-1) if there is no match. |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1392 |
int ConstantPool::find_matching_operand(int pattern_i, |
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
1393 |
const constantPoolHandle& search_cp, int search_len, TRAPS) { |
17077
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1394 |
for (int i = 0; i < search_len; i++) { |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1395 |
bool found = compare_operand_to(pattern_i, search_cp, i, CHECK_(-1)); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1396 |
if (found) { |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1397 |
return i; |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1398 |
} |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1399 |
} |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1400 |
return -1; // bootstrap specifier not found; return unused index (-1) |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1401 |
} // end find_matching_operand() |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1402 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
16670
diff
changeset
|
1403 |
|
1 | 1404 |
#ifndef PRODUCT |
1405 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1406 |
const char* ConstantPool::printable_name_at(int which) { |
1 | 1407 |
|
1408 |
constantTag tag = tag_at(which); |
|
1409 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1410 |
if (tag.is_string()) { |
1 | 1411 |
return string_at_noresolve(which); |
1412 |
} else if (tag.is_klass() || tag.is_unresolved_klass()) { |
|
1413 |
return klass_name_at(which)->as_C_string(); |
|
1414 |
} else if (tag.is_symbol()) { |
|
1415 |
return symbol_at(which)->as_C_string(); |
|
1416 |
} |
|
1417 |
return ""; |
|
1418 |
} |
|
1419 |
||
1420 |
#endif // PRODUCT |
|
1421 |
||
1422 |
||
1423 |
// JVMTI GetConstantPool support |
|
1424 |
||
16670
4af09aff4237
8003310: Enable -Wunused-function when compiling with gcc
mikael
parents:
16383
diff
changeset
|
1425 |
// For debugging of constant pool |
4af09aff4237
8003310: Enable -Wunused-function when compiling with gcc
mikael
parents:
16383
diff
changeset
|
1426 |
const bool debug_cpool = false; |
1 | 1427 |
|
16670
4af09aff4237
8003310: Enable -Wunused-function when compiling with gcc
mikael
parents:
16383
diff
changeset
|
1428 |
#define DBG(code) do { if (debug_cpool) { (code); } } while(0) |
1 | 1429 |
|
1430 |
static void print_cpool_bytes(jint cnt, u1 *bytes) { |
|
16670
4af09aff4237
8003310: Enable -Wunused-function when compiling with gcc
mikael
parents:
16383
diff
changeset
|
1431 |
const char* WARN_MSG = "Must not be such entry!"; |
1 | 1432 |
jint size = 0; |
1433 |
u2 idx1, idx2; |
|
1434 |
||
1435 |
for (jint idx = 1; idx < cnt; idx++) { |
|
1436 |
jint ent_size = 0; |
|
1437 |
u1 tag = *bytes++; |
|
1438 |
size++; // count tag |
|
1439 |
||
1440 |
printf("const #%03d, tag: %02d ", idx, tag); |
|
1441 |
switch(tag) { |
|
1442 |
case JVM_CONSTANT_Invalid: { |
|
1443 |
printf("Invalid"); |
|
1444 |
break; |
|
1445 |
} |
|
1446 |
case JVM_CONSTANT_Unicode: { |
|
1447 |
printf("Unicode %s", WARN_MSG); |
|
1448 |
break; |
|
1449 |
} |
|
1450 |
case JVM_CONSTANT_Utf8: { |
|
1451 |
u2 len = Bytes::get_Java_u2(bytes); |
|
1452 |
char str[128]; |
|
1453 |
if (len > 127) { |
|
1454 |
len = 127; |
|
1455 |
} |
|
1456 |
strncpy(str, (char *) (bytes+2), len); |
|
1457 |
str[len] = '\0'; |
|
1458 |
printf("Utf8 \"%s\"", str); |
|
1459 |
ent_size = 2 + len; |
|
1460 |
break; |
|
1461 |
} |
|
1462 |
case JVM_CONSTANT_Integer: { |
|
1463 |
u4 val = Bytes::get_Java_u4(bytes); |
|
1464 |
printf("int %d", *(int *) &val); |
|
1465 |
ent_size = 4; |
|
1466 |
break; |
|
1467 |
} |
|
1468 |
case JVM_CONSTANT_Float: { |
|
1469 |
u4 val = Bytes::get_Java_u4(bytes); |
|
1470 |
printf("float %5.3ff", *(float *) &val); |
|
1471 |
ent_size = 4; |
|
1472 |
break; |
|
1473 |
} |
|
1474 |
case JVM_CONSTANT_Long: { |
|
1475 |
u8 val = Bytes::get_Java_u8(bytes); |
|
31592
43f48e165466
8081202: Hotspot compile warning: "Invalid suffix on literal; C++11 requires a space between literal and identifier"
bpittore
parents:
31046
diff
changeset
|
1476 |
printf("long " INT64_FORMAT, (int64_t) *(jlong *) &val); |
1 | 1477 |
ent_size = 8; |
1478 |
idx++; // Long takes two cpool slots |
|
1479 |
break; |
|
1480 |
} |
|
1481 |
case JVM_CONSTANT_Double: { |
|
1482 |
u8 val = Bytes::get_Java_u8(bytes); |
|
1483 |
printf("double %5.3fd", *(jdouble *)&val); |
|
1484 |
ent_size = 8; |
|
1485 |
idx++; // Double takes two cpool slots |
|
1486 |
break; |
|
1487 |
} |
|
1488 |
case JVM_CONSTANT_Class: { |
|
1489 |
idx1 = Bytes::get_Java_u2(bytes); |
|
1490 |
printf("class #%03d", idx1); |
|
1491 |
ent_size = 2; |
|
1492 |
break; |
|
1493 |
} |
|
1494 |
case JVM_CONSTANT_String: { |
|
1495 |
idx1 = Bytes::get_Java_u2(bytes); |
|
1496 |
printf("String #%03d", idx1); |
|
1497 |
ent_size = 2; |
|
1498 |
break; |
|
1499 |
} |
|
1500 |
case JVM_CONSTANT_Fieldref: { |
|
1501 |
idx1 = Bytes::get_Java_u2(bytes); |
|
1502 |
idx2 = Bytes::get_Java_u2(bytes+2); |
|
1503 |
printf("Field #%03d, #%03d", (int) idx1, (int) idx2); |
|
1504 |
ent_size = 4; |
|
1505 |
break; |
|
1506 |
} |
|
1507 |
case JVM_CONSTANT_Methodref: { |
|
1508 |
idx1 = Bytes::get_Java_u2(bytes); |
|
1509 |
idx2 = Bytes::get_Java_u2(bytes+2); |
|
1510 |
printf("Method #%03d, #%03d", idx1, idx2); |
|
1511 |
ent_size = 4; |
|
1512 |
break; |
|
1513 |
} |
|
1514 |
case JVM_CONSTANT_InterfaceMethodref: { |
|
1515 |
idx1 = Bytes::get_Java_u2(bytes); |
|
1516 |
idx2 = Bytes::get_Java_u2(bytes+2); |
|
1517 |
printf("InterfMethod #%03d, #%03d", idx1, idx2); |
|
1518 |
ent_size = 4; |
|
1519 |
break; |
|
1520 |
} |
|
1521 |
case JVM_CONSTANT_NameAndType: { |
|
1522 |
idx1 = Bytes::get_Java_u2(bytes); |
|
1523 |
idx2 = Bytes::get_Java_u2(bytes+2); |
|
1524 |
printf("NameAndType #%03d, #%03d", idx1, idx2); |
|
1525 |
ent_size = 4; |
|
1526 |
break; |
|
1527 |
} |
|
1528 |
case JVM_CONSTANT_ClassIndex: { |
|
1529 |
printf("ClassIndex %s", WARN_MSG); |
|
1530 |
break; |
|
1531 |
} |
|
1532 |
case JVM_CONSTANT_UnresolvedClass: { |
|
1533 |
printf("UnresolvedClass: %s", WARN_MSG); |
|
1534 |
break; |
|
1535 |
} |
|
1536 |
case JVM_CONSTANT_UnresolvedClassInError: { |
|
1537 |
printf("UnresolvedClassInErr: %s", WARN_MSG); |
|
1538 |
break; |
|
1539 |
} |
|
1540 |
case JVM_CONSTANT_StringIndex: { |
|
1541 |
printf("StringIndex: %s", WARN_MSG); |
|
1542 |
break; |
|
1543 |
} |
|
1544 |
} |
|
1545 |
printf(";\n"); |
|
1546 |
bytes += ent_size; |
|
1547 |
size += ent_size; |
|
1548 |
} |
|
1549 |
printf("Cpool size: %d\n", size); |
|
1550 |
fflush(0); |
|
1551 |
return; |
|
1552 |
} /* end print_cpool_bytes */ |
|
1553 |
||
1554 |
||
1555 |
// Returns size of constant pool entry. |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1556 |
jint ConstantPool::cpool_entry_size(jint idx) { |
1 | 1557 |
switch(tag_at(idx).value()) { |
1558 |
case JVM_CONSTANT_Invalid: |
|
1559 |
case JVM_CONSTANT_Unicode: |
|
1560 |
return 1; |
|
1561 |
||
1562 |
case JVM_CONSTANT_Utf8: |
|
1563 |
return 3 + symbol_at(idx)->utf8_length(); |
|
1564 |
||
1565 |
case JVM_CONSTANT_Class: |
|
1566 |
case JVM_CONSTANT_String: |
|
1567 |
case JVM_CONSTANT_ClassIndex: |
|
1568 |
case JVM_CONSTANT_UnresolvedClass: |
|
1569 |
case JVM_CONSTANT_UnresolvedClassInError: |
|
1570 |
case JVM_CONSTANT_StringIndex: |
|
5882 | 1571 |
case JVM_CONSTANT_MethodType: |
20070
90ee74be2445
8025088: Missing cases for JVM_CONSTANT_MethodHandleInError cause crash if debugger steps into error-tagged method handle
iklam
parents:
20066
diff
changeset
|
1572 |
case JVM_CONSTANT_MethodTypeInError: |
1 | 1573 |
return 3; |
1574 |
||
5882 | 1575 |
case JVM_CONSTANT_MethodHandle: |
20070
90ee74be2445
8025088: Missing cases for JVM_CONSTANT_MethodHandleInError cause crash if debugger steps into error-tagged method handle
iklam
parents:
20066
diff
changeset
|
1576 |
case JVM_CONSTANT_MethodHandleInError: |
5882 | 1577 |
return 4; //tag, ref_kind, ref_index |
1578 |
||
1 | 1579 |
case JVM_CONSTANT_Integer: |
1580 |
case JVM_CONSTANT_Float: |
|
1581 |
case JVM_CONSTANT_Fieldref: |
|
1582 |
case JVM_CONSTANT_Methodref: |
|
1583 |
case JVM_CONSTANT_InterfaceMethodref: |
|
1584 |
case JVM_CONSTANT_NameAndType: |
|
7114
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
1585 |
return 5; |
65d21c4c6337
6984311: JSR 292 needs optional bootstrap method parameters
jrose
parents:
7111
diff
changeset
|
1586 |
|
6062
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5882
diff
changeset
|
1587 |
case JVM_CONSTANT_InvokeDynamic: |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1588 |
// u1 tag, u2 bsm, u2 nt |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1589 |
return 5; |
1 | 1590 |
|
1591 |
case JVM_CONSTANT_Long: |
|
1592 |
case JVM_CONSTANT_Double: |
|
1593 |
return 9; |
|
1594 |
} |
|
1595 |
assert(false, "cpool_entry_size: Invalid constant pool entry tag"); |
|
1596 |
return 1; |
|
1597 |
} /* end cpool_entry_size */ |
|
1598 |
||
1599 |
||
1600 |
// SymbolHashMap is used to find a constant pool index from a string. |
|
1601 |
// This function fills in SymbolHashMaps, one for utf8s and one for |
|
1602 |
// class names, returns size of the cpool raw bytes. |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1603 |
jint ConstantPool::hash_entries_to(SymbolHashMap *symmap, |
1 | 1604 |
SymbolHashMap *classmap) { |
1605 |
jint size = 0; |
|
1606 |
||
1607 |
for (u2 idx = 1; idx < length(); idx++) { |
|
1608 |
u2 tag = tag_at(idx).value(); |
|
1609 |
size += cpool_entry_size(idx); |
|
1610 |
||
1611 |
switch(tag) { |
|
1612 |
case JVM_CONSTANT_Utf8: { |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7436
diff
changeset
|
1613 |
Symbol* sym = symbol_at(idx); |
1 | 1614 |
symmap->add_entry(sym, idx); |
1615 |
DBG(printf("adding symbol entry %s = %d\n", sym->as_utf8(), idx)); |
|
1616 |
break; |
|
1617 |
} |
|
1618 |
case JVM_CONSTANT_Class: |
|
1619 |
case JVM_CONSTANT_UnresolvedClass: |
|
1620 |
case JVM_CONSTANT_UnresolvedClassInError: { |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7436
diff
changeset
|
1621 |
Symbol* sym = klass_name_at(idx); |
1 | 1622 |
classmap->add_entry(sym, idx); |
1623 |
DBG(printf("adding class entry %s = %d\n", sym->as_utf8(), idx)); |
|
1624 |
break; |
|
1625 |
} |
|
1626 |
case JVM_CONSTANT_Long: |
|
1627 |
case JVM_CONSTANT_Double: { |
|
1628 |
idx++; // Both Long and Double take two cpool slots |
|
1629 |
break; |
|
1630 |
} |
|
1631 |
} |
|
1632 |
} |
|
1633 |
return size; |
|
1634 |
} /* end hash_utf8_entries_to */ |
|
1635 |
||
1636 |
||
1637 |
// Copy cpool bytes. |
|
1638 |
// Returns: |
|
1639 |
// 0, in case of OutOfMemoryError |
|
1640 |
// -1, in case of internal error |
|
1641 |
// > 0, count of the raw cpool bytes that have been copied |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1642 |
int ConstantPool::copy_cpool_bytes(int cpool_size, |
1 | 1643 |
SymbolHashMap* tbl, |
1644 |
unsigned char *bytes) { |
|
1645 |
u2 idx1, idx2; |
|
1646 |
jint size = 0; |
|
1647 |
jint cnt = length(); |
|
1648 |
unsigned char *start_bytes = bytes; |
|
1649 |
||
1650 |
for (jint idx = 1; idx < cnt; idx++) { |
|
1651 |
u1 tag = tag_at(idx).value(); |
|
1652 |
jint ent_size = cpool_entry_size(idx); |
|
1653 |
||
1654 |
assert(size + ent_size <= cpool_size, "Size mismatch"); |
|
1655 |
||
1656 |
*bytes = tag; |
|
1657 |
DBG(printf("#%03hd tag=%03hd, ", idx, tag)); |
|
1658 |
switch(tag) { |
|
1659 |
case JVM_CONSTANT_Invalid: { |
|
1660 |
DBG(printf("JVM_CONSTANT_Invalid")); |
|
1661 |
break; |
|
1662 |
} |
|
1663 |
case JVM_CONSTANT_Unicode: { |
|
1664 |
assert(false, "Wrong constant pool tag: JVM_CONSTANT_Unicode"); |
|
1665 |
DBG(printf("JVM_CONSTANT_Unicode")); |
|
1666 |
break; |
|
1667 |
} |
|
1668 |
case JVM_CONSTANT_Utf8: { |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7436
diff
changeset
|
1669 |
Symbol* sym = symbol_at(idx); |
1 | 1670 |
char* str = sym->as_utf8(); |
1671 |
// Warning! It's crashing on x86 with len = sym->utf8_length() |
|
1672 |
int len = (int) strlen(str); |
|
1673 |
Bytes::put_Java_u2((address) (bytes+1), (u2) len); |
|
1674 |
for (int i = 0; i < len; i++) { |
|
1675 |
bytes[3+i] = (u1) str[i]; |
|
1676 |
} |
|
1677 |
DBG(printf("JVM_CONSTANT_Utf8: %s ", str)); |
|
1678 |
break; |
|
1679 |
} |
|
1680 |
case JVM_CONSTANT_Integer: { |
|
1681 |
jint val = int_at(idx); |
|
1682 |
Bytes::put_Java_u4((address) (bytes+1), *(u4*)&val); |
|
1683 |
break; |
|
1684 |
} |
|
1685 |
case JVM_CONSTANT_Float: { |
|
1686 |
jfloat val = float_at(idx); |
|
1687 |
Bytes::put_Java_u4((address) (bytes+1), *(u4*)&val); |
|
1688 |
break; |
|
1689 |
} |
|
1690 |
case JVM_CONSTANT_Long: { |
|
1691 |
jlong val = long_at(idx); |
|
1692 |
Bytes::put_Java_u8((address) (bytes+1), *(u8*)&val); |
|
1693 |
idx++; // Long takes two cpool slots |
|
1694 |
break; |
|
1695 |
} |
|
1696 |
case JVM_CONSTANT_Double: { |
|
1697 |
jdouble val = double_at(idx); |
|
1698 |
Bytes::put_Java_u8((address) (bytes+1), *(u8*)&val); |
|
1699 |
idx++; // Double takes two cpool slots |
|
1700 |
break; |
|
1701 |
} |
|
1702 |
case JVM_CONSTANT_Class: |
|
1703 |
case JVM_CONSTANT_UnresolvedClass: |
|
1704 |
case JVM_CONSTANT_UnresolvedClassInError: { |
|
1705 |
*bytes = JVM_CONSTANT_Class; |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7436
diff
changeset
|
1706 |
Symbol* sym = klass_name_at(idx); |
1 | 1707 |
idx1 = tbl->symbol_to_value(sym); |
1708 |
assert(idx1 != 0, "Have not found a hashtable entry"); |
|
1709 |
Bytes::put_Java_u2((address) (bytes+1), idx1); |
|
1710 |
DBG(printf("JVM_CONSTANT_Class: idx=#%03hd, %s", idx1, sym->as_utf8())); |
|
1711 |
break; |
|
1712 |
} |
|
1713 |
case JVM_CONSTANT_String: { |
|
1714 |
*bytes = JVM_CONSTANT_String; |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7436
diff
changeset
|
1715 |
Symbol* sym = unresolved_string_at(idx); |
1 | 1716 |
idx1 = tbl->symbol_to_value(sym); |
1717 |
assert(idx1 != 0, "Have not found a hashtable entry"); |
|
1718 |
Bytes::put_Java_u2((address) (bytes+1), idx1); |
|
16670
4af09aff4237
8003310: Enable -Wunused-function when compiling with gcc
mikael
parents:
16383
diff
changeset
|
1719 |
DBG(printf("JVM_CONSTANT_String: idx=#%03hd, %s", idx1, sym->as_utf8())); |
1 | 1720 |
break; |
1721 |
} |
|
1722 |
case JVM_CONSTANT_Fieldref: |
|
1723 |
case JVM_CONSTANT_Methodref: |
|
1724 |
case JVM_CONSTANT_InterfaceMethodref: { |
|
1725 |
idx1 = uncached_klass_ref_index_at(idx); |
|
1726 |
idx2 = uncached_name_and_type_ref_index_at(idx); |
|
1727 |
Bytes::put_Java_u2((address) (bytes+1), idx1); |
|
1728 |
Bytes::put_Java_u2((address) (bytes+3), idx2); |
|
1729 |
DBG(printf("JVM_CONSTANT_Methodref: %hd %hd", idx1, idx2)); |
|
1730 |
break; |
|
1731 |
} |
|
1732 |
case JVM_CONSTANT_NameAndType: { |
|
1733 |
idx1 = name_ref_index_at(idx); |
|
1734 |
idx2 = signature_ref_index_at(idx); |
|
1735 |
Bytes::put_Java_u2((address) (bytes+1), idx1); |
|
1736 |
Bytes::put_Java_u2((address) (bytes+3), idx2); |
|
1737 |
DBG(printf("JVM_CONSTANT_NameAndType: %hd %hd", idx1, idx2)); |
|
1738 |
break; |
|
1739 |
} |
|
1740 |
case JVM_CONSTANT_ClassIndex: { |
|
1741 |
*bytes = JVM_CONSTANT_Class; |
|
1742 |
idx1 = klass_index_at(idx); |
|
1743 |
Bytes::put_Java_u2((address) (bytes+1), idx1); |
|
1744 |
DBG(printf("JVM_CONSTANT_ClassIndex: %hd", idx1)); |
|
1745 |
break; |
|
1746 |
} |
|
1747 |
case JVM_CONSTANT_StringIndex: { |
|
1748 |
*bytes = JVM_CONSTANT_String; |
|
1749 |
idx1 = string_index_at(idx); |
|
1750 |
Bytes::put_Java_u2((address) (bytes+1), idx1); |
|
1751 |
DBG(printf("JVM_CONSTANT_StringIndex: %hd", idx1)); |
|
1752 |
break; |
|
1753 |
} |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1754 |
case JVM_CONSTANT_MethodHandle: |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1755 |
case JVM_CONSTANT_MethodHandleInError: { |
5882 | 1756 |
*bytes = JVM_CONSTANT_MethodHandle; |
20070
90ee74be2445
8025088: Missing cases for JVM_CONSTANT_MethodHandleInError cause crash if debugger steps into error-tagged method handle
iklam
parents:
20066
diff
changeset
|
1757 |
int kind = method_handle_ref_kind_at_error_ok(idx); |
90ee74be2445
8025088: Missing cases for JVM_CONSTANT_MethodHandleInError cause crash if debugger steps into error-tagged method handle
iklam
parents:
20066
diff
changeset
|
1758 |
idx1 = method_handle_index_at_error_ok(idx); |
5882 | 1759 |
*(bytes+1) = (unsigned char) kind; |
1760 |
Bytes::put_Java_u2((address) (bytes+2), idx1); |
|
1761 |
DBG(printf("JVM_CONSTANT_MethodHandle: %d %hd", kind, idx1)); |
|
1762 |
break; |
|
1763 |
} |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1764 |
case JVM_CONSTANT_MethodType: |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1765 |
case JVM_CONSTANT_MethodTypeInError: { |
5882 | 1766 |
*bytes = JVM_CONSTANT_MethodType; |
20070
90ee74be2445
8025088: Missing cases for JVM_CONSTANT_MethodHandleInError cause crash if debugger steps into error-tagged method handle
iklam
parents:
20066
diff
changeset
|
1767 |
idx1 = method_type_index_at_error_ok(idx); |
5882 | 1768 |
Bytes::put_Java_u2((address) (bytes+1), idx1); |
1769 |
DBG(printf("JVM_CONSTANT_MethodType: %hd", idx1)); |
|
1770 |
break; |
|
1771 |
} |
|
6062
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5882
diff
changeset
|
1772 |
case JVM_CONSTANT_InvokeDynamic: { |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1773 |
*bytes = tag; |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1774 |
idx1 = extract_low_short_from_int(*int_at_addr(idx)); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1775 |
idx2 = extract_high_short_from_int(*int_at_addr(idx)); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1776 |
assert(idx2 == invoke_dynamic_name_and_type_ref_index_at(idx), "correct half of u4"); |
6062
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5882
diff
changeset
|
1777 |
Bytes::put_Java_u2((address) (bytes+1), idx1); |
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5882
diff
changeset
|
1778 |
Bytes::put_Java_u2((address) (bytes+3), idx2); |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
1779 |
DBG(printf("JVM_CONSTANT_InvokeDynamic: %hd %hd", idx1, idx2)); |
6062
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5882
diff
changeset
|
1780 |
break; |
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5882
diff
changeset
|
1781 |
} |
1 | 1782 |
} |
1783 |
DBG(printf("\n")); |
|
1784 |
bytes += ent_size; |
|
1785 |
size += ent_size; |
|
1786 |
} |
|
1787 |
assert(size == cpool_size, "Size mismatch"); |
|
1788 |
||
1789 |
// Keep temorarily for debugging until it's stable. |
|
1790 |
DBG(print_cpool_bytes(cnt, start_bytes)); |
|
1791 |
return (int)(bytes - start_bytes); |
|
1792 |
} /* end copy_cpool_bytes */ |
|
1793 |
||
16670
4af09aff4237
8003310: Enable -Wunused-function when compiling with gcc
mikael
parents:
16383
diff
changeset
|
1794 |
#undef DBG |
4af09aff4237
8003310: Enable -Wunused-function when compiling with gcc
mikael
parents:
16383
diff
changeset
|
1795 |
|
1 | 1796 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1797 |
void ConstantPool::set_on_stack(const bool value) { |
15430
7c35f12cf1e5
8006040: NPG: on_stack processing wastes space in ConstantPool
coleenp
parents:
15229
diff
changeset
|
1798 |
if (value) { |
29576
c223b0a9872e
8061205: MetadataOnStackMark only needs to walk code cache during class redefinition
coleenp
parents:
29081
diff
changeset
|
1799 |
// Only record if it's not already set. |
c223b0a9872e
8061205: MetadataOnStackMark only needs to walk code cache during class redefinition
coleenp
parents:
29081
diff
changeset
|
1800 |
if (!on_stack()) { |
c223b0a9872e
8061205: MetadataOnStackMark only needs to walk code cache during class redefinition
coleenp
parents:
29081
diff
changeset
|
1801 |
_flags |= _on_stack; |
c223b0a9872e
8061205: MetadataOnStackMark only needs to walk code cache during class redefinition
coleenp
parents:
29081
diff
changeset
|
1802 |
MetadataOnStackMark::record(this); |
27247
99db666dbe8e
8056240: Investigate increased GC remark time after class unloading changes in CRM Fuse
stefank
parents:
25624
diff
changeset
|
1803 |
} |
15430
7c35f12cf1e5
8006040: NPG: on_stack processing wastes space in ConstantPool
coleenp
parents:
15229
diff
changeset
|
1804 |
} else { |
27247
99db666dbe8e
8056240: Investigate increased GC remark time after class unloading changes in CRM Fuse
stefank
parents:
25624
diff
changeset
|
1805 |
// Clearing is done single-threadedly. |
15430
7c35f12cf1e5
8006040: NPG: on_stack processing wastes space in ConstantPool
coleenp
parents:
15229
diff
changeset
|
1806 |
_flags &= ~_on_stack; |
7c35f12cf1e5
8006040: NPG: on_stack processing wastes space in ConstantPool
coleenp
parents:
15229
diff
changeset
|
1807 |
} |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1808 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1809 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1810 |
// JSR 292 support for patching constant pool oops after the class is linked and |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1811 |
// the oop array for resolved references are created. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1812 |
// We can't do this during classfile parsing, which is how the other indexes are |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1813 |
// patched. The other patches are applied early for some error checking |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1814 |
// so only defer the pseudo_strings. |
24322 | 1815 |
void ConstantPool::patch_resolved_references(GrowableArray<Handle>* cp_patches) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1816 |
for (int index = 1; index < cp_patches->length(); index++) { // Index 0 is unused |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1817 |
Handle patch = cp_patches->at(index); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1818 |
if (patch.not_null()) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1819 |
assert (tag_at(index).is_string(), "should only be string left"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1820 |
// Patching a string means pre-resolving it. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1821 |
// The spelling in the constant pool is ignored. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1822 |
// The constant reference may be any object whatever. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1823 |
// If it is not a real interned string, the constant is referred |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1824 |
// to as a "pseudo-string", and must be presented to the CP |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1825 |
// explicitly, because it may require scavenging. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1826 |
int obj_index = cp_to_object_index(index); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1827 |
pseudo_string_at_put(index, obj_index, patch()); |
28741
1f10b1bd612d
8008678: JSR 292: constant pool reconstitution must support pseudo strings
sspitsyn
parents:
27680
diff
changeset
|
1828 |
DEBUG_ONLY(cp_patches->at_put(index, Handle());) |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1829 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1830 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1831 |
#ifdef ASSERT |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1832 |
// Ensure that all the patches have been used. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1833 |
for (int index = 0; index < cp_patches->length(); index++) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1834 |
assert(cp_patches->at(index).is_null(), |
33105
294e48b4f704
8080775: Better argument formatting for assert() and friends
david
parents:
31592
diff
changeset
|
1835 |
"Unused constant pool patch at %d in class file %s", |
294e48b4f704
8080775: Better argument formatting for assert() and friends
david
parents:
31592
diff
changeset
|
1836 |
index, |
294e48b4f704
8080775: Better argument formatting for assert() and friends
david
parents:
31592
diff
changeset
|
1837 |
pool_holder()->external_name()); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1838 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1839 |
#endif // ASSERT |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1840 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1841 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1842 |
#ifndef PRODUCT |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1843 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1844 |
// CompileTheWorld support. Preload all classes loaded references in the passed in constantpool |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1845 |
void ConstantPool::preload_and_initialize_all_classes(ConstantPool* obj, TRAPS) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1846 |
guarantee(obj->is_constantPool(), "object must be constant pool"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1847 |
constantPoolHandle cp(THREAD, (ConstantPool*)obj); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1848 |
guarantee(cp->pool_holder() != NULL, "must be fully loaded"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1849 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1850 |
for (int i = 0; i< cp->length(); i++) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1851 |
if (cp->tag_at(i).is_unresolved_klass()) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1852 |
// This will force loading of the class |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1853 |
Klass* klass = cp->klass_at(i, CHECK); |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33602
diff
changeset
|
1854 |
if (klass->is_instance_klass()) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1855 |
// Force initialization of class |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1856 |
InstanceKlass::cast(klass)->initialize(CHECK); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1857 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1858 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1859 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1860 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1861 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1862 |
#endif |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1863 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1864 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1865 |
// Printing |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1866 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1867 |
void ConstantPool::print_on(outputStream* st) const { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1868 |
assert(is_constantPool(), "must be constantPool"); |
24424
2658d7834c6e
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
24337
diff
changeset
|
1869 |
st->print_cr("%s", internal_name()); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1870 |
if (flags() != 0) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1871 |
st->print(" - flags: 0x%x", flags()); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1872 |
if (has_preresolution()) st->print(" has_preresolution"); |
15430
7c35f12cf1e5
8006040: NPG: on_stack processing wastes space in ConstantPool
coleenp
parents:
15229
diff
changeset
|
1873 |
if (on_stack()) st->print(" on_stack"); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1874 |
st->cr(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1875 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1876 |
if (pool_holder() != NULL) { |
33148
68fa8b6c4340
8042893: compiler: PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC needs to be removed from source files
david
parents:
33105
diff
changeset
|
1877 |
st->print_cr(" - holder: " INTPTR_FORMAT, p2i(pool_holder())); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1878 |
} |
33148
68fa8b6c4340
8042893: compiler: PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC needs to be removed from source files
david
parents:
33105
diff
changeset
|
1879 |
st->print_cr(" - cache: " INTPTR_FORMAT, p2i(cache())); |
68fa8b6c4340
8042893: compiler: PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC needs to be removed from source files
david
parents:
33105
diff
changeset
|
1880 |
st->print_cr(" - resolved_references: " INTPTR_FORMAT, p2i(resolved_references())); |
68fa8b6c4340
8042893: compiler: PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC needs to be removed from source files
david
parents:
33105
diff
changeset
|
1881 |
st->print_cr(" - reference_map: " INTPTR_FORMAT, p2i(reference_map())); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1882 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1883 |
for (int index = 1; index < length(); index++) { // Index 0 is unused |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1884 |
((ConstantPool*)this)->print_entry_on(index, st); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1885 |
switch (tag_at(index).value()) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1886 |
case JVM_CONSTANT_Long : |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1887 |
case JVM_CONSTANT_Double : |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1888 |
index++; // Skip entry following eigth-byte constant |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1889 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1890 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1891 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1892 |
st->cr(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1893 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1894 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1895 |
// Print one constant pool entry |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1896 |
void ConstantPool::print_entry_on(const int index, outputStream* st) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1897 |
EXCEPTION_MARK; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1898 |
st->print(" - %3d : ", index); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1899 |
tag_at(index).print_on(st); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1900 |
st->print(" : "); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1901 |
switch (tag_at(index).value()) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1902 |
case JVM_CONSTANT_Class : |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1903 |
{ Klass* k = klass_at(index, CATCH); |
16383
57cb9d398a11
8009593: [parfait] Null pointer deference in hotspot/src/share/vm/oops/constantPool.cpp
morris
parents:
15799
diff
changeset
|
1904 |
guarantee(k != NULL, "need klass"); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1905 |
k->print_value_on(st); |
33148
68fa8b6c4340
8042893: compiler: PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC needs to be removed from source files
david
parents:
33105
diff
changeset
|
1906 |
st->print(" {" PTR_FORMAT "}", p2i(k)); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1907 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1908 |
break; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1909 |
case JVM_CONSTANT_Fieldref : |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1910 |
case JVM_CONSTANT_Methodref : |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1911 |
case JVM_CONSTANT_InterfaceMethodref : |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1912 |
st->print("klass_index=%d", uncached_klass_ref_index_at(index)); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1913 |
st->print(" name_and_type_index=%d", uncached_name_and_type_ref_index_at(index)); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1914 |
break; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1915 |
case JVM_CONSTANT_String : |
15799 | 1916 |
if (is_pseudo_string_at(index)) { |
1917 |
oop anObj = pseudo_string_at(index); |
|
1918 |
anObj->print_value_on(st); |
|
33148
68fa8b6c4340
8042893: compiler: PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC needs to be removed from source files
david
parents:
33105
diff
changeset
|
1919 |
st->print(" {" PTR_FORMAT "}", p2i(anObj)); |
15799 | 1920 |
} else { |
1921 |
unresolved_string_at(index)->print_value_on(st); |
|
1922 |
} |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1923 |
break; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1924 |
case JVM_CONSTANT_Integer : |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1925 |
st->print("%d", int_at(index)); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1926 |
break; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1927 |
case JVM_CONSTANT_Float : |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1928 |
st->print("%f", float_at(index)); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1929 |
break; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1930 |
case JVM_CONSTANT_Long : |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1931 |
st->print_jlong(long_at(index)); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1932 |
break; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1933 |
case JVM_CONSTANT_Double : |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1934 |
st->print("%lf", double_at(index)); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1935 |
break; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1936 |
case JVM_CONSTANT_NameAndType : |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1937 |
st->print("name_index=%d", name_ref_index_at(index)); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1938 |
st->print(" signature_index=%d", signature_ref_index_at(index)); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1939 |
break; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1940 |
case JVM_CONSTANT_Utf8 : |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1941 |
symbol_at(index)->print_value_on(st); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1942 |
break; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1943 |
case JVM_CONSTANT_UnresolvedClass : // fall-through |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1944 |
case JVM_CONSTANT_UnresolvedClassInError: { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1945 |
CPSlot entry = slot_at(index); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1946 |
if (entry.is_resolved()) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1947 |
entry.get_klass()->print_value_on(st); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1948 |
} else { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1949 |
entry.get_symbol()->print_value_on(st); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1950 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1951 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1952 |
break; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1953 |
case JVM_CONSTANT_MethodHandle : |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1954 |
case JVM_CONSTANT_MethodHandleInError : |
20070
90ee74be2445
8025088: Missing cases for JVM_CONSTANT_MethodHandleInError cause crash if debugger steps into error-tagged method handle
iklam
parents:
20066
diff
changeset
|
1955 |
st->print("ref_kind=%d", method_handle_ref_kind_at_error_ok(index)); |
90ee74be2445
8025088: Missing cases for JVM_CONSTANT_MethodHandleInError cause crash if debugger steps into error-tagged method handle
iklam
parents:
20066
diff
changeset
|
1956 |
st->print(" ref_index=%d", method_handle_index_at_error_ok(index)); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1957 |
break; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1958 |
case JVM_CONSTANT_MethodType : |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1959 |
case JVM_CONSTANT_MethodTypeInError : |
20070
90ee74be2445
8025088: Missing cases for JVM_CONSTANT_MethodHandleInError cause crash if debugger steps into error-tagged method handle
iklam
parents:
20066
diff
changeset
|
1960 |
st->print("signature_index=%d", method_type_index_at_error_ok(index)); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1961 |
break; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1962 |
case JVM_CONSTANT_InvokeDynamic : |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1963 |
{ |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1964 |
st->print("bootstrap_method_index=%d", invoke_dynamic_bootstrap_method_ref_index_at(index)); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1965 |
st->print(" name_and_type_index=%d", invoke_dynamic_name_and_type_ref_index_at(index)); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1966 |
int argc = invoke_dynamic_argument_count_at(index); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1967 |
if (argc > 0) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1968 |
for (int arg_i = 0; arg_i < argc; arg_i++) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1969 |
int arg = invoke_dynamic_argument_index_at(index, arg_i); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1970 |
st->print((arg_i == 0 ? " arguments={%d" : ", %d"), arg); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1971 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1972 |
st->print("}"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1973 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1974 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1975 |
break; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1976 |
default: |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1977 |
ShouldNotReachHere(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1978 |
break; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1979 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1980 |
st->cr(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1981 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1982 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1983 |
void ConstantPool::print_value_on(outputStream* st) const { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1984 |
assert(is_constantPool(), "must be constantPool"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1985 |
st->print("constant pool [%d]", length()); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1986 |
if (has_preresolution()) st->print("/preresolution"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1987 |
if (operands() != NULL) st->print("/operands[%d]", operands()->length()); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1988 |
print_address_on(st); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1989 |
st->print(" for "); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1990 |
pool_holder()->print_value_on(st); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1991 |
if (pool_holder() != NULL) { |
14391
df0a1573d5bd
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
14385
diff
changeset
|
1992 |
bool extra = (pool_holder()->constants() != this); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1993 |
if (extra) st->print(" (extra)"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1994 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1995 |
if (cache() != NULL) { |
33148
68fa8b6c4340
8042893: compiler: PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC needs to be removed from source files
david
parents:
33105
diff
changeset
|
1996 |
st->print(" cache=" PTR_FORMAT, p2i(cache())); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1997 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1998 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1999 |
|
15437 | 2000 |
#if INCLUDE_SERVICES |
2001 |
// Size Statistics |
|
2002 |
void ConstantPool::collect_statistics(KlassSizeStats *sz) const { |
|
2003 |
sz->_cp_all_bytes += (sz->_cp_bytes = sz->count(this)); |
|
2004 |
sz->_cp_all_bytes += (sz->_cp_tags_bytes = sz->count_array(tags())); |
|
2005 |
sz->_cp_all_bytes += (sz->_cp_cache_bytes = sz->count(cache())); |
|
2006 |
sz->_cp_all_bytes += (sz->_cp_operands_bytes = sz->count_array(operands())); |
|
2007 |
sz->_cp_all_bytes += (sz->_cp_refmap_bytes = sz->count_array(reference_map())); |
|
2008 |
||
2009 |
sz->_ro_bytes += sz->_cp_operands_bytes + sz->_cp_tags_bytes + |
|
2010 |
sz->_cp_refmap_bytes; |
|
2011 |
sz->_rw_bytes += sz->_cp_bytes + sz->_cp_cache_bytes; |
|
2012 |
} |
|
2013 |
#endif // INCLUDE_SERVICES |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2014 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2015 |
// Verification |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2016 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2017 |
void ConstantPool::verify_on(outputStream* st) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2018 |
guarantee(is_constantPool(), "object must be constant pool"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2019 |
for (int i = 0; i< length(); i++) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2020 |
constantTag tag = tag_at(i); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2021 |
CPSlot entry = slot_at(i); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2022 |
if (tag.is_klass()) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2023 |
if (entry.is_resolved()) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2024 |
guarantee(entry.get_klass()->is_klass(), "should be klass"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2025 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2026 |
} else if (tag.is_unresolved_klass()) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2027 |
if (entry.is_resolved()) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2028 |
guarantee(entry.get_klass()->is_klass(), "should be klass"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2029 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2030 |
} else if (tag.is_symbol()) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2031 |
guarantee(entry.get_symbol()->refcount() != 0, "should have nonzero reference count"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2032 |
} else if (tag.is_string()) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2033 |
guarantee(entry.get_symbol()->refcount() != 0, "should have nonzero reference count"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2034 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2035 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2036 |
if (cache() != NULL) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2037 |
// Note: cache() can be NULL before a class is completely setup or |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2038 |
// in temporary constant pools used during constant pool merging |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2039 |
guarantee(cache()->is_constantPoolCache(), "should be constant pool cache"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2040 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2041 |
if (pool_holder() != NULL) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2042 |
// Note: pool_holder() can be NULL in temporary constant pools |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2043 |
// used during constant pool merging |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2044 |
guarantee(pool_holder()->is_klass(), "should be klass"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2045 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2046 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2047 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2048 |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7436
diff
changeset
|
2049 |
void SymbolHashMap::add_entry(Symbol* sym, u2 value) { |
1 | 2050 |
char *str = sym->as_utf8(); |
2051 |
unsigned int hash = compute_hash(str, sym->utf8_length()); |
|
2052 |
unsigned int index = hash % table_size(); |
|
2053 |
||
2054 |
// check if already in map |
|
2055 |
// we prefer the first entry since it is more likely to be what was used in |
|
2056 |
// the class file |
|
2057 |
for (SymbolHashMapEntry *en = bucket(index); en != NULL; en = en->next()) { |
|
2058 |
assert(en->symbol() != NULL, "SymbolHashMapEntry symbol is NULL"); |
|
2059 |
if (en->hash() == hash && en->symbol() == sym) { |
|
2060 |
return; // already there |
|
2061 |
} |
|
2062 |
} |
|
2063 |
||
2064 |
SymbolHashMapEntry* entry = new SymbolHashMapEntry(hash, sym, value); |
|
2065 |
entry->set_next(bucket(index)); |
|
2066 |
_buckets[index].set_entry(entry); |
|
2067 |
assert(entry->symbol() != NULL, "SymbolHashMapEntry symbol is NULL"); |
|
2068 |
} |
|
2069 |
||
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7436
diff
changeset
|
2070 |
SymbolHashMapEntry* SymbolHashMap::find_entry(Symbol* sym) { |
1 | 2071 |
assert(sym != NULL, "SymbolHashMap::find_entry - symbol is NULL"); |
2072 |
char *str = sym->as_utf8(); |
|
2073 |
int len = sym->utf8_length(); |
|
2074 |
unsigned int hash = SymbolHashMap::compute_hash(str, len); |
|
2075 |
unsigned int index = hash % table_size(); |
|
2076 |
for (SymbolHashMapEntry *en = bucket(index); en != NULL; en = en->next()) { |
|
2077 |
assert(en->symbol() != NULL, "SymbolHashMapEntry symbol is NULL"); |
|
2078 |
if (en->hash() == hash && en->symbol() == sym) { |
|
2079 |
return en; |
|
2080 |
} |
|
2081 |
} |
|
2082 |
return NULL; |
|
2083 |
} |