# HG changeset patch # User coleenp # Date 1307038668 14400 # Node ID 9dd6c4ba364fd88841763b62cd2d29f8e6a15c67 # Parent d3b9f2be46ab10d89d481c3fcaf976dc76ae99dc 7049928: VM crashes with "assert(_adapter != NULL) failed: must have" at methodOop.cpp:63 Summary: Removed extra change from another bug fix that caused this regression Reviewed-by: phh, dcubed, kvn, kamg, never diff -r d3b9f2be46ab -r 9dd6c4ba364f src/share/vm/oops/methodOop.cpp --- a/src/share/vm/oops/methodOop.cpp Sat May 21 15:39:54 2011 -0700 +++ b/src/share/vm/oops/methodOop.cpp Thu Jun 02 14:17:48 2011 -0400 @@ -720,7 +720,7 @@ // called from the vtable. We need adapters on such methods that get loaded // later. Ditto for mega-morphic itable calls. If this proves to be a // problem we'll make these lazily later. - if (UseCompiler) (void) make_adapters(h_method, CHECK); + (void) make_adapters(h_method, CHECK); // ONLY USE the h_method now as make_adapter may have blocked