*** old/src/share/vm/oops/methodData.hpp	Wed Nov  6 17:58:27 2013
--- new/src/share/vm/oops/methodData.hpp	Wed Nov  6 17:58:27 2013

*** 688,706 ****
--- 688,707 ----
    }
  
    // 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;
    }
  
    // type recorded
    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;
      }
    }