From 7419c9549bf5fe80e5ca20e4c4e8db886769fbb0 Mon Sep 17 00:00:00 2001 From: Coleen Phillimore Date: Fri, 3 Jun 2016 08:33:28 -0400 Subject: [PATCH] 8158397: Crash: assert(save_resolved_method == resolved_method()) failed: does this change? Remove assert. it does change. Reviewed-by: sspitsyn, jiangli, mgronlun --- hotspot/src/share/vm/interpreter/linkResolver.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hotspot/src/share/vm/interpreter/linkResolver.cpp b/hotspot/src/share/vm/interpreter/linkResolver.cpp index 808f94a7c54..f0337146a82 100644 --- a/hotspot/src/share/vm/interpreter/linkResolver.cpp +++ b/hotspot/src/share/vm/interpreter/linkResolver.cpp @@ -966,20 +966,18 @@ void LinkResolver::resolve_static_call(CallInfo& result, methodHandle resolved_method = linktime_resolve_static_method(link_info, CHECK); // The resolved class can change as a result of this resolution. - KlassHandle resolved_klass = KlassHandle(THREAD, resolved_method->method_holder()); + KlassHandle resolved_klass(THREAD, resolved_method->method_holder()); - Method* save_resolved_method = resolved_method(); // Initialize klass (this should only happen if everything is ok) if (initialize_class && resolved_klass->should_be_initialized()) { resolved_klass->initialize(CHECK); - // Use updated LinkInfo (to reresolve with resolved_klass as method_holder?) + // Use updated LinkInfo to reresolve with resolved method holder LinkInfo new_info(resolved_klass, link_info.name(), link_info.signature(), link_info.current_klass(), link_info.check_access() ? LinkInfo::needs_access_check : LinkInfo::skip_access_check); resolved_method = linktime_resolve_static_method(new_info, CHECK); } - assert(save_resolved_method == resolved_method(), "does this change?"); // setup result result.set_static(resolved_klass, resolved_method, CHECK); }