--- old/src/hotspot/share/opto/parse2.cpp	2018-03-07 15:00:29.320148727 +0100
+++ new/src/hotspot/share/opto/parse2.cpp	2018-03-07 15:00:29.136144482 +0100
@@ -2302,7 +2302,7 @@
     maybe_add_safepoint(iter().get_dest());
     a = pop();
     b = pop();
-    c = _gvn.transform( new CmpPNode(b, a) );
+    c = _gvn.transform(acmp(a, b));
     c = optimize_cmp_with_klass(c);
     do_if(btest, c);
     break;