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