Mercurial > hg > truffle
diff src/share/vm/oops/methodData.hpp @ 14435:da862781b584
Merge
author | kvn |
---|---|
date | Thu, 21 Nov 2013 12:30:35 -0800 |
parents | 018b357638aa 6e1826d5c23e |
children | fdad2932c73f 62c54fcc0a35 |
line wrap: on
line diff
--- a/src/share/vm/oops/methodData.hpp Wed Nov 20 11:08:09 2013 -0800 +++ b/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; }