--- a/hotspot/src/share/vm/oops/methodData.hpp	Wed Nov 20 11:08:09 2013 -0800
+++ b/hotspot/src/share/vm/oops/methodData.hpp	Thu Nov 21 12:30:35 2013 -0800
@@ -777,7 +777,6 @@
   // recorded type: cell without bit 0 and 1
   static intptr_t klass_part(intptr_t v) {
     intptr_t r = v & type_klass_mask;
-    assert (r != 0, "invalid");
     return r;
   }
 
@@ -785,7 +784,9 @@
   static Klass* valid_klass(intptr_t k) {
     if (!is_type_none(k) &&
         !is_type_unknown(k)) {
-      return (Klass*)klass_part(k);
+      Klass* res = (Klass*)klass_part(k);
+      assert(res != NULL, "invalid");
+      return res;
     } else {
       return NULL;
     }