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