author | roland |
Fri, 17 Aug 2018 17:13:12 +0200 | |
changeset 51521 | 76a51e26d0ac |
parent 51333 | f6641fcf7b7e |
child 51705 | 8123901bc3d1 |
permissions | -rw-r--r-- |
4450 | 1 |
/* |
48595
5d699d81c10c
8194988: 8 Null pointer dereference defect groups related to MultiNode::proj_out()
dlong
parents:
47216
diff
changeset
|
2 |
* Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved. |
4450 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
7 |
* published by the Free Software Foundation. |
|
8 |
* |
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
13 |
* accompanied this code). |
|
14 |
* |
|
15 |
* You should have received a copy of the GNU General Public License version |
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
18 |
* |
|
5547
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
4891
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
4891
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
4891
diff
changeset
|
21 |
* questions. |
4450 | 22 |
* |
23 |
*/ |
|
24 |
||
7397 | 25 |
#include "precompiled.hpp" |
26 |
#include "compiler/compileLog.hpp" |
|
27 |
#include "opto/addnode.hpp" |
|
28 |
#include "opto/callGenerator.hpp" |
|
29 |
#include "opto/callnode.hpp" |
|
30 |
#include "opto/divnode.hpp" |
|
31 |
#include "opto/graphKit.hpp" |
|
32 |
#include "opto/idealKit.hpp" |
|
33 |
#include "opto/rootnode.hpp" |
|
34 |
#include "opto/runtime.hpp" |
|
35 |
#include "opto/stringopts.hpp" |
|
36 |
#include "opto/subnode.hpp" |
|
29081
c61eb4914428
8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents:
28642
diff
changeset
|
37 |
#include "runtime/sharedRuntime.hpp" |
4450 | 38 |
|
39 |
#define __ kit. |
|
40 |
||
41 |
class StringConcat : public ResourceObj { |
|
42 |
private: |
|
43 |
PhaseStringOpts* _stringopts; |
|
44 |
Node* _string_alloc; |
|
45 |
AllocateNode* _begin; // The allocation the begins the pattern |
|
46 |
CallStaticJavaNode* _end; // The final call of the pattern. Will either be |
|
47 |
// SB.toString or or String.<init>(SB.toString) |
|
48 |
bool _multiple; // indicates this is a fusion of two or more |
|
49 |
// separate StringBuilders |
|
50 |
||
51 |
Node* _arguments; // The list of arguments to be concatenated |
|
52 |
GrowableArray<int> _mode; // into a String along with a mode flag |
|
53 |
// indicating how to treat the value. |
|
20716
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
54 |
Node_List _constructors; // List of constructors (many in case of stacked concat) |
4450 | 55 |
Node_List _control; // List of control nodes that will be deleted |
56 |
Node_List _uncommon_traps; // Uncommon traps that needs to be rewritten |
|
57 |
// to restart at the initial JVMState. |
|
20716
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
58 |
|
4450 | 59 |
public: |
60 |
// Mode for converting arguments to Strings |
|
61 |
enum { |
|
62 |
StringMode, |
|
63 |
IntMode, |
|
7714
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
64 |
CharMode, |
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
65 |
StringNullCheckMode |
4450 | 66 |
}; |
67 |
||
68 |
StringConcat(PhaseStringOpts* stringopts, CallStaticJavaNode* end): |
|
51333
f6641fcf7b7e
8208670: Compiler changes to allow enabling -Wreorder
tschatzl
parents:
48595
diff
changeset
|
69 |
_stringopts(stringopts), |
f6641fcf7b7e
8208670: Compiler changes to allow enabling -Wreorder
tschatzl
parents:
48595
diff
changeset
|
70 |
_string_alloc(NULL), |
4450 | 71 |
_begin(NULL), |
51333
f6641fcf7b7e
8208670: Compiler changes to allow enabling -Wreorder
tschatzl
parents:
48595
diff
changeset
|
72 |
_end(end), |
f6641fcf7b7e
8208670: Compiler changes to allow enabling -Wreorder
tschatzl
parents:
48595
diff
changeset
|
73 |
_multiple(false) { |
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
22845
diff
changeset
|
74 |
_arguments = new Node(1); |
4450 | 75 |
_arguments->del_req(0); |
76 |
} |
|
77 |
||
20716
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
78 |
bool validate_mem_flow(); |
4450 | 79 |
bool validate_control_flow(); |
80 |
||
81 |
void merge_add() { |
|
82 |
#if 0 |
|
83 |
// XXX This is place holder code for reusing an existing String |
|
84 |
// allocation but the logic for checking the state safety is |
|
85 |
// probably inadequate at the moment. |
|
86 |
CallProjections endprojs; |
|
87 |
sc->end()->extract_projections(&endprojs, false); |
|
88 |
if (endprojs.resproj != NULL) { |
|
89 |
for (SimpleDUIterator i(endprojs.resproj); i.has_next(); i.next()) { |
|
90 |
CallStaticJavaNode *use = i.get()->isa_CallStaticJava(); |
|
91 |
if (use != NULL && use->method() != NULL && |
|
6743
ef1795cd50a7
6986028: assert(_base == Int) failed: Not an Int in CmpINode::sub
never
parents:
6418
diff
changeset
|
92 |
use->method()->intrinsic_id() == vmIntrinsics::_String_String && |
4450 | 93 |
use->in(TypeFunc::Parms + 1) == endprojs.resproj) { |
94 |
// Found useless new String(sb.toString()) so reuse the newly allocated String |
|
95 |
// when creating the result instead of allocating a new one. |
|
96 |
sc->set_string_alloc(use->in(TypeFunc::Parms)); |
|
97 |
sc->set_end(use); |
|
98 |
} |
|
99 |
} |
|
100 |
} |
|
101 |
#endif |
|
102 |
} |
|
103 |
||
104 |
StringConcat* merge(StringConcat* other, Node* arg); |
|
105 |
||
106 |
void set_allocation(AllocateNode* alloc) { |
|
107 |
_begin = alloc; |
|
108 |
} |
|
109 |
||
110 |
void append(Node* value, int mode) { |
|
111 |
_arguments->add_req(value); |
|
112 |
_mode.append(mode); |
|
113 |
} |
|
114 |
void push(Node* value, int mode) { |
|
115 |
_arguments->ins_req(0, value); |
|
116 |
_mode.insert_before(0, mode); |
|
117 |
} |
|
13111
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
118 |
|
4450 | 119 |
void push_string(Node* value) { |
120 |
push(value, StringMode); |
|
121 |
} |
|
7714
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
122 |
void push_string_null_check(Node* value) { |
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
123 |
push(value, StringNullCheckMode); |
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
124 |
} |
4450 | 125 |
void push_int(Node* value) { |
126 |
push(value, IntMode); |
|
127 |
} |
|
128 |
void push_char(Node* value) { |
|
129 |
push(value, CharMode); |
|
130 |
} |
|
131 |
||
13111
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
132 |
static bool is_SB_toString(Node* call) { |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
133 |
if (call->is_CallStaticJava()) { |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
134 |
CallStaticJavaNode* csj = call->as_CallStaticJava(); |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
135 |
ciMethod* m = csj->method(); |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
136 |
if (m != NULL && |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
137 |
(m->intrinsic_id() == vmIntrinsics::_StringBuilder_toString || |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
138 |
m->intrinsic_id() == vmIntrinsics::_StringBuffer_toString)) { |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
139 |
return true; |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
140 |
} |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
141 |
} |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
142 |
return false; |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
143 |
} |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
144 |
|
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
145 |
static Node* skip_string_null_check(Node* value) { |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
146 |
// Look for a diamond shaped Null check of toString() result |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
147 |
// (could be code from String.valueOf()): |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
148 |
// (Proj == NULL) ? "null":"CastPP(Proj)#NotNULL |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
149 |
if (value->is_Phi()) { |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
150 |
int true_path = value->as_Phi()->is_diamond_phi(); |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
151 |
if (true_path != 0) { |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
152 |
// phi->region->if_proj->ifnode->bool |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
153 |
BoolNode* b = value->in(0)->in(1)->in(0)->in(1)->as_Bool(); |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
154 |
Node* cmp = b->in(1); |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
155 |
Node* v1 = cmp->in(1); |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
156 |
Node* v2 = cmp->in(2); |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
157 |
// Null check of the return of toString which can simply be skipped. |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
158 |
if (b->_test._test == BoolTest::ne && |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
159 |
v2->bottom_type() == TypePtr::NULL_PTR && |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
160 |
value->in(true_path)->Opcode() == Op_CastPP && |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
161 |
value->in(true_path)->in(1) == v1 && |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
162 |
v1->is_Proj() && is_SB_toString(v1->in(0))) { |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
163 |
return v1; |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
164 |
} |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
165 |
} |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
166 |
} |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
167 |
return value; |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
168 |
} |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
169 |
|
4450 | 170 |
Node* argument(int i) { |
171 |
return _arguments->in(i); |
|
172 |
} |
|
13111
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
173 |
Node* argument_uncast(int i) { |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
174 |
Node* arg = argument(i); |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
175 |
int amode = mode(i); |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
176 |
if (amode == StringConcat::StringMode || |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
177 |
amode == StringConcat::StringNullCheckMode) { |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
178 |
arg = skip_string_null_check(arg); |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
179 |
} |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
180 |
return arg; |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
181 |
} |
4450 | 182 |
void set_argument(int i, Node* value) { |
183 |
_arguments->set_req(i, value); |
|
184 |
} |
|
185 |
int num_arguments() { |
|
186 |
return _mode.length(); |
|
187 |
} |
|
188 |
int mode(int i) { |
|
189 |
return _mode.at(i); |
|
190 |
} |
|
191 |
void add_control(Node* ctrl) { |
|
192 |
assert(!_control.contains(ctrl), "only push once"); |
|
193 |
_control.push(ctrl); |
|
194 |
} |
|
20716
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
195 |
void add_constructor(Node* init) { |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
196 |
assert(!_constructors.contains(init), "only push once"); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
197 |
_constructors.push(init); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
198 |
} |
4450 | 199 |
CallStaticJavaNode* end() { return _end; } |
200 |
AllocateNode* begin() { return _begin; } |
|
201 |
Node* string_alloc() { return _string_alloc; } |
|
202 |
||
203 |
void eliminate_unneeded_control(); |
|
204 |
void eliminate_initialize(InitializeNode* init); |
|
205 |
void eliminate_call(CallNode* call); |
|
206 |
||
207 |
void maybe_log_transform() { |
|
208 |
CompileLog* log = _stringopts->C->log(); |
|
209 |
if (log != NULL) { |
|
210 |
log->head("replace_string_concat arguments='%d' string_alloc='%d' multiple='%d'", |
|
211 |
num_arguments(), |
|
212 |
_string_alloc != NULL, |
|
213 |
_multiple); |
|
214 |
JVMState* p = _begin->jvms(); |
|
215 |
while (p != NULL) { |
|
216 |
log->elem("jvms bci='%d' method='%d'", p->bci(), log->identify(p->method())); |
|
217 |
p = p->caller(); |
|
218 |
} |
|
219 |
log->tail("replace_string_concat"); |
|
220 |
} |
|
221 |
} |
|
222 |
||
223 |
void convert_uncommon_traps(GraphKit& kit, const JVMState* jvms) { |
|
224 |
for (uint u = 0; u < _uncommon_traps.size(); u++) { |
|
225 |
Node* uct = _uncommon_traps.at(u); |
|
226 |
||
227 |
// Build a new call using the jvms state of the allocate |
|
6418 | 228 |
address call_addr = SharedRuntime::uncommon_trap_blob()->entry_point(); |
4450 | 229 |
const TypeFunc* call_type = OptoRuntime::uncommon_trap_Type(); |
230 |
const TypePtr* no_memory_effects = NULL; |
|
231 |
Compile* C = _stringopts->C; |
|
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
22845
diff
changeset
|
232 |
CallStaticJavaNode* call = new CallStaticJavaNode(call_type, call_addr, "uncommon_trap", |
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
22845
diff
changeset
|
233 |
jvms->bci(), no_memory_effects); |
4450 | 234 |
for (int e = 0; e < TypeFunc::Parms; e++) { |
235 |
call->init_req(e, uct->in(e)); |
|
236 |
} |
|
237 |
// Set the trap request to record intrinsic failure if this trap |
|
238 |
// is taken too many times. Ideally we would handle then traps by |
|
239 |
// doing the original bookkeeping in the MDO so that if it caused |
|
240 |
// the code to be thrown out we could still recompile and use the |
|
241 |
// optimization. Failing the uncommon traps doesn't really mean |
|
242 |
// that the optimization is a bad idea but there's no other way to |
|
243 |
// do the MDO updates currently. |
|
244 |
int trap_request = Deoptimization::make_trap_request(Deoptimization::Reason_intrinsic, |
|
245 |
Deoptimization::Action_make_not_entrant); |
|
246 |
call->init_req(TypeFunc::Parms, __ intcon(trap_request)); |
|
247 |
kit.add_safepoint_edges(call); |
|
248 |
||
249 |
_stringopts->gvn()->transform(call); |
|
250 |
C->gvn_replace_by(uct, call); |
|
14623
70c4c1be0a14
7092905: C2: Keep track of the number of dead nodes
bharadwaj
parents:
13895
diff
changeset
|
251 |
uct->disconnect_inputs(NULL, C); |
4450 | 252 |
} |
253 |
} |
|
254 |
||
255 |
void cleanup() { |
|
256 |
// disconnect the hook node |
|
14623
70c4c1be0a14
7092905: C2: Keep track of the number of dead nodes
bharadwaj
parents:
13895
diff
changeset
|
257 |
_arguments->disconnect_inputs(NULL, _stringopts->C); |
4450 | 258 |
} |
259 |
}; |
|
260 |
||
261 |
||
262 |
void StringConcat::eliminate_unneeded_control() { |
|
263 |
for (uint i = 0; i < _control.size(); i++) { |
|
264 |
Node* n = _control.at(i); |
|
13111
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
265 |
if (n->is_Allocate()) { |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
266 |
eliminate_initialize(n->as_Allocate()->initialization()); |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
267 |
} |
4450 | 268 |
if (n->is_Call()) { |
269 |
if (n != _end) { |
|
270 |
eliminate_call(n->as_Call()); |
|
271 |
} |
|
272 |
} else if (n->is_IfTrue()) { |
|
273 |
Compile* C = _stringopts->C; |
|
274 |
C->gvn_replace_by(n, n->in(0)->in(0)); |
|
15113 | 275 |
// get rid of the other projection |
276 |
C->gvn_replace_by(n->in(0)->as_If()->proj_out(false), C->top()); |
|
4450 | 277 |
} |
278 |
} |
|
279 |
} |
|
280 |
||
281 |
||
282 |
StringConcat* StringConcat::merge(StringConcat* other, Node* arg) { |
|
283 |
StringConcat* result = new StringConcat(_stringopts, _end); |
|
284 |
for (uint x = 0; x < _control.size(); x++) { |
|
285 |
Node* n = _control.at(x); |
|
286 |
if (n->is_Call()) { |
|
287 |
result->_control.push(n); |
|
288 |
} |
|
289 |
} |
|
290 |
for (uint x = 0; x < other->_control.size(); x++) { |
|
291 |
Node* n = other->_control.at(x); |
|
292 |
if (n->is_Call()) { |
|
293 |
result->_control.push(n); |
|
294 |
} |
|
295 |
} |
|
296 |
assert(result->_control.contains(other->_end), "what?"); |
|
297 |
assert(result->_control.contains(_begin), "what?"); |
|
298 |
for (int x = 0; x < num_arguments(); x++) { |
|
13111
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
299 |
Node* argx = argument_uncast(x); |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
300 |
if (argx == arg) { |
4450 | 301 |
// replace the toString result with the all the arguments that |
302 |
// made up the other StringConcat |
|
303 |
for (int y = 0; y < other->num_arguments(); y++) { |
|
304 |
result->append(other->argument(y), other->mode(y)); |
|
305 |
} |
|
306 |
} else { |
|
13111
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
307 |
result->append(argx, mode(x)); |
4450 | 308 |
} |
309 |
} |
|
310 |
result->set_allocation(other->_begin); |
|
20716
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
311 |
for (uint i = 0; i < _constructors.size(); i++) { |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
312 |
result->add_constructor(_constructors.at(i)); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
313 |
} |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
314 |
for (uint i = 0; i < other->_constructors.size(); i++) { |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
315 |
result->add_constructor(other->_constructors.at(i)); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
316 |
} |
4450 | 317 |
result->_multiple = true; |
318 |
return result; |
|
319 |
} |
|
320 |
||
321 |
||
322 |
void StringConcat::eliminate_call(CallNode* call) { |
|
323 |
Compile* C = _stringopts->C; |
|
324 |
CallProjections projs; |
|
325 |
call->extract_projections(&projs, false); |
|
326 |
if (projs.fallthrough_catchproj != NULL) { |
|
327 |
C->gvn_replace_by(projs.fallthrough_catchproj, call->in(TypeFunc::Control)); |
|
328 |
} |
|
329 |
if (projs.fallthrough_memproj != NULL) { |
|
330 |
C->gvn_replace_by(projs.fallthrough_memproj, call->in(TypeFunc::Memory)); |
|
331 |
} |
|
332 |
if (projs.catchall_memproj != NULL) { |
|
333 |
C->gvn_replace_by(projs.catchall_memproj, C->top()); |
|
334 |
} |
|
335 |
if (projs.fallthrough_ioproj != NULL) { |
|
336 |
C->gvn_replace_by(projs.fallthrough_ioproj, call->in(TypeFunc::I_O)); |
|
337 |
} |
|
338 |
if (projs.catchall_ioproj != NULL) { |
|
339 |
C->gvn_replace_by(projs.catchall_ioproj, C->top()); |
|
340 |
} |
|
341 |
if (projs.catchall_catchproj != NULL) { |
|
342 |
// EA can't cope with the partially collapsed graph this |
|
343 |
// creates so put it on the worklist to be collapsed later. |
|
344 |
for (SimpleDUIterator i(projs.catchall_catchproj); i.has_next(); i.next()) { |
|
345 |
Node *use = i.get(); |
|
346 |
int opc = use->Opcode(); |
|
347 |
if (opc == Op_CreateEx || opc == Op_Region) { |
|
348 |
_stringopts->record_dead_node(use); |
|
349 |
} |
|
350 |
} |
|
351 |
C->gvn_replace_by(projs.catchall_catchproj, C->top()); |
|
352 |
} |
|
353 |
if (projs.resproj != NULL) { |
|
354 |
C->gvn_replace_by(projs.resproj, C->top()); |
|
355 |
} |
|
356 |
C->gvn_replace_by(call, C->top()); |
|
357 |
} |
|
358 |
||
359 |
void StringConcat::eliminate_initialize(InitializeNode* init) { |
|
360 |
Compile* C = _stringopts->C; |
|
361 |
||
362 |
// Eliminate Initialize node. |
|
363 |
assert(init->outcnt() <= 2, "only a control and memory projection expected"); |
|
364 |
assert(init->req() <= InitializeNode::RawStores, "no pending inits"); |
|
48595
5d699d81c10c
8194988: 8 Null pointer dereference defect groups related to MultiNode::proj_out()
dlong
parents:
47216
diff
changeset
|
365 |
Node *ctrl_proj = init->proj_out_or_null(TypeFunc::Control); |
4450 | 366 |
if (ctrl_proj != NULL) { |
367 |
C->gvn_replace_by(ctrl_proj, init->in(TypeFunc::Control)); |
|
368 |
} |
|
48595
5d699d81c10c
8194988: 8 Null pointer dereference defect groups related to MultiNode::proj_out()
dlong
parents:
47216
diff
changeset
|
369 |
Node *mem_proj = init->proj_out_or_null(TypeFunc::Memory); |
4450 | 370 |
if (mem_proj != NULL) { |
371 |
Node *mem = init->in(TypeFunc::Memory); |
|
372 |
C->gvn_replace_by(mem_proj, mem); |
|
373 |
} |
|
374 |
C->gvn_replace_by(init, C->top()); |
|
14623
70c4c1be0a14
7092905: C2: Keep track of the number of dead nodes
bharadwaj
parents:
13895
diff
changeset
|
375 |
init->disconnect_inputs(NULL, C); |
4450 | 376 |
} |
377 |
||
378 |
Node_List PhaseStringOpts::collect_toString_calls() { |
|
379 |
Node_List string_calls; |
|
380 |
Node_List worklist; |
|
381 |
||
382 |
_visited.Clear(); |
|
383 |
||
384 |
// Prime the worklist |
|
385 |
for (uint i = 1; i < C->root()->len(); i++) { |
|
386 |
Node* n = C->root()->in(i); |
|
387 |
if (n != NULL && !_visited.test_set(n->_idx)) { |
|
388 |
worklist.push(n); |
|
389 |
} |
|
390 |
} |
|
391 |
||
392 |
while (worklist.size() > 0) { |
|
393 |
Node* ctrl = worklist.pop(); |
|
13111
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
394 |
if (StringConcat::is_SB_toString(ctrl)) { |
4450 | 395 |
CallStaticJavaNode* csj = ctrl->as_CallStaticJava(); |
13111
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
396 |
string_calls.push(csj); |
4450 | 397 |
} |
398 |
if (ctrl->in(0) != NULL && !_visited.test_set(ctrl->in(0)->_idx)) { |
|
399 |
worklist.push(ctrl->in(0)); |
|
400 |
} |
|
401 |
if (ctrl->is_Region()) { |
|
402 |
for (uint i = 1; i < ctrl->len(); i++) { |
|
403 |
if (ctrl->in(i) != NULL && !_visited.test_set(ctrl->in(i)->_idx)) { |
|
404 |
worklist.push(ctrl->in(i)); |
|
405 |
} |
|
406 |
} |
|
407 |
} |
|
408 |
} |
|
409 |
return string_calls; |
|
410 |
} |
|
411 |
||
412 |
||
413 |
StringConcat* PhaseStringOpts::build_candidate(CallStaticJavaNode* call) { |
|
414 |
ciMethod* m = call->method(); |
|
415 |
ciSymbol* string_sig; |
|
416 |
ciSymbol* int_sig; |
|
417 |
ciSymbol* char_sig; |
|
418 |
if (m->holder() == C->env()->StringBuilder_klass()) { |
|
419 |
string_sig = ciSymbol::String_StringBuilder_signature(); |
|
420 |
int_sig = ciSymbol::int_StringBuilder_signature(); |
|
421 |
char_sig = ciSymbol::char_StringBuilder_signature(); |
|
422 |
} else if (m->holder() == C->env()->StringBuffer_klass()) { |
|
423 |
string_sig = ciSymbol::String_StringBuffer_signature(); |
|
424 |
int_sig = ciSymbol::int_StringBuffer_signature(); |
|
425 |
char_sig = ciSymbol::char_StringBuffer_signature(); |
|
426 |
} else { |
|
427 |
return NULL; |
|
428 |
} |
|
429 |
#ifndef PRODUCT |
|
430 |
if (PrintOptimizeStringConcat) { |
|
431 |
tty->print("considering toString call in "); |
|
432 |
call->jvms()->dump_spec(tty); tty->cr(); |
|
433 |
} |
|
434 |
#endif |
|
435 |
||
436 |
StringConcat* sc = new StringConcat(this, call); |
|
437 |
||
438 |
AllocateNode* alloc = NULL; |
|
439 |
InitializeNode* init = NULL; |
|
440 |
||
441 |
// possible opportunity for StringBuilder fusion |
|
442 |
CallStaticJavaNode* cnode = call; |
|
443 |
while (cnode) { |
|
444 |
Node* recv = cnode->in(TypeFunc::Parms)->uncast(); |
|
445 |
if (recv->is_Proj()) { |
|
446 |
recv = recv->in(0); |
|
447 |
} |
|
448 |
cnode = recv->isa_CallStaticJava(); |
|
449 |
if (cnode == NULL) { |
|
450 |
alloc = recv->isa_Allocate(); |
|
451 |
if (alloc == NULL) { |
|
452 |
break; |
|
453 |
} |
|
454 |
// Find the constructor call |
|
455 |
Node* result = alloc->result_cast(); |
|
15113 | 456 |
if (result == NULL || !result->is_CheckCastPP() || alloc->in(TypeFunc::Memory)->is_top()) { |
4450 | 457 |
// strange looking allocation |
458 |
#ifndef PRODUCT |
|
459 |
if (PrintOptimizeStringConcat) { |
|
460 |
tty->print("giving up because allocation looks strange "); |
|
461 |
alloc->jvms()->dump_spec(tty); tty->cr(); |
|
462 |
} |
|
463 |
#endif |
|
464 |
break; |
|
465 |
} |
|
466 |
Node* constructor = NULL; |
|
467 |
for (SimpleDUIterator i(result); i.has_next(); i.next()) { |
|
468 |
CallStaticJavaNode *use = i.get()->isa_CallStaticJava(); |
|
6743
ef1795cd50a7
6986028: assert(_base == Int) failed: Not an Int in CmpINode::sub
never
parents:
6418
diff
changeset
|
469 |
if (use != NULL && |
ef1795cd50a7
6986028: assert(_base == Int) failed: Not an Int in CmpINode::sub
never
parents:
6418
diff
changeset
|
470 |
use->method() != NULL && |
ef1795cd50a7
6986028: assert(_base == Int) failed: Not an Int in CmpINode::sub
never
parents:
6418
diff
changeset
|
471 |
!use->method()->is_static() && |
4450 | 472 |
use->method()->name() == ciSymbol::object_initializer_name() && |
473 |
use->method()->holder() == m->holder()) { |
|
474 |
// Matched the constructor. |
|
475 |
ciSymbol* sig = use->method()->signature()->as_symbol(); |
|
476 |
if (sig == ciSymbol::void_method_signature() || |
|
477 |
sig == ciSymbol::int_void_signature() || |
|
478 |
sig == ciSymbol::string_void_signature()) { |
|
479 |
if (sig == ciSymbol::string_void_signature()) { |
|
480 |
// StringBuilder(String) so pick this up as the first argument |
|
481 |
assert(use->in(TypeFunc::Parms + 1) != NULL, "what?"); |
|
7714
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
482 |
const Type* type = _gvn->type(use->in(TypeFunc::Parms + 1)); |
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
483 |
if (type == TypePtr::NULL_PTR) { |
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
484 |
// StringBuilder(null) throws exception. |
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
485 |
#ifndef PRODUCT |
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
486 |
if (PrintOptimizeStringConcat) { |
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
487 |
tty->print("giving up because StringBuilder(null) throws exception"); |
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
488 |
alloc->jvms()->dump_spec(tty); tty->cr(); |
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
489 |
} |
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
490 |
#endif |
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
491 |
return NULL; |
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
492 |
} |
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
493 |
// StringBuilder(str) argument needs null check. |
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
494 |
sc->push_string_null_check(use->in(TypeFunc::Parms + 1)); |
4450 | 495 |
} |
496 |
// The int variant takes an initial size for the backing |
|
497 |
// array so just treat it like the void version. |
|
498 |
constructor = use; |
|
499 |
} else { |
|
500 |
#ifndef PRODUCT |
|
501 |
if (PrintOptimizeStringConcat) { |
|
502 |
tty->print("unexpected constructor signature: %s", sig->as_utf8()); |
|
503 |
} |
|
504 |
#endif |
|
505 |
} |
|
506 |
break; |
|
507 |
} |
|
508 |
} |
|
509 |
if (constructor == NULL) { |
|
510 |
// couldn't find constructor |
|
511 |
#ifndef PRODUCT |
|
512 |
if (PrintOptimizeStringConcat) { |
|
513 |
tty->print("giving up because couldn't find constructor "); |
|
7714
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
514 |
alloc->jvms()->dump_spec(tty); tty->cr(); |
4450 | 515 |
} |
516 |
#endif |
|
517 |
break; |
|
518 |
} |
|
519 |
||
520 |
// Walked all the way back and found the constructor call so see |
|
521 |
// if this call converted into a direct string concatenation. |
|
522 |
sc->add_control(call); |
|
523 |
sc->add_control(constructor); |
|
524 |
sc->add_control(alloc); |
|
525 |
sc->set_allocation(alloc); |
|
20716
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
526 |
sc->add_constructor(constructor); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
527 |
if (sc->validate_control_flow() && sc->validate_mem_flow()) { |
4450 | 528 |
return sc; |
529 |
} else { |
|
530 |
return NULL; |
|
531 |
} |
|
532 |
} else if (cnode->method() == NULL) { |
|
533 |
break; |
|
6743
ef1795cd50a7
6986028: assert(_base == Int) failed: Not an Int in CmpINode::sub
never
parents:
6418
diff
changeset
|
534 |
} else if (!cnode->method()->is_static() && |
ef1795cd50a7
6986028: assert(_base == Int) failed: Not an Int in CmpINode::sub
never
parents:
6418
diff
changeset
|
535 |
cnode->method()->holder() == m->holder() && |
4450 | 536 |
cnode->method()->name() == ciSymbol::append_name() && |
537 |
(cnode->method()->signature()->as_symbol() == string_sig || |
|
538 |
cnode->method()->signature()->as_symbol() == char_sig || |
|
539 |
cnode->method()->signature()->as_symbol() == int_sig)) { |
|
540 |
sc->add_control(cnode); |
|
541 |
Node* arg = cnode->in(TypeFunc::Parms + 1); |
|
542 |
if (cnode->method()->signature()->as_symbol() == int_sig) { |
|
543 |
sc->push_int(arg); |
|
544 |
} else if (cnode->method()->signature()->as_symbol() == char_sig) { |
|
545 |
sc->push_char(arg); |
|
546 |
} else { |
|
547 |
if (arg->is_Proj() && arg->in(0)->is_CallStaticJava()) { |
|
548 |
CallStaticJavaNode* csj = arg->in(0)->as_CallStaticJava(); |
|
549 |
if (csj->method() != NULL && |
|
13292
587bb173cf43
7123926: Some CTW test crash: !_control.contains(ctrl)
kvn
parents:
13111
diff
changeset
|
550 |
csj->method()->intrinsic_id() == vmIntrinsics::_Integer_toString && |
587bb173cf43
7123926: Some CTW test crash: !_control.contains(ctrl)
kvn
parents:
13111
diff
changeset
|
551 |
arg->outcnt() == 1) { |
587bb173cf43
7123926: Some CTW test crash: !_control.contains(ctrl)
kvn
parents:
13111
diff
changeset
|
552 |
// _control is the list of StringBuilder calls nodes which |
587bb173cf43
7123926: Some CTW test crash: !_control.contains(ctrl)
kvn
parents:
13111
diff
changeset
|
553 |
// will be replaced by new String code after this optimization. |
587bb173cf43
7123926: Some CTW test crash: !_control.contains(ctrl)
kvn
parents:
13111
diff
changeset
|
554 |
// Integer::toString() call is not part of StringBuilder calls |
587bb173cf43
7123926: Some CTW test crash: !_control.contains(ctrl)
kvn
parents:
13111
diff
changeset
|
555 |
// chain. It could be eliminated only if its result is used |
587bb173cf43
7123926: Some CTW test crash: !_control.contains(ctrl)
kvn
parents:
13111
diff
changeset
|
556 |
// only by this SB calls chain. |
587bb173cf43
7123926: Some CTW test crash: !_control.contains(ctrl)
kvn
parents:
13111
diff
changeset
|
557 |
// Another limitation: it should be used only once because |
587bb173cf43
7123926: Some CTW test crash: !_control.contains(ctrl)
kvn
parents:
13111
diff
changeset
|
558 |
// it is unknown that it is used only by this SB calls chain |
587bb173cf43
7123926: Some CTW test crash: !_control.contains(ctrl)
kvn
parents:
13111
diff
changeset
|
559 |
// until all related SB calls nodes are collected. |
587bb173cf43
7123926: Some CTW test crash: !_control.contains(ctrl)
kvn
parents:
13111
diff
changeset
|
560 |
assert(arg->unique_out() == cnode, "sanity"); |
4450 | 561 |
sc->add_control(csj); |
562 |
sc->push_int(csj->in(TypeFunc::Parms)); |
|
563 |
continue; |
|
564 |
} |
|
565 |
} |
|
566 |
sc->push_string(arg); |
|
567 |
} |
|
568 |
continue; |
|
569 |
} else { |
|
570 |
// some unhandled signature |
|
571 |
#ifndef PRODUCT |
|
572 |
if (PrintOptimizeStringConcat) { |
|
573 |
tty->print("giving up because encountered unexpected signature "); |
|
574 |
cnode->tf()->dump(); tty->cr(); |
|
575 |
cnode->in(TypeFunc::Parms + 1)->dump(); |
|
576 |
} |
|
577 |
#endif |
|
578 |
break; |
|
579 |
} |
|
580 |
} |
|
581 |
return NULL; |
|
582 |
} |
|
583 |
||
584 |
||
585 |
PhaseStringOpts::PhaseStringOpts(PhaseGVN* gvn, Unique_Node_List*): |
|
586 |
Phase(StringOpts), |
|
587 |
_gvn(gvn), |
|
588 |
_visited(Thread::current()->resource_area()) { |
|
589 |
||
590 |
assert(OptimizeStringConcat, "shouldn't be here"); |
|
591 |
||
592 |
size_table_field = C->env()->Integer_klass()->get_field_by_name(ciSymbol::make("sizeTable"), |
|
593 |
ciSymbol::make("[I"), true); |
|
594 |
if (size_table_field == NULL) { |
|
595 |
// Something wrong so give up. |
|
596 |
assert(false, "why can't we find Integer.sizeTable?"); |
|
597 |
return; |
|
598 |
} |
|
599 |
||
600 |
// Collect the types needed to talk about the various slices of memory |
|
33628 | 601 |
byte_adr_idx = C->get_alias_index(TypeAryPtr::BYTES); |
4450 | 602 |
|
603 |
// For each locally allocated StringBuffer see if the usages can be |
|
604 |
// collapsed into a single String construction. |
|
605 |
||
606 |
// Run through the list of allocation looking for SB.toString to see |
|
607 |
// if it's possible to fuse the usage of the SB into a single String |
|
608 |
// construction. |
|
609 |
GrowableArray<StringConcat*> concats; |
|
610 |
Node_List toStrings = collect_toString_calls(); |
|
611 |
while (toStrings.size() > 0) { |
|
612 |
StringConcat* sc = build_candidate(toStrings.pop()->as_CallStaticJava()); |
|
613 |
if (sc != NULL) { |
|
614 |
concats.push(sc); |
|
615 |
} |
|
616 |
} |
|
617 |
||
618 |
// try to coalesce separate concats |
|
619 |
restart: |
|
620 |
for (int c = 0; c < concats.length(); c++) { |
|
621 |
StringConcat* sc = concats.at(c); |
|
622 |
for (int i = 0; i < sc->num_arguments(); i++) { |
|
13111
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
623 |
Node* arg = sc->argument_uncast(i); |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
624 |
if (arg->is_Proj() && StringConcat::is_SB_toString(arg->in(0))) { |
4450 | 625 |
CallStaticJavaNode* csj = arg->in(0)->as_CallStaticJava(); |
13111
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
626 |
for (int o = 0; o < concats.length(); o++) { |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
627 |
if (c == o) continue; |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
628 |
StringConcat* other = concats.at(o); |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
629 |
if (other->end() == csj) { |
4450 | 630 |
#ifndef PRODUCT |
13111
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
631 |
if (PrintOptimizeStringConcat) { |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
632 |
tty->print_cr("considering stacked concats"); |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
633 |
} |
4450 | 634 |
#endif |
635 |
||
13111
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
636 |
StringConcat* merged = sc->merge(other, arg); |
20716
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
637 |
if (merged->validate_control_flow() && merged->validate_mem_flow()) { |
4450 | 638 |
#ifndef PRODUCT |
13111
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
639 |
if (PrintOptimizeStringConcat) { |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
640 |
tty->print_cr("stacking would succeed"); |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
641 |
} |
4450 | 642 |
#endif |
13111
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
643 |
if (c < o) { |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
644 |
concats.remove_at(o); |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
645 |
concats.at_put(c, merged); |
4450 | 646 |
} else { |
13111
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
647 |
concats.remove_at(c); |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
648 |
concats.at_put(o, merged); |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
649 |
} |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
650 |
goto restart; |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
651 |
} else { |
4450 | 652 |
#ifndef PRODUCT |
13111
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
653 |
if (PrintOptimizeStringConcat) { |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
654 |
tty->print_cr("stacking would fail"); |
e8a578a9b20a
7179138: Incorrect result with String concatenation optimization
kvn
parents:
12623
diff
changeset
|
655 |
} |
4450 | 656 |
#endif |
657 |
} |
|
658 |
} |
|
659 |
} |
|
660 |
} |
|
661 |
} |
|
662 |
} |
|
663 |
||
664 |
||
665 |
for (int c = 0; c < concats.length(); c++) { |
|
666 |
StringConcat* sc = concats.at(c); |
|
667 |
replace_string_concat(sc); |
|
668 |
} |
|
669 |
||
670 |
remove_dead_nodes(); |
|
671 |
} |
|
672 |
||
673 |
void PhaseStringOpts::record_dead_node(Node* dead) { |
|
674 |
dead_worklist.push(dead); |
|
675 |
} |
|
676 |
||
677 |
void PhaseStringOpts::remove_dead_nodes() { |
|
678 |
// Delete any dead nodes to make things clean enough that escape |
|
679 |
// analysis doesn't get unhappy. |
|
680 |
while (dead_worklist.size() > 0) { |
|
681 |
Node* use = dead_worklist.pop(); |
|
682 |
int opc = use->Opcode(); |
|
683 |
switch (opc) { |
|
684 |
case Op_Region: { |
|
685 |
uint i = 1; |
|
686 |
for (i = 1; i < use->req(); i++) { |
|
687 |
if (use->in(i) != C->top()) { |
|
688 |
break; |
|
689 |
} |
|
690 |
} |
|
691 |
if (i >= use->req()) { |
|
692 |
for (SimpleDUIterator i(use); i.has_next(); i.next()) { |
|
693 |
Node* m = i.get(); |
|
694 |
if (m->is_Phi()) { |
|
695 |
dead_worklist.push(m); |
|
696 |
} |
|
697 |
} |
|
698 |
C->gvn_replace_by(use, C->top()); |
|
699 |
} |
|
700 |
break; |
|
701 |
} |
|
702 |
case Op_AddP: |
|
703 |
case Op_CreateEx: { |
|
704 |
// Recurisvely clean up references to CreateEx so EA doesn't |
|
705 |
// get unhappy about the partially collapsed graph. |
|
706 |
for (SimpleDUIterator i(use); i.has_next(); i.next()) { |
|
707 |
Node* m = i.get(); |
|
708 |
if (m->is_AddP()) { |
|
709 |
dead_worklist.push(m); |
|
710 |
} |
|
711 |
} |
|
712 |
C->gvn_replace_by(use, C->top()); |
|
713 |
break; |
|
714 |
} |
|
715 |
case Op_Phi: |
|
716 |
if (use->in(0) == C->top()) { |
|
717 |
C->gvn_replace_by(use, C->top()); |
|
718 |
} |
|
719 |
break; |
|
720 |
} |
|
721 |
} |
|
722 |
} |
|
723 |
||
724 |
||
20716
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
725 |
bool StringConcat::validate_mem_flow() { |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
726 |
Compile* C = _stringopts->C; |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
727 |
|
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
728 |
for (uint i = 0; i < _control.size(); i++) { |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
729 |
#ifndef PRODUCT |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
730 |
Node_List path; |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
731 |
#endif |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
732 |
Node* curr = _control.at(i); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
733 |
if (curr->is_Call() && curr != _begin) { // For all calls except the first allocation |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
734 |
// Now here's the main invariant in our case: |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
735 |
// For memory between the constructor, and appends, and toString we should only see bottom memory, |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
736 |
// produced by the previous call we know about. |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
737 |
if (!_constructors.contains(curr)) { |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
738 |
NOT_PRODUCT(path.push(curr);) |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
739 |
Node* mem = curr->in(TypeFunc::Memory); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
740 |
assert(mem != NULL, "calls should have memory edge"); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
741 |
assert(!mem->is_Phi(), "should be handled by control flow validation"); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
742 |
NOT_PRODUCT(path.push(mem);) |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
743 |
while (mem->is_MergeMem()) { |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
744 |
for (uint i = 1; i < mem->req(); i++) { |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
745 |
if (i != Compile::AliasIdxBot && mem->in(i) != C->top()) { |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
746 |
#ifndef PRODUCT |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
747 |
if (PrintOptimizeStringConcat) { |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
748 |
tty->print("fusion has incorrect memory flow (side effects) for "); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
749 |
_begin->jvms()->dump_spec(tty); tty->cr(); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
750 |
path.dump(); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
751 |
} |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
752 |
#endif |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
753 |
return false; |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
754 |
} |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
755 |
} |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
756 |
// skip through a potential MergeMem chain, linked through Bot |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
757 |
mem = mem->in(Compile::AliasIdxBot); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
758 |
NOT_PRODUCT(path.push(mem);) |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
759 |
} |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
760 |
// now let it fall through, and see if we have a projection |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
761 |
if (mem->is_Proj()) { |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
762 |
// Should point to a previous known call |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
763 |
Node *prev = mem->in(0); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
764 |
NOT_PRODUCT(path.push(prev);) |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
765 |
if (!prev->is_Call() || !_control.contains(prev)) { |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
766 |
#ifndef PRODUCT |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
767 |
if (PrintOptimizeStringConcat) { |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
768 |
tty->print("fusion has incorrect memory flow (unknown call) for "); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
769 |
_begin->jvms()->dump_spec(tty); tty->cr(); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
770 |
path.dump(); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
771 |
} |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
772 |
#endif |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
773 |
return false; |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
774 |
} |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
775 |
} else { |
33105
294e48b4f704
8080775: Better argument formatting for assert() and friends
david
parents:
32467
diff
changeset
|
776 |
assert(mem->is_Store() || mem->is_LoadStore(), "unexpected node type: %s", mem->Name()); |
20716
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
777 |
#ifndef PRODUCT |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
778 |
if (PrintOptimizeStringConcat) { |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
779 |
tty->print("fusion has incorrect memory flow (unexpected source) for "); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
780 |
_begin->jvms()->dump_spec(tty); tty->cr(); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
781 |
path.dump(); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
782 |
} |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
783 |
#endif |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
784 |
return false; |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
785 |
} |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
786 |
} else { |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
787 |
// For memory that feeds into constructors it's more complicated. |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
788 |
// However the advantage is that any side effect that happens between the Allocate/Initialize and |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
789 |
// the constructor will have to be control-dependent on Initialize. |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
790 |
// So we actually don't have to do anything, since it's going to be caught by the control flow |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
791 |
// analysis. |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
792 |
#ifdef ASSERT |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
793 |
// Do a quick verification of the control pattern between the constructor and the initialize node |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
794 |
assert(curr->is_Call(), "constructor should be a call"); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
795 |
// Go up the control starting from the constructor call |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
796 |
Node* ctrl = curr->in(0); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
797 |
IfNode* iff = NULL; |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
798 |
RegionNode* copy = NULL; |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
799 |
|
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
800 |
while (true) { |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
801 |
// skip known check patterns |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
802 |
if (ctrl->is_Region()) { |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
803 |
if (ctrl->as_Region()->is_copy()) { |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
804 |
copy = ctrl->as_Region(); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
805 |
ctrl = copy->is_copy(); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
806 |
} else { // a cast |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
807 |
assert(ctrl->req() == 3 && |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
808 |
ctrl->in(1) != NULL && ctrl->in(1)->is_Proj() && |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
809 |
ctrl->in(2) != NULL && ctrl->in(2)->is_Proj() && |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
810 |
ctrl->in(1)->in(0) == ctrl->in(2)->in(0) && |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
811 |
ctrl->in(1)->in(0) != NULL && ctrl->in(1)->in(0)->is_If(), |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
812 |
"must be a simple diamond"); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
813 |
Node* true_proj = ctrl->in(1)->is_IfTrue() ? ctrl->in(1) : ctrl->in(2); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
814 |
for (SimpleDUIterator i(true_proj); i.has_next(); i.next()) { |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
815 |
Node* use = i.get(); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
816 |
assert(use == ctrl || use->is_ConstraintCast(), |
33105
294e48b4f704
8080775: Better argument formatting for assert() and friends
david
parents:
32467
diff
changeset
|
817 |
"unexpected user: %s", use->Name()); |
20716
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
818 |
} |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
819 |
|
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
820 |
iff = ctrl->in(1)->in(0)->as_If(); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
821 |
ctrl = iff->in(0); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
822 |
} |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
823 |
} else if (ctrl->is_IfTrue()) { // null checks, class checks |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
824 |
iff = ctrl->in(0)->as_If(); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
825 |
// Verify that the other arm is an uncommon trap |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
826 |
Node* otherproj = iff->proj_out(1 - ctrl->as_Proj()->_con); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
827 |
CallStaticJavaNode* call = otherproj->unique_out()->isa_CallStaticJava(); |
35552
be1bff8945dc
8136469: OptimizeStringConcat fails on pre-sized StringBuilder shapes
thartmann
parents:
34204
diff
changeset
|
828 |
assert(strcmp(call->_name, "uncommon_trap") == 0, "must be uncommon trap"); |
20716
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
829 |
ctrl = iff->in(0); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
830 |
} else { |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
831 |
break; |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
832 |
} |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
833 |
} |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
834 |
|
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
835 |
assert(ctrl->is_Proj(), "must be a projection"); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
836 |
assert(ctrl->in(0)->is_Initialize(), "should be initialize"); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
837 |
for (SimpleDUIterator i(ctrl); i.has_next(); i.next()) { |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
838 |
Node* use = i.get(); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
839 |
assert(use == copy || use == iff || use == curr || use->is_CheckCastPP() || use->is_Load(), |
33105
294e48b4f704
8080775: Better argument formatting for assert() and friends
david
parents:
32467
diff
changeset
|
840 |
"unexpected user: %s", use->Name()); |
20716
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
841 |
} |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
842 |
#endif // ASSERT |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
843 |
} |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
844 |
} |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
845 |
} |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
846 |
|
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
847 |
#ifndef PRODUCT |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
848 |
if (PrintOptimizeStringConcat) { |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
849 |
tty->print("fusion has correct memory flow for "); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
850 |
_begin->jvms()->dump_spec(tty); tty->cr(); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
851 |
tty->cr(); |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
852 |
} |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
853 |
#endif |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
854 |
return true; |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
855 |
} |
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
856 |
|
4450 | 857 |
bool StringConcat::validate_control_flow() { |
858 |
// We found all the calls and arguments now lets see if it's |
|
859 |
// safe to transform the graph as we would expect. |
|
860 |
||
861 |
// Check to see if this resulted in too many uncommon traps previously |
|
862 |
if (Compile::current()->too_many_traps(_begin->jvms()->method(), _begin->jvms()->bci(), |
|
863 |
Deoptimization::Reason_intrinsic)) { |
|
864 |
return false; |
|
865 |
} |
|
866 |
||
867 |
// Walk backwards over the control flow from toString to the |
|
868 |
// allocation and make sure all the control flow is ok. This |
|
869 |
// means it's either going to be eliminated once the calls are |
|
870 |
// removed or it can safely be transformed into an uncommon |
|
871 |
// trap. |
|
872 |
||
873 |
int null_check_count = 0; |
|
874 |
Unique_Node_List ctrl_path; |
|
875 |
||
876 |
assert(_control.contains(_begin), "missing"); |
|
877 |
assert(_control.contains(_end), "missing"); |
|
878 |
||
879 |
// Collect the nodes that we know about and will eliminate into ctrl_path |
|
880 |
for (uint i = 0; i < _control.size(); i++) { |
|
881 |
// Push the call and it's control projection |
|
882 |
Node* n = _control.at(i); |
|
883 |
if (n->is_Allocate()) { |
|
884 |
AllocateNode* an = n->as_Allocate(); |
|
885 |
InitializeNode* init = an->initialization(); |
|
886 |
ctrl_path.push(init); |
|
887 |
ctrl_path.push(init->as_Multi()->proj_out(0)); |
|
888 |
} |
|
889 |
if (n->is_Call()) { |
|
890 |
CallNode* cn = n->as_Call(); |
|
891 |
ctrl_path.push(cn); |
|
892 |
ctrl_path.push(cn->proj_out(0)); |
|
893 |
ctrl_path.push(cn->proj_out(0)->unique_out()); |
|
48595
5d699d81c10c
8194988: 8 Null pointer dereference defect groups related to MultiNode::proj_out()
dlong
parents:
47216
diff
changeset
|
894 |
Node* catchproj = cn->proj_out(0)->unique_out()->as_Catch()->proj_out_or_null(0); |
44314
30ae899b9eca
8175345: Reported null pointer dereference defect groups
rraghavan
parents:
39418
diff
changeset
|
895 |
if (catchproj != NULL) { |
30ae899b9eca
8175345: Reported null pointer dereference defect groups
rraghavan
parents:
39418
diff
changeset
|
896 |
ctrl_path.push(catchproj); |
14828
bb9dffedf46c
8005031: Some cleanup in c2 to prepare for incremental inlining support
roland
parents:
14623
diff
changeset
|
897 |
} |
4450 | 898 |
} else { |
899 |
ShouldNotReachHere(); |
|
900 |
} |
|
901 |
} |
|
902 |
||
20716
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
903 |
// Skip backwards through the control checking for unexpected control flow |
4450 | 904 |
Node* ptr = _end; |
905 |
bool fail = false; |
|
906 |
while (ptr != _begin) { |
|
907 |
if (ptr->is_Call() && ctrl_path.member(ptr)) { |
|
908 |
ptr = ptr->in(0); |
|
909 |
} else if (ptr->is_CatchProj() && ctrl_path.member(ptr)) { |
|
910 |
ptr = ptr->in(0)->in(0)->in(0); |
|
911 |
assert(ctrl_path.member(ptr), "should be a known piece of control"); |
|
912 |
} else if (ptr->is_IfTrue()) { |
|
913 |
IfNode* iff = ptr->in(0)->as_If(); |
|
914 |
BoolNode* b = iff->in(1)->isa_Bool(); |
|
14828
bb9dffedf46c
8005031: Some cleanup in c2 to prepare for incremental inlining support
roland
parents:
14623
diff
changeset
|
915 |
|
bb9dffedf46c
8005031: Some cleanup in c2 to prepare for incremental inlining support
roland
parents:
14623
diff
changeset
|
916 |
if (b == NULL) { |
35552
be1bff8945dc
8136469: OptimizeStringConcat fails on pre-sized StringBuilder shapes
thartmann
parents:
34204
diff
changeset
|
917 |
#ifndef PRODUCT |
be1bff8945dc
8136469: OptimizeStringConcat fails on pre-sized StringBuilder shapes
thartmann
parents:
34204
diff
changeset
|
918 |
if (PrintOptimizeStringConcat) { |
be1bff8945dc
8136469: OptimizeStringConcat fails on pre-sized StringBuilder shapes
thartmann
parents:
34204
diff
changeset
|
919 |
tty->print_cr("unexpected input to IfNode"); |
be1bff8945dc
8136469: OptimizeStringConcat fails on pre-sized StringBuilder shapes
thartmann
parents:
34204
diff
changeset
|
920 |
iff->in(1)->dump(); |
be1bff8945dc
8136469: OptimizeStringConcat fails on pre-sized StringBuilder shapes
thartmann
parents:
34204
diff
changeset
|
921 |
tty->cr(); |
be1bff8945dc
8136469: OptimizeStringConcat fails on pre-sized StringBuilder shapes
thartmann
parents:
34204
diff
changeset
|
922 |
} |
be1bff8945dc
8136469: OptimizeStringConcat fails on pre-sized StringBuilder shapes
thartmann
parents:
34204
diff
changeset
|
923 |
#endif |
14828
bb9dffedf46c
8005031: Some cleanup in c2 to prepare for incremental inlining support
roland
parents:
14623
diff
changeset
|
924 |
fail = true; |
bb9dffedf46c
8005031: Some cleanup in c2 to prepare for incremental inlining support
roland
parents:
14623
diff
changeset
|
925 |
break; |
bb9dffedf46c
8005031: Some cleanup in c2 to prepare for incremental inlining support
roland
parents:
14623
diff
changeset
|
926 |
} |
bb9dffedf46c
8005031: Some cleanup in c2 to prepare for incremental inlining support
roland
parents:
14623
diff
changeset
|
927 |
|
4450 | 928 |
Node* cmp = b->in(1); |
929 |
Node* v1 = cmp->in(1); |
|
930 |
Node* v2 = cmp->in(2); |
|
931 |
Node* otherproj = iff->proj_out(1 - ptr->as_Proj()->_con); |
|
932 |
||
933 |
// Null check of the return of append which can simply be eliminated |
|
934 |
if (b->_test._test == BoolTest::ne && |
|
935 |
v2->bottom_type() == TypePtr::NULL_PTR && |
|
936 |
v1->is_Proj() && ctrl_path.member(v1->in(0))) { |
|
937 |
// NULL check of the return value of the append |
|
938 |
null_check_count++; |
|
939 |
if (otherproj->outcnt() == 1) { |
|
940 |
CallStaticJavaNode* call = otherproj->unique_out()->isa_CallStaticJava(); |
|
941 |
if (call != NULL && call->_name != NULL && strcmp(call->_name, "uncommon_trap") == 0) { |
|
942 |
ctrl_path.push(call); |
|
943 |
} |
|
944 |
} |
|
945 |
_control.push(ptr); |
|
946 |
ptr = ptr->in(0)->in(0); |
|
947 |
continue; |
|
948 |
} |
|
949 |
||
950 |
// A test which leads to an uncommon trap which should be safe. |
|
951 |
// Later this trap will be converted into a trap that restarts |
|
952 |
// at the beginning. |
|
953 |
if (otherproj->outcnt() == 1) { |
|
954 |
CallStaticJavaNode* call = otherproj->unique_out()->isa_CallStaticJava(); |
|
955 |
if (call != NULL && call->_name != NULL && strcmp(call->_name, "uncommon_trap") == 0) { |
|
956 |
// control flow leads to uct so should be ok |
|
957 |
_uncommon_traps.push(call); |
|
958 |
ctrl_path.push(call); |
|
959 |
ptr = ptr->in(0)->in(0); |
|
960 |
continue; |
|
961 |
} |
|
962 |
} |
|
963 |
||
964 |
#ifndef PRODUCT |
|
965 |
// Some unexpected control flow we don't know how to handle. |
|
966 |
if (PrintOptimizeStringConcat) { |
|
967 |
tty->print_cr("failing with unknown test"); |
|
968 |
b->dump(); |
|
969 |
cmp->dump(); |
|
970 |
v1->dump(); |
|
971 |
v2->dump(); |
|
972 |
tty->cr(); |
|
973 |
} |
|
974 |
#endif |
|
9953 | 975 |
fail = true; |
4450 | 976 |
break; |
977 |
} else if (ptr->is_Proj() && ptr->in(0)->is_Initialize()) { |
|
978 |
ptr = ptr->in(0)->in(0); |
|
979 |
} else if (ptr->is_Region()) { |
|
980 |
Node* copy = ptr->as_Region()->is_copy(); |
|
981 |
if (copy != NULL) { |
|
982 |
ptr = copy; |
|
983 |
continue; |
|
984 |
} |
|
985 |
if (ptr->req() == 3 && |
|
986 |
ptr->in(1) != NULL && ptr->in(1)->is_Proj() && |
|
987 |
ptr->in(2) != NULL && ptr->in(2)->is_Proj() && |
|
988 |
ptr->in(1)->in(0) == ptr->in(2)->in(0) && |
|
989 |
ptr->in(1)->in(0) != NULL && ptr->in(1)->in(0)->is_If()) { |
|
990 |
// Simple diamond. |
|
991 |
// XXX should check for possibly merging stores. simple data merges are ok. |
|
15113 | 992 |
// The IGVN will make this simple diamond go away when it |
993 |
// transforms the Region. Make sure it sees it. |
|
994 |
Compile::current()->record_for_igvn(ptr); |
|
4450 | 995 |
ptr = ptr->in(1)->in(0)->in(0); |
996 |
continue; |
|
997 |
} |
|
998 |
#ifndef PRODUCT |
|
999 |
if (PrintOptimizeStringConcat) { |
|
1000 |
tty->print_cr("fusion would fail for region"); |
|
1001 |
_begin->dump(); |
|
1002 |
ptr->dump(2); |
|
1003 |
} |
|
1004 |
#endif |
|
1005 |
fail = true; |
|
1006 |
break; |
|
1007 |
} else { |
|
1008 |
// other unknown control |
|
1009 |
if (!fail) { |
|
1010 |
#ifndef PRODUCT |
|
1011 |
if (PrintOptimizeStringConcat) { |
|
1012 |
tty->print_cr("fusion would fail for"); |
|
1013 |
_begin->dump(); |
|
1014 |
} |
|
1015 |
#endif |
|
1016 |
fail = true; |
|
1017 |
} |
|
1018 |
#ifndef PRODUCT |
|
1019 |
if (PrintOptimizeStringConcat) { |
|
1020 |
ptr->dump(); |
|
1021 |
} |
|
1022 |
#endif |
|
1023 |
ptr = ptr->in(0); |
|
1024 |
} |
|
1025 |
} |
|
1026 |
#ifndef PRODUCT |
|
1027 |
if (PrintOptimizeStringConcat && fail) { |
|
1028 |
tty->cr(); |
|
1029 |
} |
|
1030 |
#endif |
|
1031 |
if (fail) return !fail; |
|
1032 |
||
1033 |
// Validate that all these results produced are contained within |
|
1034 |
// this cluster of objects. First collect all the results produced |
|
1035 |
// by calls in the region. |
|
1036 |
_stringopts->_visited.Clear(); |
|
1037 |
Node_List worklist; |
|
48595
5d699d81c10c
8194988: 8 Null pointer dereference defect groups related to MultiNode::proj_out()
dlong
parents:
47216
diff
changeset
|
1038 |
Node* final_result = _end->proj_out_or_null(TypeFunc::Parms); |
4450 | 1039 |
for (uint i = 0; i < _control.size(); i++) { |
1040 |
CallNode* cnode = _control.at(i)->isa_Call(); |
|
1041 |
if (cnode != NULL) { |
|
1042 |
_stringopts->_visited.test_set(cnode->_idx); |
|
1043 |
} |
|
48595
5d699d81c10c
8194988: 8 Null pointer dereference defect groups related to MultiNode::proj_out()
dlong
parents:
47216
diff
changeset
|
1044 |
Node* result = cnode != NULL ? cnode->proj_out_or_null(TypeFunc::Parms) : NULL; |
4450 | 1045 |
if (result != NULL && result != final_result) { |
1046 |
worklist.push(result); |
|
1047 |
} |
|
1048 |
} |
|
1049 |
||
1050 |
Node* last_result = NULL; |
|
1051 |
while (worklist.size() > 0) { |
|
1052 |
Node* result = worklist.pop(); |
|
1053 |
if (_stringopts->_visited.test_set(result->_idx)) |
|
1054 |
continue; |
|
1055 |
for (SimpleDUIterator i(result); i.has_next(); i.next()) { |
|
1056 |
Node *use = i.get(); |
|
1057 |
if (ctrl_path.member(use)) { |
|
1058 |
// already checked this |
|
1059 |
continue; |
|
1060 |
} |
|
1061 |
int opc = use->Opcode(); |
|
1062 |
if (opc == Op_CmpP || opc == Op_Node) { |
|
1063 |
ctrl_path.push(use); |
|
1064 |
continue; |
|
1065 |
} |
|
1066 |
if (opc == Op_CastPP || opc == Op_CheckCastPP) { |
|
1067 |
for (SimpleDUIterator j(use); j.has_next(); j.next()) { |
|
1068 |
worklist.push(j.get()); |
|
1069 |
} |
|
1070 |
worklist.push(use->in(1)); |
|
1071 |
ctrl_path.push(use); |
|
1072 |
continue; |
|
1073 |
} |
|
1074 |
#ifndef PRODUCT |
|
1075 |
if (PrintOptimizeStringConcat) { |
|
1076 |
if (result != last_result) { |
|
1077 |
last_result = result; |
|
1078 |
tty->print_cr("extra uses for result:"); |
|
1079 |
last_result->dump(); |
|
1080 |
} |
|
1081 |
use->dump(); |
|
1082 |
} |
|
1083 |
#endif |
|
1084 |
fail = true; |
|
1085 |
break; |
|
1086 |
} |
|
1087 |
} |
|
1088 |
||
1089 |
#ifndef PRODUCT |
|
1090 |
if (PrintOptimizeStringConcat && !fail) { |
|
1091 |
ttyLocker ttyl; |
|
1092 |
tty->cr(); |
|
20716
5093ad743df4
8009303: Tiered: incorrect results in VM tests stringconcat with -Xcomp -XX:+DeoptimizeALot on solaris-amd64
iveresov
parents:
15113
diff
changeset
|
1093 |
tty->print("fusion has correct control flow (%d %d) for ", null_check_count, _uncommon_traps.size()); |
4450 | 1094 |
_begin->jvms()->dump_spec(tty); tty->cr(); |
1095 |
for (int i = 0; i < num_arguments(); i++) { |
|
1096 |
argument(i)->dump(); |
|
1097 |
} |
|
1098 |
_control.dump(); |
|
1099 |
tty->cr(); |
|
1100 |
} |
|
1101 |
#endif |
|
1102 |
||
1103 |
return !fail; |
|
1104 |
} |
|
1105 |
||
1106 |
Node* PhaseStringOpts::fetch_static_field(GraphKit& kit, ciField* field) { |
|
12592
6d69203a4cb0
7161796: PhaseStringOpts::fetch_static_field tries to fetch field from the Klass instead of the mirror
never
parents:
9953
diff
changeset
|
1107 |
const TypeInstPtr* mirror_type = TypeInstPtr::make(field->holder()->java_mirror()); |
6d69203a4cb0
7161796: PhaseStringOpts::fetch_static_field tries to fetch field from the Klass instead of the mirror
never
parents:
9953
diff
changeset
|
1108 |
Node* klass_node = __ makecon(mirror_type); |
4450 | 1109 |
BasicType bt = field->layout_type(); |
1110 |
ciType* field_klass = field->type(); |
|
1111 |
||
1112 |
const Type *type; |
|
1113 |
if( bt == T_OBJECT ) { |
|
1114 |
if (!field->type()->is_loaded()) { |
|
1115 |
type = TypeInstPtr::BOTTOM; |
|
38030
93f24e7b3c43
8152590: C2: @Stable support doesn't always work w/ incremental inlining
vlivanov
parents:
36077
diff
changeset
|
1116 |
} else if (field->is_static_constant()) { |
4450 | 1117 |
// This can happen if the constant oop is non-perm. |
1118 |
ciObject* con = field->constant_value().as_object(); |
|
1119 |
// Do not "join" in the previous type; it doesn't add value, |
|
1120 |
// and may yield a vacuous result if the field is of interface type. |
|
8728
3f1bcd33068e
6962931: move interned strings out of the perm gen
jcoomes
parents:
7714
diff
changeset
|
1121 |
type = TypeOopPtr::make_from_constant(con, true)->isa_oopptr(); |
4450 | 1122 |
assert(type != NULL, "field singleton type must be consistent"); |
12592
6d69203a4cb0
7161796: PhaseStringOpts::fetch_static_field tries to fetch field from the Klass instead of the mirror
never
parents:
9953
diff
changeset
|
1123 |
return __ makecon(type); |
4450 | 1124 |
} else { |
1125 |
type = TypeOopPtr::make_from_klass(field_klass->as_klass()); |
|
1126 |
} |
|
1127 |
} else { |
|
1128 |
type = Type::get_const_basic_type(bt); |
|
1129 |
} |
|
1130 |
||
1131 |
return kit.make_load(NULL, kit.basic_plus_adr(klass_node, field->offset_in_bytes()), |
|
1132 |
type, T_OBJECT, |
|
22845
d8812d0ff387
8024921: PPC64 (part 113): Extend Load and Store nodes to know about memory ordering
goetz
parents:
20716
diff
changeset
|
1133 |
C->get_alias_index(mirror_type->add_offset(field->offset_in_bytes())), |
d8812d0ff387
8024921: PPC64 (part 113): Extend Load and Store nodes to know about memory ordering
goetz
parents:
20716
diff
changeset
|
1134 |
MemNode::unordered); |
4450 | 1135 |
} |
1136 |
||
1137 |
Node* PhaseStringOpts::int_stringSize(GraphKit& kit, Node* arg) { |
|
33628 | 1138 |
if (arg->is_Con()) { |
1139 |
// Constant integer. Compute constant length using Integer.sizeTable |
|
1140 |
int arg_val = arg->get_int(); |
|
1141 |
int count = 1; |
|
1142 |
if (arg_val < 0) { |
|
1143 |
arg_val = -arg_val; |
|
1144 |
count++; |
|
1145 |
} |
|
1146 |
||
1147 |
ciArray* size_table = (ciArray*)size_table_field->constant_value().as_object(); |
|
1148 |
for (int i = 0; i < size_table->length(); i++) { |
|
1149 |
if (arg_val <= size_table->element_value(i).as_int()) { |
|
1150 |
count += i; |
|
1151 |
break; |
|
1152 |
} |
|
1153 |
} |
|
1154 |
return __ intcon(count); |
|
1155 |
} |
|
1156 |
||
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
22845
diff
changeset
|
1157 |
RegionNode *final_merge = new RegionNode(3); |
4450 | 1158 |
kit.gvn().set_type(final_merge, Type::CONTROL); |
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
22845
diff
changeset
|
1159 |
Node* final_size = new PhiNode(final_merge, TypeInt::INT); |
4450 | 1160 |
kit.gvn().set_type(final_size, TypeInt::INT); |
1161 |
||
1162 |
IfNode* iff = kit.create_and_map_if(kit.control(), |
|
1163 |
__ Bool(__ CmpI(arg, __ intcon(0x80000000)), BoolTest::ne), |
|
1164 |
PROB_FAIR, COUNT_UNKNOWN); |
|
1165 |
Node* is_min = __ IfFalse(iff); |
|
1166 |
final_merge->init_req(1, is_min); |
|
1167 |
final_size->init_req(1, __ intcon(11)); |
|
1168 |
||
1169 |
kit.set_control(__ IfTrue(iff)); |
|
1170 |
if (kit.stopped()) { |
|
1171 |
final_merge->init_req(2, C->top()); |
|
1172 |
final_size->init_req(2, C->top()); |
|
1173 |
} else { |
|
1174 |
||
1175 |
// int size = (i < 0) ? stringSize(-i) + 1 : stringSize(i); |
|
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
22845
diff
changeset
|
1176 |
RegionNode *r = new RegionNode(3); |
4450 | 1177 |
kit.gvn().set_type(r, Type::CONTROL); |
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
22845
diff
changeset
|
1178 |
Node *phi = new PhiNode(r, TypeInt::INT); |
4450 | 1179 |
kit.gvn().set_type(phi, TypeInt::INT); |
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
22845
diff
changeset
|
1180 |
Node *size = new PhiNode(r, TypeInt::INT); |
4450 | 1181 |
kit.gvn().set_type(size, TypeInt::INT); |
1182 |
Node* chk = __ CmpI(arg, __ intcon(0)); |
|
1183 |
Node* p = __ Bool(chk, BoolTest::lt); |
|
1184 |
IfNode* iff = kit.create_and_map_if(kit.control(), p, PROB_FAIR, COUNT_UNKNOWN); |
|
1185 |
Node* lessthan = __ IfTrue(iff); |
|
1186 |
Node* greaterequal = __ IfFalse(iff); |
|
1187 |
r->init_req(1, lessthan); |
|
1188 |
phi->init_req(1, __ SubI(__ intcon(0), arg)); |
|
1189 |
size->init_req(1, __ intcon(1)); |
|
1190 |
r->init_req(2, greaterequal); |
|
1191 |
phi->init_req(2, arg); |
|
1192 |
size->init_req(2, __ intcon(0)); |
|
1193 |
kit.set_control(r); |
|
1194 |
C->record_for_igvn(r); |
|
1195 |
C->record_for_igvn(phi); |
|
1196 |
C->record_for_igvn(size); |
|
1197 |
||
1198 |
// for (int i=0; ; i++) |
|
1199 |
// if (x <= sizeTable[i]) |
|
1200 |
// return i+1; |
|
8732
16fc1c68714b
7008866: Missing loop predicate for loop with multiple entries
kvn
parents:
7714
diff
changeset
|
1201 |
|
16fc1c68714b
7008866: Missing loop predicate for loop with multiple entries
kvn
parents:
7714
diff
changeset
|
1202 |
// Add loop predicate first. |
16fc1c68714b
7008866: Missing loop predicate for loop with multiple entries
kvn
parents:
7714
diff
changeset
|
1203 |
kit.add_predicate(); |
16fc1c68714b
7008866: Missing loop predicate for loop with multiple entries
kvn
parents:
7714
diff
changeset
|
1204 |
|
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
22845
diff
changeset
|
1205 |
RegionNode *loop = new RegionNode(3); |
4450 | 1206 |
loop->init_req(1, kit.control()); |
1207 |
kit.gvn().set_type(loop, Type::CONTROL); |
|
1208 |
||
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
22845
diff
changeset
|
1209 |
Node *index = new PhiNode(loop, TypeInt::INT); |
4450 | 1210 |
index->init_req(1, __ intcon(0)); |
1211 |
kit.gvn().set_type(index, TypeInt::INT); |
|
1212 |
kit.set_control(loop); |
|
1213 |
Node* sizeTable = fetch_static_field(kit, size_table_field); |
|
1214 |
||
1215 |
Node* value = kit.load_array_element(NULL, sizeTable, index, TypeAryPtr::INTS); |
|
1216 |
C->record_for_igvn(value); |
|
1217 |
Node* limit = __ CmpI(phi, value); |
|
1218 |
Node* limitb = __ Bool(limit, BoolTest::le); |
|
1219 |
IfNode* iff2 = kit.create_and_map_if(kit.control(), limitb, PROB_MIN, COUNT_UNKNOWN); |
|
1220 |
Node* lessEqual = __ IfTrue(iff2); |
|
1221 |
Node* greater = __ IfFalse(iff2); |
|
1222 |
||
1223 |
loop->init_req(2, greater); |
|
1224 |
index->init_req(2, __ AddI(index, __ intcon(1))); |
|
1225 |
||
1226 |
kit.set_control(lessEqual); |
|
1227 |
C->record_for_igvn(loop); |
|
1228 |
C->record_for_igvn(index); |
|
1229 |
||
1230 |
final_merge->init_req(2, kit.control()); |
|
1231 |
final_size->init_req(2, __ AddI(__ AddI(index, size), __ intcon(1))); |
|
1232 |
} |
|
1233 |
||
1234 |
kit.set_control(final_merge); |
|
1235 |
C->record_for_igvn(final_merge); |
|
1236 |
C->record_for_igvn(final_size); |
|
1237 |
||
1238 |
return final_size; |
|
1239 |
} |
|
1240 |
||
33628 | 1241 |
// Simplified version of Integer.getChars |
1242 |
void PhaseStringOpts::getChars(GraphKit& kit, Node* arg, Node* dst_array, BasicType bt, Node* end, Node* final_merge, Node* final_mem, int merge_index) { |
|
4450 | 1243 |
// if (i < 0) { |
1244 |
// sign = '-'; |
|
1245 |
// i = -i; |
|
1246 |
// } |
|
33628 | 1247 |
IfNode* iff = kit.create_and_map_if(kit.control(), __ Bool(__ CmpI(arg, __ intcon(0)), BoolTest::lt), |
1248 |
PROB_FAIR, COUNT_UNKNOWN); |
|
4450 | 1249 |
|
33628 | 1250 |
RegionNode* merge = new RegionNode(3); |
1251 |
kit.gvn().set_type(merge, Type::CONTROL); |
|
1252 |
Node* i = new PhiNode(merge, TypeInt::INT); |
|
1253 |
kit.gvn().set_type(i, TypeInt::INT); |
|
1254 |
Node* sign = new PhiNode(merge, TypeInt::INT); |
|
1255 |
kit.gvn().set_type(sign, TypeInt::INT); |
|
4450 | 1256 |
|
33628 | 1257 |
merge->init_req(1, __ IfTrue(iff)); |
1258 |
i->init_req(1, __ SubI(__ intcon(0), arg)); |
|
1259 |
sign->init_req(1, __ intcon('-')); |
|
1260 |
merge->init_req(2, __ IfFalse(iff)); |
|
1261 |
i->init_req(2, arg); |
|
1262 |
sign->init_req(2, __ intcon(0)); |
|
4450 | 1263 |
|
33628 | 1264 |
kit.set_control(merge); |
4450 | 1265 |
|
33628 | 1266 |
C->record_for_igvn(merge); |
1267 |
C->record_for_igvn(i); |
|
1268 |
C->record_for_igvn(sign); |
|
4450 | 1269 |
|
1270 |
// for (;;) { |
|
1271 |
// q = i / 10; |
|
1272 |
// r = i - ((q << 3) + (q << 1)); // r = i-(q*10) ... |
|
1273 |
// buf [--charPos] = digits [r]; |
|
1274 |
// i = q; |
|
1275 |
// if (i == 0) break; |
|
1276 |
// } |
|
1277 |
||
33628 | 1278 |
// Add loop predicate first. |
1279 |
kit.add_predicate(); |
|
1280 |
||
1281 |
RegionNode* head = new RegionNode(3); |
|
1282 |
head->init_req(1, kit.control()); |
|
8732
16fc1c68714b
7008866: Missing loop predicate for loop with multiple entries
kvn
parents:
7714
diff
changeset
|
1283 |
|
33628 | 1284 |
kit.gvn().set_type(head, Type::CONTROL); |
1285 |
Node* i_phi = new PhiNode(head, TypeInt::INT); |
|
1286 |
i_phi->init_req(1, i); |
|
1287 |
kit.gvn().set_type(i_phi, TypeInt::INT); |
|
1288 |
Node* charPos = new PhiNode(head, TypeInt::INT); |
|
1289 |
charPos->init_req(1, end); |
|
1290 |
kit.gvn().set_type(charPos, TypeInt::INT); |
|
1291 |
Node* mem = PhiNode::make(head, kit.memory(byte_adr_idx), Type::MEMORY, TypeAryPtr::BYTES); |
|
1292 |
kit.gvn().set_type(mem, Type::MEMORY); |
|
4450 | 1293 |
|
33628 | 1294 |
kit.set_control(head); |
1295 |
kit.set_memory(mem, byte_adr_idx); |
|
4450 | 1296 |
|
33628 | 1297 |
Node* q = __ DivI(kit.null(), i_phi, __ intcon(10)); |
1298 |
Node* r = __ SubI(i_phi, __ AddI(__ LShiftI(q, __ intcon(3)), |
|
1299 |
__ LShiftI(q, __ intcon(1)))); |
|
1300 |
Node* index = __ SubI(charPos, __ intcon((bt == T_BYTE) ? 1 : 2)); |
|
1301 |
Node* ch = __ AddI(r, __ intcon('0')); |
|
1302 |
Node* st = __ store_to_memory(kit.control(), kit.array_element_address(dst_array, index, T_BYTE), |
|
34204
5ad1ba3afecc
8140390: Char stores/loads accessing byte arrays must be marked as unmatched
thartmann
parents:
33636
diff
changeset
|
1303 |
ch, bt, byte_adr_idx, MemNode::unordered, (bt != T_BYTE) /* mismatched */); |
4450 | 1304 |
|
33628 | 1305 |
iff = kit.create_and_map_if(head, __ Bool(__ CmpI(q, __ intcon(0)), BoolTest::ne), |
1306 |
PROB_FAIR, COUNT_UNKNOWN); |
|
1307 |
Node* ne = __ IfTrue(iff); |
|
1308 |
Node* eq = __ IfFalse(iff); |
|
4450 | 1309 |
|
33628 | 1310 |
head->init_req(2, ne); |
1311 |
mem->init_req(2, st); |
|
1312 |
||
1313 |
i_phi->init_req(2, q); |
|
1314 |
charPos->init_req(2, index); |
|
1315 |
charPos = index; |
|
4450 | 1316 |
|
33628 | 1317 |
kit.set_control(eq); |
1318 |
kit.set_memory(st, byte_adr_idx); |
|
4450 | 1319 |
|
33628 | 1320 |
C->record_for_igvn(head); |
1321 |
C->record_for_igvn(mem); |
|
1322 |
C->record_for_igvn(i_phi); |
|
1323 |
C->record_for_igvn(charPos); |
|
4450 | 1324 |
|
33628 | 1325 |
// if (sign != 0) { |
1326 |
// buf [--charPos] = sign; |
|
1327 |
// } |
|
1328 |
iff = kit.create_and_map_if(kit.control(), __ Bool(__ CmpI(sign, __ intcon(0)), BoolTest::ne), |
|
1329 |
PROB_FAIR, COUNT_UNKNOWN); |
|
1330 |
||
1331 |
final_merge->init_req(merge_index + 2, __ IfFalse(iff)); |
|
1332 |
final_mem->init_req(merge_index + 2, kit.memory(byte_adr_idx)); |
|
4450 | 1333 |
|
33628 | 1334 |
kit.set_control(__ IfTrue(iff)); |
1335 |
if (kit.stopped()) { |
|
1336 |
final_merge->init_req(merge_index + 1, C->top()); |
|
1337 |
final_mem->init_req(merge_index + 1, C->top()); |
|
1338 |
} else { |
|
1339 |
Node* index = __ SubI(charPos, __ intcon((bt == T_BYTE) ? 1 : 2)); |
|
1340 |
st = __ store_to_memory(kit.control(), kit.array_element_address(dst_array, index, T_BYTE), |
|
34204
5ad1ba3afecc
8140390: Char stores/loads accessing byte arrays must be marked as unmatched
thartmann
parents:
33636
diff
changeset
|
1341 |
sign, bt, byte_adr_idx, MemNode::unordered, (bt != T_BYTE) /* mismatched */); |
4450 | 1342 |
|
33628 | 1343 |
final_merge->init_req(merge_index + 1, kit.control()); |
1344 |
final_mem->init_req(merge_index + 1, st); |
|
4450 | 1345 |
} |
1346 |
} |
|
1347 |
||
33628 | 1348 |
// Copy the characters representing arg into dst_array starting at start |
1349 |
Node* PhaseStringOpts::int_getChars(GraphKit& kit, Node* arg, Node* dst_array, Node* dst_coder, Node* start, Node* size) { |
|
1350 |
bool dcon = dst_coder->is_Con(); |
|
1351 |
bool dbyte = dcon ? (dst_coder->get_int() == java_lang_String::CODER_LATIN1) : false; |
|
1352 |
Node* end = __ AddI(start, __ LShiftI(size, dst_coder)); |
|
4450 | 1353 |
|
33628 | 1354 |
// The final_merge node has 4 entries in case the encoding is known: |
1355 |
// (0) Control, (1) result w/ sign, (2) result w/o sign, (3) result for Integer.min_value |
|
1356 |
// or 6 entries in case the encoding is not known: |
|
1357 |
// (0) Control, (1) Latin1 w/ sign, (2) Latin1 w/o sign, (3) min_value, (4) UTF16 w/ sign, (5) UTF16 w/o sign |
|
1358 |
RegionNode* final_merge = new RegionNode(dcon ? 4 : 6); |
|
1359 |
kit.gvn().set_type(final_merge, Type::CONTROL); |
|
1360 |
||
1361 |
Node* final_mem = PhiNode::make(final_merge, kit.memory(byte_adr_idx), Type::MEMORY, TypeAryPtr::BYTES); |
|
1362 |
kit.gvn().set_type(final_mem, Type::MEMORY); |
|
1363 |
||
1364 |
// need to handle arg == Integer.MIN_VALUE specially because negating doesn't make it positive |
|
1365 |
IfNode* iff = kit.create_and_map_if(kit.control(), __ Bool(__ CmpI(arg, __ intcon(0x80000000)), BoolTest::ne), |
|
1366 |
PROB_FAIR, COUNT_UNKNOWN); |
|
1367 |
||
1368 |
Node* old_mem = kit.memory(byte_adr_idx); |
|
1369 |
||
1370 |
kit.set_control(__ IfFalse(iff)); |
|
1371 |
if (kit.stopped()) { |
|
1372 |
// Statically not equal to MIN_VALUE so this path is dead |
|
1373 |
final_merge->init_req(3, kit.control()); |
|
1374 |
} else { |
|
1375 |
copy_string(kit, __ makecon(TypeInstPtr::make(C->env()->the_min_jint_string())), |
|
1376 |
dst_array, dst_coder, start); |
|
1377 |
final_merge->init_req(3, kit.control()); |
|
1378 |
final_mem->init_req(3, kit.memory(byte_adr_idx)); |
|
1379 |
} |
|
1380 |
||
1381 |
kit.set_control(__ IfTrue(iff)); |
|
1382 |
kit.set_memory(old_mem, byte_adr_idx); |
|
1383 |
||
1384 |
if (!dcon) { |
|
1385 |
// Check encoding of destination |
|
1386 |
iff = kit.create_and_map_if(kit.control(), __ Bool(__ CmpI(dst_coder, __ intcon(0)), BoolTest::eq), |
|
1387 |
PROB_FAIR, COUNT_UNKNOWN); |
|
1388 |
old_mem = kit.memory(byte_adr_idx); |
|
1389 |
} |
|
1390 |
if (!dcon || dbyte) { |
|
1391 |
// Destination is Latin1, |
|
1392 |
if (!dcon) { |
|
1393 |
kit.set_control(__ IfTrue(iff)); |
|
1394 |
} |
|
1395 |
getChars(kit, arg, dst_array, T_BYTE, end, final_merge, final_mem); |
|
1396 |
} |
|
1397 |
if (!dcon || !dbyte) { |
|
1398 |
// Destination is UTF16 |
|
1399 |
int merge_index = 0; |
|
1400 |
if (!dcon) { |
|
1401 |
kit.set_control(__ IfFalse(iff)); |
|
1402 |
kit.set_memory(old_mem, byte_adr_idx); |
|
1403 |
merge_index = 3; // Account for Latin1 case |
|
1404 |
} |
|
1405 |
getChars(kit, arg, dst_array, T_CHAR, end, final_merge, final_mem, merge_index); |
|
1406 |
} |
|
1407 |
||
1408 |
// Final merge point for Latin1 and UTF16 case |
|
1409 |
kit.set_control(final_merge); |
|
1410 |
kit.set_memory(final_mem, byte_adr_idx); |
|
1411 |
||
1412 |
C->record_for_igvn(final_merge); |
|
1413 |
C->record_for_igvn(final_mem); |
|
1414 |
return end; |
|
1415 |
} |
|
1416 |
||
1417 |
// Copy 'count' bytes/chars from src_array to dst_array starting at index start |
|
1418 |
void PhaseStringOpts::arraycopy(GraphKit& kit, IdealKit& ideal, Node* src_array, Node* dst_array, BasicType elembt, Node* start, Node* count) { |
|
1419 |
assert(elembt == T_BYTE || elembt == T_CHAR, "Invalid type for arraycopy"); |
|
1420 |
||
1421 |
if (elembt == T_CHAR) { |
|
1422 |
// Get number of chars |
|
1423 |
count = __ RShiftI(count, __ intcon(1)); |
|
1424 |
} |
|
1425 |
||
1426 |
Node* extra = NULL; |
|
1427 |
#ifdef _LP64 |
|
1428 |
count = __ ConvI2L(count); |
|
1429 |
extra = C->top(); |
|
1430 |
#endif |
|
1431 |
||
1432 |
Node* src_ptr = __ array_element_address(src_array, __ intcon(0), T_BYTE); |
|
1433 |
Node* dst_ptr = __ array_element_address(dst_array, start, T_BYTE); |
|
1434 |
// Check if destination address is aligned to HeapWordSize |
|
1435 |
const TypeInt* tdst = __ gvn().type(start)->is_int(); |
|
1436 |
bool aligned = tdst->is_con() && ((tdst->get_con() * type2aelembytes(T_BYTE)) % HeapWordSize == 0); |
|
1437 |
// Figure out which arraycopy runtime method to call (disjoint, uninitialized). |
|
1438 |
const char* copyfunc_name = "arraycopy"; |
|
1439 |
address copyfunc_addr = StubRoutines::select_arraycopy_function(elembt, aligned, true, copyfunc_name, true); |
|
1440 |
ideal.make_leaf_call_no_fp(OptoRuntime::fast_arraycopy_Type(), copyfunc_addr, copyfunc_name, |
|
1441 |
TypeAryPtr::BYTES, src_ptr, dst_ptr, count, extra); |
|
1442 |
} |
|
1443 |
||
1444 |
#undef __ |
|
1445 |
#define __ ideal. |
|
1446 |
||
1447 |
// Copy contents of a Latin1 encoded string from src_array to dst_array |
|
1448 |
void PhaseStringOpts::copy_latin1_string(GraphKit& kit, IdealKit& ideal, Node* src_array, IdealVariable& count, |
|
1449 |
Node* dst_array, Node* dst_coder, Node* start) { |
|
1450 |
bool dcon = dst_coder->is_Con(); |
|
1451 |
bool dbyte = dcon ? (dst_coder->get_int() == java_lang_String::CODER_LATIN1) : false; |
|
4450 | 1452 |
|
33628 | 1453 |
if (!dcon) { |
1454 |
__ if_then(dst_coder, BoolTest::eq, __ ConI(java_lang_String::CODER_LATIN1)); |
|
1455 |
} |
|
1456 |
if (!dcon || dbyte) { |
|
1457 |
// Destination is Latin1. Simply emit a byte arraycopy. |
|
1458 |
arraycopy(kit, ideal, src_array, dst_array, T_BYTE, start, __ value(count)); |
|
1459 |
} |
|
1460 |
if (!dcon) { |
|
1461 |
__ else_(); |
|
1462 |
} |
|
1463 |
if (!dcon || !dbyte) { |
|
1464 |
// Destination is UTF16. Inflate src_array into dst_array. |
|
1465 |
kit.sync_kit(ideal); |
|
1466 |
if (Matcher::match_rule_supported(Op_StrInflatedCopy)) { |
|
1467 |
// Use fast intrinsic |
|
1468 |
Node* src = kit.array_element_address(src_array, kit.intcon(0), T_BYTE); |
|
1469 |
Node* dst = kit.array_element_address(dst_array, start, T_BYTE); |
|
35573
e6c6e7a3b036
8144212: JDK 9 b93 breaks Apache Lucene due to compact strings
thartmann
parents:
35552
diff
changeset
|
1470 |
kit.inflate_string(src, dst, TypeAryPtr::BYTES, __ value(count)); |
33628 | 1471 |
} else { |
1472 |
// No intrinsic available, use slow method |
|
1473 |
kit.inflate_string_slow(src_array, dst_array, start, __ value(count)); |
|
1474 |
} |
|
1475 |
ideal.sync_kit(&kit); |
|
1476 |
// Multiply count by two since we now need two bytes per char |
|
1477 |
__ set(count, __ LShiftI(__ value(count), __ ConI(1))); |
|
1478 |
} |
|
1479 |
if (!dcon) { |
|
1480 |
__ end_if(); |
|
1481 |
} |
|
1482 |
} |
|
1483 |
||
1484 |
// Read two bytes from index and index+1 and convert them to a char |
|
1485 |
static jchar readChar(ciTypeArray* array, int index) { |
|
1486 |
int shift_high, shift_low; |
|
1487 |
#ifdef VM_LITTLE_ENDIAN |
|
1488 |
shift_high = 0; |
|
1489 |
shift_low = 8; |
|
1490 |
#else |
|
1491 |
shift_high = 8; |
|
1492 |
shift_low = 0; |
|
1493 |
#endif |
|
1494 |
||
1495 |
jchar b1 = ((jchar) array->byte_at(index)) & 0xff; |
|
1496 |
jchar b2 = ((jchar) array->byte_at(index+1)) & 0xff; |
|
1497 |
return (b1 << shift_high) | (b2 << shift_low); |
|
1498 |
} |
|
1499 |
||
1500 |
// Copy contents of constant src_array to dst_array by emitting individual stores |
|
1501 |
void PhaseStringOpts::copy_constant_string(GraphKit& kit, IdealKit& ideal, ciTypeArray* src_array, IdealVariable& count, |
|
1502 |
bool src_is_byte, Node* dst_array, Node* dst_coder, Node* start) { |
|
1503 |
bool dcon = dst_coder->is_Con(); |
|
1504 |
bool dbyte = dcon ? (dst_coder->get_int() == java_lang_String::CODER_LATIN1) : false; |
|
1505 |
int length = src_array->length(); |
|
1506 |
||
1507 |
if (!dcon) { |
|
1508 |
__ if_then(dst_coder, BoolTest::eq, __ ConI(java_lang_String::CODER_LATIN1)); |
|
1509 |
} |
|
1510 |
if (!dcon || dbyte) { |
|
1511 |
// Destination is Latin1. Copy each byte of src_array into dst_array. |
|
1512 |
Node* index = start; |
|
1513 |
for (int i = 0; i < length; i++) { |
|
1514 |
Node* adr = kit.array_element_address(dst_array, index, T_BYTE); |
|
1515 |
Node* val = __ ConI(src_array->byte_at(i)); |
|
1516 |
__ store(__ ctrl(), adr, val, T_BYTE, byte_adr_idx, MemNode::unordered); |
|
1517 |
index = __ AddI(index, __ ConI(1)); |
|
1518 |
} |
|
1519 |
} |
|
1520 |
if (!dcon) { |
|
1521 |
__ else_(); |
|
1522 |
} |
|
1523 |
if (!dcon || !dbyte) { |
|
1524 |
// Destination is UTF16. Copy each char of src_array into dst_array. |
|
1525 |
Node* index = start; |
|
1526 |
for (int i = 0; i < length; i++) { |
|
1527 |
Node* adr = kit.array_element_address(dst_array, index, T_BYTE); |
|
1528 |
jchar val; |
|
1529 |
if (src_is_byte) { |
|
33636
58b6bcd2ecac
8141443: jdk/test/java/util/regex/RegExTest.java fails: No match found
thartmann
parents:
33628
diff
changeset
|
1530 |
val = src_array->byte_at(i) & 0xff; |
33628 | 1531 |
} else { |
1532 |
val = readChar(src_array, i++); |
|
1533 |
} |
|
34204
5ad1ba3afecc
8140390: Char stores/loads accessing byte arrays must be marked as unmatched
thartmann
parents:
33636
diff
changeset
|
1534 |
__ store(__ ctrl(), adr, __ ConI(val), T_CHAR, byte_adr_idx, MemNode::unordered, true /* mismatched */); |
33628 | 1535 |
index = __ AddI(index, __ ConI(2)); |
1536 |
} |
|
1537 |
if (src_is_byte) { |
|
1538 |
// Multiply count by two since we now need two bytes per char |
|
1539 |
__ set(count, __ ConI(2 * length)); |
|
1540 |
} |
|
1541 |
} |
|
1542 |
if (!dcon) { |
|
1543 |
__ end_if(); |
|
1544 |
} |
|
1545 |
} |
|
1546 |
||
1547 |
// Compress copy contents of the byte/char String str into dst_array starting at index start. |
|
1548 |
Node* PhaseStringOpts::copy_string(GraphKit& kit, Node* str, Node* dst_array, Node* dst_coder, Node* start) { |
|
1549 |
Node* src_array = kit.load_String_value(kit.control(), str); |
|
1550 |
||
1551 |
IdealKit ideal(&kit, true, true); |
|
1552 |
IdealVariable count(ideal); __ declarations_done(); |
|
1553 |
||
1554 |
if (str->is_Con()) { |
|
1555 |
// Constant source string |
|
36077
fa6d92de1c70
8149813: Move trusted final field handling from C2 LoadNode::Value to shared code
shade
parents:
35573
diff
changeset
|
1556 |
ciTypeArray* src_array_type = get_constant_value(kit, str); |
33628 | 1557 |
|
1558 |
// Check encoding of constant string |
|
1559 |
bool src_is_byte = (get_constant_coder(kit, str) == java_lang_String::CODER_LATIN1); |
|
1560 |
||
4450 | 1561 |
// For small constant strings just emit individual stores. |
1562 |
// A length of 6 seems like a good space/speed tradeof. |
|
33628 | 1563 |
__ set(count, __ ConI(src_array_type->length())); |
1564 |
int src_len = src_array_type->length() / (src_is_byte ? 1 : 2); |
|
1565 |
if (src_len < unroll_string_copy_length) { |
|
1566 |
// Small constant string |
|
1567 |
copy_constant_string(kit, ideal, src_array_type, count, src_is_byte, dst_array, dst_coder, start); |
|
1568 |
} else if (src_is_byte) { |
|
1569 |
// Source is Latin1 |
|
1570 |
copy_latin1_string(kit, ideal, src_array, count, dst_array, dst_coder, start); |
|
1571 |
} else { |
|
1572 |
// Source is UTF16 (destination too). Simply emit a char arraycopy. |
|
1573 |
arraycopy(kit, ideal, src_array, dst_array, T_CHAR, start, __ value(count)); |
|
4450 | 1574 |
} |
1575 |
} else { |
|
33628 | 1576 |
Node* size = kit.load_array_length(src_array); |
1577 |
__ set(count, size); |
|
1578 |
// Non-constant source string |
|
1579 |
if (CompactStrings) { |
|
1580 |
// Emit runtime check for coder |
|
1581 |
Node* coder = kit.load_String_coder(__ ctrl(), str); |
|
1582 |
__ if_then(coder, BoolTest::eq, __ ConI(java_lang_String::CODER_LATIN1)); { |
|
1583 |
// Source is Latin1 |
|
1584 |
copy_latin1_string(kit, ideal, src_array, count, dst_array, dst_coder, start); |
|
1585 |
} __ else_(); |
|
1586 |
} |
|
1587 |
// Source is UTF16 (destination too). Simply emit a char arraycopy. |
|
1588 |
arraycopy(kit, ideal, src_array, dst_array, T_CHAR, start, __ value(count)); |
|
1589 |
||
1590 |
if (CompactStrings) { |
|
1591 |
__ end_if(); |
|
1592 |
} |
|
4450 | 1593 |
} |
33628 | 1594 |
|
1595 |
// Finally sync IdealKit and GraphKit. |
|
1596 |
kit.sync_kit(ideal); |
|
1597 |
return __ AddI(start, __ value(count)); |
|
4450 | 1598 |
} |
1599 |
||
33628 | 1600 |
// Compress copy the char into dst_array at index start. |
1601 |
Node* PhaseStringOpts::copy_char(GraphKit& kit, Node* val, Node* dst_array, Node* dst_coder, Node* start) { |
|
1602 |
bool dcon = (dst_coder != NULL) && dst_coder->is_Con(); |
|
1603 |
bool dbyte = dcon ? (dst_coder->get_int() == java_lang_String::CODER_LATIN1) : false; |
|
1604 |
||
1605 |
IdealKit ideal(&kit, true, true); |
|
1606 |
IdealVariable end(ideal); __ declarations_done(); |
|
1607 |
Node* adr = kit.array_element_address(dst_array, start, T_BYTE); |
|
1608 |
if (!dcon){ |
|
1609 |
__ if_then(dst_coder, BoolTest::eq, __ ConI(java_lang_String::CODER_LATIN1)); |
|
1610 |
} |
|
1611 |
if (!dcon || dbyte) { |
|
1612 |
// Destination is Latin1. Store a byte. |
|
1613 |
__ store(__ ctrl(), adr, val, T_BYTE, byte_adr_idx, MemNode::unordered); |
|
1614 |
__ set(end, __ AddI(start, __ ConI(1))); |
|
1615 |
} |
|
1616 |
if (!dcon) { |
|
1617 |
__ else_(); |
|
1618 |
} |
|
1619 |
if (!dcon || !dbyte) { |
|
1620 |
// Destination is UTF16. Store a char. |
|
34204
5ad1ba3afecc
8140390: Char stores/loads accessing byte arrays must be marked as unmatched
thartmann
parents:
33636
diff
changeset
|
1621 |
__ store(__ ctrl(), adr, val, T_CHAR, byte_adr_idx, MemNode::unordered, true /* mismatched */); |
33628 | 1622 |
__ set(end, __ AddI(start, __ ConI(2))); |
1623 |
} |
|
1624 |
if (!dcon) { |
|
1625 |
__ end_if(); |
|
1626 |
} |
|
1627 |
// Finally sync IdealKit and GraphKit. |
|
1628 |
kit.sync_kit(ideal); |
|
1629 |
return __ value(end); |
|
1630 |
} |
|
1631 |
||
1632 |
#undef __ |
|
1633 |
#define __ kit. |
|
1634 |
||
1635 |
// Allocate a byte array of specified length. |
|
1636 |
Node* PhaseStringOpts::allocate_byte_array(GraphKit& kit, IdealKit* ideal, Node* length) { |
|
1637 |
if (ideal != NULL) { |
|
1638 |
// Sync IdealKit and graphKit. |
|
1639 |
kit.sync_kit(*ideal); |
|
1640 |
} |
|
1641 |
Node* byte_array = NULL; |
|
1642 |
{ |
|
1643 |
PreserveReexecuteState preexecs(&kit); |
|
1644 |
// The original jvms is for an allocation of either a String or |
|
1645 |
// StringBuffer so no stack adjustment is necessary for proper |
|
1646 |
// reexecution. If we deoptimize in the slow path the bytecode |
|
1647 |
// will be reexecuted and the char[] allocation will be thrown away. |
|
1648 |
kit.jvms()->set_should_reexecute(true); |
|
1649 |
byte_array = kit.new_array(__ makecon(TypeKlassPtr::make(ciTypeArrayKlass::make(T_BYTE))), |
|
1650 |
length, 1); |
|
1651 |
} |
|
1652 |
||
1653 |
// Mark the allocation so that zeroing is skipped since the code |
|
1654 |
// below will overwrite the entire array |
|
1655 |
AllocateArrayNode* byte_alloc = AllocateArrayNode::Ideal_array_allocation(byte_array, _gvn); |
|
1656 |
byte_alloc->maybe_set_complete(_gvn); |
|
1657 |
||
1658 |
if (ideal != NULL) { |
|
1659 |
// Sync IdealKit and graphKit. |
|
1660 |
ideal->sync_kit(&kit); |
|
1661 |
} |
|
1662 |
return byte_array; |
|
1663 |
} |
|
1664 |
||
1665 |
jbyte PhaseStringOpts::get_constant_coder(GraphKit& kit, Node* str) { |
|
1666 |
assert(str->is_Con(), "String must be constant"); |
|
1667 |
const TypeOopPtr* str_type = kit.gvn().type(str)->isa_oopptr(); |
|
1668 |
ciInstance* str_instance = str_type->const_oop()->as_instance(); |
|
1669 |
jbyte coder = str_instance->field_value_by_offset(java_lang_String::coder_offset_in_bytes()).as_byte(); |
|
1670 |
assert(CompactStrings || (coder == java_lang_String::CODER_UTF16), "Strings must be UTF16 encoded"); |
|
1671 |
return coder; |
|
1672 |
} |
|
1673 |
||
1674 |
int PhaseStringOpts::get_constant_length(GraphKit& kit, Node* str) { |
|
1675 |
assert(str->is_Con(), "String must be constant"); |
|
36077
fa6d92de1c70
8149813: Move trusted final field handling from C2 LoadNode::Value to shared code
shade
parents:
35573
diff
changeset
|
1676 |
return get_constant_value(kit, str)->length(); |
fa6d92de1c70
8149813: Move trusted final field handling from C2 LoadNode::Value to shared code
shade
parents:
35573
diff
changeset
|
1677 |
} |
fa6d92de1c70
8149813: Move trusted final field handling from C2 LoadNode::Value to shared code
shade
parents:
35573
diff
changeset
|
1678 |
|
fa6d92de1c70
8149813: Move trusted final field handling from C2 LoadNode::Value to shared code
shade
parents:
35573
diff
changeset
|
1679 |
ciTypeArray* PhaseStringOpts::get_constant_value(GraphKit& kit, Node* str) { |
fa6d92de1c70
8149813: Move trusted final field handling from C2 LoadNode::Value to shared code
shade
parents:
35573
diff
changeset
|
1680 |
assert(str->is_Con(), "String must be constant"); |
fa6d92de1c70
8149813: Move trusted final field handling from C2 LoadNode::Value to shared code
shade
parents:
35573
diff
changeset
|
1681 |
const TypeOopPtr* str_type = kit.gvn().type(str)->isa_oopptr(); |
fa6d92de1c70
8149813: Move trusted final field handling from C2 LoadNode::Value to shared code
shade
parents:
35573
diff
changeset
|
1682 |
ciInstance* str_instance = str_type->const_oop()->as_instance(); |
fa6d92de1c70
8149813: Move trusted final field handling from C2 LoadNode::Value to shared code
shade
parents:
35573
diff
changeset
|
1683 |
ciObject* src_array = str_instance->field_value_by_offset(java_lang_String::value_offset_in_bytes()).as_object(); |
fa6d92de1c70
8149813: Move trusted final field handling from C2 LoadNode::Value to shared code
shade
parents:
35573
diff
changeset
|
1684 |
return src_array->as_type_array(); |
33628 | 1685 |
} |
4450 | 1686 |
|
1687 |
void PhaseStringOpts::replace_string_concat(StringConcat* sc) { |
|
1688 |
// Log a little info about the transformation |
|
1689 |
sc->maybe_log_transform(); |
|
1690 |
||
1691 |
// pull the JVMState of the allocation into a SafePointNode to serve as |
|
1692 |
// as a shim for the insertion of the new code. |
|
1693 |
JVMState* jvms = sc->begin()->jvms()->clone_shallow(C); |
|
1694 |
uint size = sc->begin()->req(); |
|
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
22845
diff
changeset
|
1695 |
SafePointNode* map = new SafePointNode(size, jvms); |
4450 | 1696 |
|
1697 |
// copy the control and memory state from the final call into our |
|
1698 |
// new starting state. This allows any preceeding tests to feed |
|
1699 |
// into the new section of code. |
|
1700 |
for (uint i1 = 0; i1 < TypeFunc::Parms; i1++) { |
|
1701 |
map->init_req(i1, sc->end()->in(i1)); |
|
1702 |
} |
|
1703 |
// blow away old allocation arguments |
|
1704 |
for (uint i1 = TypeFunc::Parms; i1 < jvms->debug_start(); i1++) { |
|
1705 |
map->init_req(i1, C->top()); |
|
1706 |
} |
|
1707 |
// Copy the rest of the inputs for the JVMState |
|
1708 |
for (uint i1 = jvms->debug_start(); i1 < sc->begin()->req(); i1++) { |
|
1709 |
map->init_req(i1, sc->begin()->in(i1)); |
|
1710 |
} |
|
1711 |
// Make sure the memory state is a MergeMem for parsing. |
|
1712 |
if (!map->in(TypeFunc::Memory)->is_MergeMem()) { |
|
25930 | 1713 |
map->set_req(TypeFunc::Memory, MergeMemNode::make(map->in(TypeFunc::Memory))); |
4450 | 1714 |
} |
1715 |
||
1716 |
jvms->set_map(map); |
|
1717 |
map->ensure_stack(jvms, jvms->method()->max_stack()); |
|
1718 |
||
1719 |
// disconnect all the old StringBuilder calls from the graph |
|
1720 |
sc->eliminate_unneeded_control(); |
|
1721 |
||
1722 |
// At this point all the old work has been completely removed from |
|
1723 |
// the graph and the saved JVMState exists at the point where the |
|
1724 |
// final toString call used to be. |
|
1725 |
GraphKit kit(jvms); |
|
1726 |
||
1727 |
// There may be uncommon traps which are still using the |
|
1728 |
// intermediate states and these need to be rewritten to point at |
|
1729 |
// the JVMState at the beginning of the transformation. |
|
1730 |
sc->convert_uncommon_traps(kit, jvms); |
|
1731 |
||
1732 |
// Now insert the logic to compute the size of the string followed |
|
1733 |
// by all the logic to construct array and resulting string. |
|
1734 |
||
1735 |
Node* null_string = __ makecon(TypeInstPtr::make(C->env()->the_null_string())); |
|
1736 |
||
1737 |
// Create a region for the overflow checks to merge into. |
|
1738 |
int args = MAX2(sc->num_arguments(), 1); |
|
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
22845
diff
changeset
|
1739 |
RegionNode* overflow = new RegionNode(args); |
4450 | 1740 |
kit.gvn().set_type(overflow, Type::CONTROL); |
1741 |
||
1742 |
// Create a hook node to hold onto the individual sizes since they |
|
1743 |
// are need for the copying phase. |
|
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
22845
diff
changeset
|
1744 |
Node* string_sizes = new Node(args); |
4450 | 1745 |
|
33628 | 1746 |
Node* coder = __ intcon(0); |
4450 | 1747 |
Node* length = __ intcon(0); |
33628 | 1748 |
// If at least one argument is UTF16 encoded, we can fix the encoding. |
1749 |
bool coder_fixed = false; |
|
1750 |
||
1751 |
if (!CompactStrings) { |
|
1752 |
// Fix encoding of result string to UTF16 |
|
1753 |
coder_fixed = true; |
|
1754 |
coder = __ intcon(java_lang_String::CODER_UTF16); |
|
1755 |
} |
|
1756 |
||
4450 | 1757 |
for (int argi = 0; argi < sc->num_arguments(); argi++) { |
1758 |
Node* arg = sc->argument(argi); |
|
1759 |
switch (sc->mode(argi)) { |
|
1760 |
case StringConcat::IntMode: { |
|
1761 |
Node* string_size = int_stringSize(kit, arg); |
|
1762 |
||
1763 |
// accumulate total |
|
1764 |
length = __ AddI(length, string_size); |
|
1765 |
||
1766 |
// Cache this value for the use by int_toString |
|
1767 |
string_sizes->init_req(argi, string_size); |
|
1768 |
break; |
|
1769 |
} |
|
7714
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
1770 |
case StringConcat::StringNullCheckMode: { |
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
1771 |
const Type* type = kit.gvn().type(arg); |
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
1772 |
assert(type != TypePtr::NULL_PTR, "missing check"); |
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
1773 |
if (!type->higher_equal(TypeInstPtr::NOTNULL)) { |
33628 | 1774 |
// Null check with uncommon trap since |
7714
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
1775 |
// StringBuilder(null) throws exception. |
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
1776 |
// Use special uncommon trap instead of |
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
1777 |
// calling normal do_null_check(). |
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
1778 |
Node* p = __ Bool(__ CmpP(arg, kit.null()), BoolTest::ne); |
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
1779 |
IfNode* iff = kit.create_and_map_if(kit.control(), p, PROB_MIN, COUNT_UNKNOWN); |
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
1780 |
overflow->add_req(__ IfFalse(iff)); |
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
1781 |
Node* notnull = __ IfTrue(iff); |
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
1782 |
kit.set_control(notnull); // set control for the cast_not_null |
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
1783 |
arg = kit.cast_not_null(arg, false); |
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
1784 |
sc->set_argument(argi, arg); |
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
1785 |
} |
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
1786 |
assert(kit.gvn().type(arg)->higher_equal(TypeInstPtr::NOTNULL), "sanity"); |
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
1787 |
// Fallthrough to add string length. |
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
1788 |
} |
4450 | 1789 |
case StringConcat::StringMode: { |
1790 |
const Type* type = kit.gvn().type(arg); |
|
28642
a42fefc69922
8068909: SIGSEGV in c2 compiled code with OptimizeStringConcat
asiebenborn
parents:
25930
diff
changeset
|
1791 |
Node* count = NULL; |
33628 | 1792 |
Node* arg_coder = NULL; |
4450 | 1793 |
if (type == TypePtr::NULL_PTR) { |
1794 |
// replace the argument with the null checked version |
|
1795 |
arg = null_string; |
|
1796 |
sc->set_argument(argi, arg); |
|
28642
a42fefc69922
8068909: SIGSEGV in c2 compiled code with OptimizeStringConcat
asiebenborn
parents:
25930
diff
changeset
|
1797 |
count = kit.load_String_length(kit.control(), arg); |
33628 | 1798 |
arg_coder = kit.load_String_coder(kit.control(), arg); |
4450 | 1799 |
} else if (!type->higher_equal(TypeInstPtr::NOTNULL)) { |
1800 |
// s = s != null ? s : "null"; |
|
1801 |
// length = length + (s.count - s.offset); |
|
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
22845
diff
changeset
|
1802 |
RegionNode *r = new RegionNode(3); |
4450 | 1803 |
kit.gvn().set_type(r, Type::CONTROL); |
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
22845
diff
changeset
|
1804 |
Node *phi = new PhiNode(r, type); |
4450 | 1805 |
kit.gvn().set_type(phi, phi->bottom_type()); |
1806 |
Node* p = __ Bool(__ CmpP(arg, kit.null()), BoolTest::ne); |
|
1807 |
IfNode* iff = kit.create_and_map_if(kit.control(), p, PROB_MIN, COUNT_UNKNOWN); |
|
1808 |
Node* notnull = __ IfTrue(iff); |
|
1809 |
Node* isnull = __ IfFalse(iff); |
|
4891 | 1810 |
kit.set_control(notnull); // set control for the cast_not_null |
4450 | 1811 |
r->init_req(1, notnull); |
4891 | 1812 |
phi->init_req(1, kit.cast_not_null(arg, false)); |
4450 | 1813 |
r->init_req(2, isnull); |
1814 |
phi->init_req(2, null_string); |
|
1815 |
kit.set_control(r); |
|
1816 |
C->record_for_igvn(r); |
|
1817 |
C->record_for_igvn(phi); |
|
1818 |
// replace the argument with the null checked version |
|
1819 |
arg = phi; |
|
1820 |
sc->set_argument(argi, arg); |
|
28642
a42fefc69922
8068909: SIGSEGV in c2 compiled code with OptimizeStringConcat
asiebenborn
parents:
25930
diff
changeset
|
1821 |
count = kit.load_String_length(kit.control(), arg); |
33628 | 1822 |
arg_coder = kit.load_String_coder(kit.control(), arg); |
28642
a42fefc69922
8068909: SIGSEGV in c2 compiled code with OptimizeStringConcat
asiebenborn
parents:
25930
diff
changeset
|
1823 |
} else { |
a42fefc69922
8068909: SIGSEGV in c2 compiled code with OptimizeStringConcat
asiebenborn
parents:
25930
diff
changeset
|
1824 |
// A corresponding nullcheck will be connected during IGVN MemNode::Ideal_common_DU_postCCP |
a42fefc69922
8068909: SIGSEGV in c2 compiled code with OptimizeStringConcat
asiebenborn
parents:
25930
diff
changeset
|
1825 |
// kit.control might be a different test, that can be hoisted above the actual nullcheck |
a42fefc69922
8068909: SIGSEGV in c2 compiled code with OptimizeStringConcat
asiebenborn
parents:
25930
diff
changeset
|
1826 |
// in case, that the control input is not null, Ideal_common_DU_postCCP will not look for a nullcheck. |
a42fefc69922
8068909: SIGSEGV in c2 compiled code with OptimizeStringConcat
asiebenborn
parents:
25930
diff
changeset
|
1827 |
count = kit.load_String_length(NULL, arg); |
33628 | 1828 |
arg_coder = kit.load_String_coder(NULL, arg); |
1829 |
} |
|
1830 |
if (arg->is_Con()) { |
|
1831 |
// Constant string. Get constant coder and length. |
|
1832 |
jbyte const_coder = get_constant_coder(kit, arg); |
|
1833 |
int const_length = get_constant_length(kit, arg); |
|
1834 |
if (const_coder == java_lang_String::CODER_LATIN1) { |
|
1835 |
// Can be latin1 encoded |
|
1836 |
arg_coder = __ intcon(const_coder); |
|
1837 |
count = __ intcon(const_length); |
|
1838 |
} else { |
|
1839 |
// Found UTF16 encoded string. Fix result array encoding to UTF16. |
|
1840 |
coder_fixed = true; |
|
1841 |
coder = __ intcon(const_coder); |
|
1842 |
count = __ intcon(const_length / 2); |
|
1843 |
} |
|
1844 |
} |
|
1845 |
||
1846 |
if (!coder_fixed) { |
|
1847 |
coder = __ OrI(coder, arg_coder); |
|
4450 | 1848 |
} |
1849 |
length = __ AddI(length, count); |
|
1850 |
string_sizes->init_req(argi, NULL); |
|
1851 |
break; |
|
1852 |
} |
|
1853 |
case StringConcat::CharMode: { |
|
1854 |
// one character only |
|
33628 | 1855 |
const TypeInt* t = kit.gvn().type(arg)->is_int(); |
1856 |
if (!coder_fixed && t->is_con()) { |
|
1857 |
// Constant char |
|
1858 |
if (t->get_con() <= 255) { |
|
1859 |
// Can be latin1 encoded |
|
1860 |
coder = __ OrI(coder, __ intcon(java_lang_String::CODER_LATIN1)); |
|
1861 |
} else { |
|
1862 |
// Must be UTF16 encoded. Fix result array encoding to UTF16. |
|
1863 |
coder_fixed = true; |
|
1864 |
coder = __ intcon(java_lang_String::CODER_UTF16); |
|
1865 |
} |
|
1866 |
} else if (!coder_fixed) { |
|
1867 |
// Not constant |
|
1868 |
#undef __ |
|
1869 |
#define __ ideal. |
|
1870 |
IdealKit ideal(&kit, true, true); |
|
1871 |
IdealVariable char_coder(ideal); __ declarations_done(); |
|
1872 |
// Check if character can be latin1 encoded |
|
1873 |
__ if_then(arg, BoolTest::le, __ ConI(0xFF)); |
|
1874 |
__ set(char_coder, __ ConI(java_lang_String::CODER_LATIN1)); |
|
1875 |
__ else_(); |
|
1876 |
__ set(char_coder, __ ConI(java_lang_String::CODER_UTF16)); |
|
1877 |
__ end_if(); |
|
1878 |
kit.sync_kit(ideal); |
|
1879 |
coder = __ OrI(coder, __ value(char_coder)); |
|
1880 |
#undef __ |
|
1881 |
#define __ kit. |
|
1882 |
} |
|
4450 | 1883 |
length = __ AddI(length, __ intcon(1)); |
1884 |
break; |
|
1885 |
} |
|
1886 |
default: |
|
1887 |
ShouldNotReachHere(); |
|
1888 |
} |
|
1889 |
if (argi > 0) { |
|
1890 |
// Check that the sum hasn't overflowed |
|
1891 |
IfNode* iff = kit.create_and_map_if(kit.control(), |
|
1892 |
__ Bool(__ CmpI(length, __ intcon(0)), BoolTest::lt), |
|
1893 |
PROB_MIN, COUNT_UNKNOWN); |
|
1894 |
kit.set_control(__ IfFalse(iff)); |
|
1895 |
overflow->set_req(argi, __ IfTrue(iff)); |
|
1896 |
} |
|
1897 |
} |
|
1898 |
||
1899 |
{ |
|
1900 |
// Hook |
|
1901 |
PreserveJVMState pjvms(&kit); |
|
1902 |
kit.set_control(overflow); |
|
7714
f078cdefa674
7009359: HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
kvn
parents:
7397
diff
changeset
|
1903 |
C->record_for_igvn(overflow); |
4450 | 1904 |
kit.uncommon_trap(Deoptimization::Reason_intrinsic, |
1905 |
Deoptimization::Action_make_not_entrant); |
|
1906 |
} |
|
1907 |
||
14828
bb9dffedf46c
8005031: Some cleanup in c2 to prepare for incremental inlining support
roland
parents:
14623
diff
changeset
|
1908 |
Node* result; |
bb9dffedf46c
8005031: Some cleanup in c2 to prepare for incremental inlining support
roland
parents:
14623
diff
changeset
|
1909 |
if (!kit.stopped()) { |
33628 | 1910 |
assert(CompactStrings || (coder->is_Con() && coder->get_int() == java_lang_String::CODER_UTF16), |
1911 |
"Result string must be UTF16 encoded if CompactStrings is disabled"); |
|
1912 |
||
1913 |
Node* dst_array = NULL; |
|
32467
23b29549f8d1
8076758: new StringBuilder().append(String).toString() should be recognized by OptimizeStringConcat
shade
parents:
29081
diff
changeset
|
1914 |
if (sc->num_arguments() == 1 && |
33628 | 1915 |
(sc->mode(0) == StringConcat::StringMode || |
1916 |
sc->mode(0) == StringConcat::StringNullCheckMode)) { |
|
32467
23b29549f8d1
8076758: new StringBuilder().append(String).toString() should be recognized by OptimizeStringConcat
shade
parents:
29081
diff
changeset
|
1917 |
// Handle the case when there is only a single String argument. |
23b29549f8d1
8076758: new StringBuilder().append(String).toString() should be recognized by OptimizeStringConcat
shade
parents:
29081
diff
changeset
|
1918 |
// In this case, we can just pull the value from the String itself. |
33628 | 1919 |
dst_array = kit.load_String_value(kit.control(), sc->argument(0)); |
32467
23b29549f8d1
8076758: new StringBuilder().append(String).toString() should be recognized by OptimizeStringConcat
shade
parents:
29081
diff
changeset
|
1920 |
} else { |
33628 | 1921 |
// Allocate destination byte array according to coder |
1922 |
dst_array = allocate_byte_array(kit, NULL, __ LShiftI(length, coder)); |
|
14828
bb9dffedf46c
8005031: Some cleanup in c2 to prepare for incremental inlining support
roland
parents:
14623
diff
changeset
|
1923 |
|
33628 | 1924 |
// Now copy the string representations into the final byte[] |
32467
23b29549f8d1
8076758: new StringBuilder().append(String).toString() should be recognized by OptimizeStringConcat
shade
parents:
29081
diff
changeset
|
1925 |
Node* start = __ intcon(0); |
23b29549f8d1
8076758: new StringBuilder().append(String).toString() should be recognized by OptimizeStringConcat
shade
parents:
29081
diff
changeset
|
1926 |
for (int argi = 0; argi < sc->num_arguments(); argi++) { |
23b29549f8d1
8076758: new StringBuilder().append(String).toString() should be recognized by OptimizeStringConcat
shade
parents:
29081
diff
changeset
|
1927 |
Node* arg = sc->argument(argi); |
23b29549f8d1
8076758: new StringBuilder().append(String).toString() should be recognized by OptimizeStringConcat
shade
parents:
29081
diff
changeset
|
1928 |
switch (sc->mode(argi)) { |
23b29549f8d1
8076758: new StringBuilder().append(String).toString() should be recognized by OptimizeStringConcat
shade
parents:
29081
diff
changeset
|
1929 |
case StringConcat::IntMode: { |
33628 | 1930 |
start = int_getChars(kit, arg, dst_array, coder, start, string_sizes->in(argi)); |
32467
23b29549f8d1
8076758: new StringBuilder().append(String).toString() should be recognized by OptimizeStringConcat
shade
parents:
29081
diff
changeset
|
1931 |
break; |
23b29549f8d1
8076758: new StringBuilder().append(String).toString() should be recognized by OptimizeStringConcat
shade
parents:
29081
diff
changeset
|
1932 |
} |
23b29549f8d1
8076758: new StringBuilder().append(String).toString() should be recognized by OptimizeStringConcat
shade
parents:
29081
diff
changeset
|
1933 |
case StringConcat::StringNullCheckMode: |
23b29549f8d1
8076758: new StringBuilder().append(String).toString() should be recognized by OptimizeStringConcat
shade
parents:
29081
diff
changeset
|
1934 |
case StringConcat::StringMode: { |
33628 | 1935 |
start = copy_string(kit, arg, dst_array, coder, start); |
32467
23b29549f8d1
8076758: new StringBuilder().append(String).toString() should be recognized by OptimizeStringConcat
shade
parents:
29081
diff
changeset
|
1936 |
break; |
23b29549f8d1
8076758: new StringBuilder().append(String).toString() should be recognized by OptimizeStringConcat
shade
parents:
29081
diff
changeset
|
1937 |
} |
23b29549f8d1
8076758: new StringBuilder().append(String).toString() should be recognized by OptimizeStringConcat
shade
parents:
29081
diff
changeset
|
1938 |
case StringConcat::CharMode: { |
33628 | 1939 |
start = copy_char(kit, arg, dst_array, coder, start); |
1940 |
break; |
|
32467
23b29549f8d1
8076758: new StringBuilder().append(String).toString() should be recognized by OptimizeStringConcat
shade
parents:
29081
diff
changeset
|
1941 |
} |
23b29549f8d1
8076758: new StringBuilder().append(String).toString() should be recognized by OptimizeStringConcat
shade
parents:
29081
diff
changeset
|
1942 |
default: |
23b29549f8d1
8076758: new StringBuilder().append(String).toString() should be recognized by OptimizeStringConcat
shade
parents:
29081
diff
changeset
|
1943 |
ShouldNotReachHere(); |
14828
bb9dffedf46c
8005031: Some cleanup in c2 to prepare for incremental inlining support
roland
parents:
14623
diff
changeset
|
1944 |
} |
4450 | 1945 |
} |
1946 |
} |
|
1947 |
||
14828
bb9dffedf46c
8005031: Some cleanup in c2 to prepare for incremental inlining support
roland
parents:
14623
diff
changeset
|
1948 |
// If we're not reusing an existing String allocation then allocate one here. |
bb9dffedf46c
8005031: Some cleanup in c2 to prepare for incremental inlining support
roland
parents:
14623
diff
changeset
|
1949 |
result = sc->string_alloc(); |
bb9dffedf46c
8005031: Some cleanup in c2 to prepare for incremental inlining support
roland
parents:
14623
diff
changeset
|
1950 |
if (result == NULL) { |
bb9dffedf46c
8005031: Some cleanup in c2 to prepare for incremental inlining support
roland
parents:
14623
diff
changeset
|
1951 |
PreserveReexecuteState preexecs(&kit); |
bb9dffedf46c
8005031: Some cleanup in c2 to prepare for incremental inlining support
roland
parents:
14623
diff
changeset
|
1952 |
// The original jvms is for an allocation of either a String or |
bb9dffedf46c
8005031: Some cleanup in c2 to prepare for incremental inlining support
roland
parents:
14623
diff
changeset
|
1953 |
// StringBuffer so no stack adjustment is necessary for proper |
bb9dffedf46c
8005031: Some cleanup in c2 to prepare for incremental inlining support
roland
parents:
14623
diff
changeset
|
1954 |
// reexecution. |
bb9dffedf46c
8005031: Some cleanup in c2 to prepare for incremental inlining support
roland
parents:
14623
diff
changeset
|
1955 |
kit.jvms()->set_should_reexecute(true); |
bb9dffedf46c
8005031: Some cleanup in c2 to prepare for incremental inlining support
roland
parents:
14623
diff
changeset
|
1956 |
result = kit.new_instance(__ makecon(TypeKlassPtr::make(C->env()->String_klass()))); |
bb9dffedf46c
8005031: Some cleanup in c2 to prepare for incremental inlining support
roland
parents:
14623
diff
changeset
|
1957 |
} |
bb9dffedf46c
8005031: Some cleanup in c2 to prepare for incremental inlining support
roland
parents:
14623
diff
changeset
|
1958 |
|
33628 | 1959 |
// Initialize the string |
1960 |
kit.store_String_value(kit.control(), result, dst_array); |
|
1961 |
kit.store_String_coder(kit.control(), result, coder); |
|
39418
6b03cc6f758a
8159244: Partially initialized string object created by C2's string concat optimization may escape
thartmann
parents:
38030
diff
changeset
|
1962 |
|
6b03cc6f758a
8159244: Partially initialized string object created by C2's string concat optimization may escape
thartmann
parents:
38030
diff
changeset
|
1963 |
// The value field is final. Emit a barrier here to ensure that the effect |
6b03cc6f758a
8159244: Partially initialized string object created by C2's string concat optimization may escape
thartmann
parents:
38030
diff
changeset
|
1964 |
// of the initialization is committed to memory before any code publishes |
6b03cc6f758a
8159244: Partially initialized string object created by C2's string concat optimization may escape
thartmann
parents:
38030
diff
changeset
|
1965 |
// a reference to the newly constructed object (see Parse::do_exits()). |
6b03cc6f758a
8159244: Partially initialized string object created by C2's string concat optimization may escape
thartmann
parents:
38030
diff
changeset
|
1966 |
assert(AllocateNode::Ideal_allocation(result, _gvn) != NULL, "should be newly allocated"); |
6b03cc6f758a
8159244: Partially initialized string object created by C2's string concat optimization may escape
thartmann
parents:
38030
diff
changeset
|
1967 |
kit.insert_mem_bar(Op_MemBarRelease, result); |
14828
bb9dffedf46c
8005031: Some cleanup in c2 to prepare for incremental inlining support
roland
parents:
14623
diff
changeset
|
1968 |
} else { |
bb9dffedf46c
8005031: Some cleanup in c2 to prepare for incremental inlining support
roland
parents:
14623
diff
changeset
|
1969 |
result = C->top(); |
4450 | 1970 |
} |
1971 |
// hook up the outgoing control and result |
|
1972 |
kit.replace_call(sc->end(), result); |
|
1973 |
||
1974 |
// Unhook any hook nodes |
|
14623
70c4c1be0a14
7092905: C2: Keep track of the number of dead nodes
bharadwaj
parents:
13895
diff
changeset
|
1975 |
string_sizes->disconnect_inputs(NULL, C); |
4450 | 1976 |
sc->cleanup(); |
1977 |
} |