--- a/hotspot/src/share/vm/opto/ifnode.cpp	Wed Aug 13 23:33:33 2014 +0000
+++ b/hotspot/src/share/vm/opto/ifnode.cpp	Wed Aug 13 17:37:11 2014 -0700
@@ -503,7 +503,7 @@
   jint  off = 0;
   if (l->is_top()) {
     return 0;
-  } else if (l->is_Add()) {
+  } else if (l->Opcode() == Op_AddI) {
     if ((off = l->in(1)->find_int_con(0)) != 0) {
       ind = l->in(2);
     } else if ((off = l->in(2)->find_int_con(0)) != 0) {