Mercurial > hg > truffle
diff src/share/vm/ci/ciEnv.cpp @ 8883:b9a918201d47
Merge with hsx25
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Sat, 06 Apr 2013 20:04:06 +0200 |
parents | 5fc51c1ecdeb 2dec1d9bfbe1 |
children | 836a62f43af9 |
line wrap: on
line diff
--- a/src/share/vm/ci/ciEnv.cpp Fri Apr 05 18:53:57 2013 +0200 +++ b/src/share/vm/ci/ciEnv.cpp Sat Apr 06 20:04:06 2013 +0200 @@ -802,6 +802,7 @@ // require checks to make sure the expected type was found. Given that this // only occurs for clone() the more extensive fix seems like overkill so // instead we simply smear the array type into Object. + guarantee(method_holder != NULL, "no method holder"); if (method_holder->is_instance_klass()) { return method_holder->as_instance_klass(); } else if (method_holder->is_array_klass()) {