Mercurial > hg > graal-compiler
comparison src/share/vm/oops/klass.cpp @ 3464:be4ca325525a
Merge.
author | Thomas Wuerthinger <thomas@wuerthinger.net> |
---|---|
date | Wed, 27 Jul 2011 17:32:44 -0700 |
parents | 75a99b4f1c98 8ce625481709 |
children | 33df1aeaebbf |
comparison
equal
deleted
inserted
replaced
3239:7c4b4daac19b | 3464:be4ca325525a |
---|---|
452 instanceKlass* ik = (instanceKlass*)this; | 452 instanceKlass* ik = (instanceKlass*)this; |
453 if (ik->is_linked()) { | 453 if (ik->is_linked()) { |
454 ik->unlink_class(); | 454 ik->unlink_class(); |
455 } | 455 } |
456 } | 456 } |
457 // Clear the Java vtable if the oop has one. | |
458 // The vtable isn't shareable because it's in the wrong order wrt the methods | |
459 // once the method names get moved and resorted. | |
460 klassVtable* vt = vtable(); | |
461 if (vt != NULL) { | |
462 assert(oop_is_instance() || oop_is_array(), "nothing else has vtable"); | |
463 vt->clear_vtable(); | |
464 } | |
457 set_subklass(NULL); | 465 set_subklass(NULL); |
458 set_next_sibling(NULL); | 466 set_next_sibling(NULL); |
459 } | 467 } |
460 | 468 |
461 | 469 |