Mercurial > hg > graal-compiler
comparison 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 |
comparison
equal
deleted
inserted
replaced
8660:d47b52b0ff68 | 8883:b9a918201d47 |
---|---|
800 // A more correct fix would trickle out through many interfaces in CI, | 800 // A more correct fix would trickle out through many interfaces in CI, |
801 // requiring ciInstanceKlass* to become ciKlass* and many more places would | 801 // requiring ciInstanceKlass* to become ciKlass* and many more places would |
802 // require checks to make sure the expected type was found. Given that this | 802 // require checks to make sure the expected type was found. Given that this |
803 // only occurs for clone() the more extensive fix seems like overkill so | 803 // only occurs for clone() the more extensive fix seems like overkill so |
804 // instead we simply smear the array type into Object. | 804 // instead we simply smear the array type into Object. |
805 guarantee(method_holder != NULL, "no method holder"); | |
805 if (method_holder->is_instance_klass()) { | 806 if (method_holder->is_instance_klass()) { |
806 return method_holder->as_instance_klass(); | 807 return method_holder->as_instance_klass(); |
807 } else if (method_holder->is_array_klass()) { | 808 } else if (method_holder->is_array_klass()) { |
808 return current()->Object_klass(); | 809 return current()->Object_klass(); |
809 } else { | 810 } else { |