--- a/src/hotspot/share/opto/loopnode.cpp	Tue Nov 06 10:10:18 2018 -0800
+++ b/src/hotspot/share/opto/loopnode.cpp	Tue Nov 06 23:03:05 2018 +0100
@@ -1750,7 +1750,7 @@
       // disappear it.  In JavaGrande I have a case where this useless
       // Phi is the loop limit and prevents recognizing a CountedLoop
       // which in turn prevents removing an empty loop.
-      Node *id_old_phi = old_phi->Identity( &igvn );
+      Node *id_old_phi = igvn.apply_identity(old_phi);
       if( id_old_phi != old_phi ) { // Found a simple identity?
         // Note that I cannot call 'replace_node' here, because
         // that will yank the edge from old_phi to the Region and