archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-23 20:44:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Aleksey Shipilev 2016-02-10 16:31:17 +00:00
commit 381b9a329d
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hotspot/src/share/vm/c1/c1_Canonicalizer.cpp
View file

@ -730,7 +730,7 @@ void Canonicalizer::do_If(If* x) {
} }
} else if (rt == objectNull && } else if (rt == objectNull &&
(l->as_NewInstance() || l->as_NewArray() || (l->as_NewInstance() || l->as_NewArray() ||
(UseNewCode && l->as_Local() && l->as_Local()->is_receiver()))) { (l->as_Local() && l->as_Local()->is_receiver()))) {
if (x->cond() == Instruction::eql) { if (x->cond() == Instruction::eql) {
BlockBegin* sux = x->fsux(); BlockBegin* sux = x->fsux();
set_canonical(new Goto(sux, x->state_before(), is_safepoint(x, sux))); set_canonical(new Goto(sux, x->state_before(), is_safepoint(x, sux)));