Merge
authorshade
Wed, 10 Feb 2016 16:31:17 +0000
changeset 36059 5ae62468859f
parent 36057 867e857daf84 (current diff)
parent 36058 caff909b4e1f (diff)
child 36060 de5c192c2eac
Merge
--- a/hotspot/src/share/vm/c1/c1_Canonicalizer.cpp	Wed Feb 10 15:24:22 2016 +0100
+++ b/hotspot/src/share/vm/c1/c1_Canonicalizer.cpp	Wed Feb 10 16:31:17 2016 +0000
@@ -730,7 +730,7 @@
     }
   } else if (rt == objectNull &&
            (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) {
       BlockBegin* sux = x->fsux();
       set_canonical(new Goto(sux, x->state_before(), is_safepoint(x, sux)));