Mercurial > hg > graal-jvmci-8

diff src/share/vm/oops/methodData.hpp @ 13080:6e1826d5c23e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8027572: assert(r != 0) failed: invalid Summary: null classes should be expected in profiles with conflicts Reviewed-by: kvn, iveresov
author roland
date Wed, 13 Nov 2013 13:45:50 +0100
parents 5ccbab1c69f3
children 096c224171c4 da862781b584 b8413a9cbb84
line wrap: on
line diff
--- a/src/share/vm/oops/methodData.hpp	Wed Nov 13 01:50:14 2013 -0800
+++ b/src/share/vm/oops/methodData.hpp	Wed Nov 13 13:45:50 2013 +0100
@@ -690,7 +690,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;
   }
 
@@ -698,7 +697,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;
     }