Print this page
rev 1021 : 6858164: invokedynamic code needs some cleanup (post-6655638)
Note: The bug ID for this change set was erroneously used to call for review of 6815692.
Summary: Fix several crashers, remove needless paths for boxed-style bootstrap method call, refactor & simplify APIs for rewriter constantPoolOop, remove sun.dyn.CallSiteImpl
Reviewed-by: ?
rev 1026 : imported patch indy.compiler.inline.patch
Split |
Close |
Expand all |
Collapse all |
--- old/src/share/vm/interpreter/rewriter.hpp
+++ new/src/share/vm/interpreter/rewriter.hpp
1 1 /*
2 2 * Copyright 1998-2009 Sun Microsystems, Inc. All Rights Reserved.
3 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 4 *
5 5 * This code is free software; you can redistribute it and/or modify it
6 6 * under the terms of the GNU General Public License version 2 only, as
7 7 * published by the Free Software Foundation.
8 8 *
9 9 * This code is distributed in the hope that it will be useful, but WITHOUT
10 10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11 11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12 12 * version 2 for more details (a copy is included in the LICENSE file that
13 13 * accompanied this code).
14 14 *
15 15 * You should have received a copy of the GNU General Public License version
16 16 * 2 along with this work; if not, write to the Free Software Foundation,
17 17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18 18 *
19 19 * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
20 20 * CA 95054 USA or visit www.sun.com if you need additional information or
21 21 * have any questions.
22 22 *
23 23 */
24 24
25 25 // The Rewriter adds caches to the constant pool and rewrites bytecode indices
26 26 // pointing into the constant pool for better interpreter performance.
27 27
28 28 class Rewriter: public StackObj {
29 29 private:
30 30 instanceKlassHandle _klass;
31 31 constantPoolHandle _pool;
32 32 objArrayHandle _methods;
33 33 intArray _cp_map;
34 34 intStack _cp_cache_map;
35 35
36 36 void init_cp_map(int length) {
37 37 _cp_map.initialize(length, -1);
38 38 // Choose an initial value large enough that we don't get frequent
39 39 // calls to grow().
40 40 _cp_cache_map.initialize(length / 2);
41 41 }
42 42 int cp_entry_to_cp_cache(int i) { assert(has_cp_cache(i), "oob"); return _cp_map[i]; }
43 43 bool has_cp_cache(int i) { return (uint)i < (uint)_cp_map.length() && _cp_map[i] >= 0; }
44 44 int maybe_add_cp_cache_entry(int i) { return has_cp_cache(i) ? _cp_map[i] : add_cp_cache_entry(i); }
45 45 int add_cp_cache_entry(int cp_index) {
46 46 assert((cp_index & _secondary_entry_tag) == 0, "bad tag");
47 47 assert(_cp_map[cp_index] == -1, "not twice on same cp_index");
48 48 int cache_index = _cp_cache_map.append(cp_index);
49 49 _cp_map.at_put(cp_index, cache_index);
↓ open down ↓ |
49 lines elided |
↑ open up ↑ |
50 50 assert(cp_entry_to_cp_cache(cp_index) == cache_index, "");
51 51 return cache_index;
52 52 }
53 53 int add_secondary_cp_cache_entry(int main_cpc_entry) {
54 54 assert(main_cpc_entry < _cp_cache_map.length(), "must be earlier CP cache entry");
55 55 int cache_index = _cp_cache_map.append(main_cpc_entry | _secondary_entry_tag);
56 56 return cache_index;
57 57 }
58 58
59 59 // All the work goes in here:
60 - Rewriter(instanceKlassHandle klass, TRAPS);
60 + Rewriter(instanceKlassHandle klass, constantPoolHandle cpool, objArrayHandle methods, TRAPS);
61 61
62 62 void compute_index_maps();
63 63 void make_constant_pool_cache(TRAPS);
64 64 void scan_method(methodOop m);
65 65 methodHandle rewrite_jsrs(methodHandle m, TRAPS);
66 66 void rewrite_Object_init(methodHandle m, TRAPS);
67 67 int rewrite_member_reference(address bcp, int offset);
68 68 void rewrite_invokedynamic(address bcp, int offset, int cp_index);
69 69
70 70 public:
71 71 // Driver routine:
72 72 static void rewrite(instanceKlassHandle klass, TRAPS);
73 + static void rewrite(instanceKlassHandle klass, constantPoolHandle cpool, objArrayHandle methods, TRAPS);
73 74
74 75 enum {
75 76 _secondary_entry_tag = nth_bit(30)
76 77 };
77 78 };
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX