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