--- a/hotspot/src/share/vm/opto/parse2.cpp	Tue Mar 31 21:46:44 2015 +0200
+++ b/hotspot/src/share/vm/opto/parse2.cpp	Tue Jul 14 06:44:50 2015 -0700
@@ -1478,8 +1478,10 @@
       }
       assert(constant.basic_type() != T_OBJECT || constant.as_object()->is_instance(),
              "must be java_mirror of klass");
-      bool pushed = push_constant(constant, true);
-      guarantee(pushed, "must be possible to push this constant");
+      const Type* con_type = Type::make_from_constant(constant);
+      if (con_type != NULL) {
+        push_node(con_type->basic_type(), makecon(con_type));
+      }
     }
 
     break;