8335120: assert(!target->can_be_statically_bound() || target == cha_monomorphic_target) failed

Reviewed-by: kvn, vlivanov

Author: dean-long

src/hotspot/share/c1/c1_GraphBuilder.cpp

@@ -2116,7 +2116,7 @@ void GraphBuilder::invoke(Bytecodes::Code code) {
   }
 
   if (cha_monomorphic_target != nullptr) {
-    assert(!target->can_be_statically_bound() || target == cha_monomorphic_target, "");
+    assert(!target->can_be_statically_bound() || target->equals(cha_monomorphic_target), "");
     assert(!cha_monomorphic_target->is_abstract(), "");
     if (!cha_monomorphic_target->can_be_statically_bound(actual_recv)) {
       // If we inlined because CHA revealed only a single target method,

src/hotspot/share/ci/ciMethod.cpp

@@ -781,6 +781,22 @@ bool ciMethod::can_omit_stack_trace() const {
   return _can_omit_stack_trace;
 }
 
+// ------------------------------------------------------------------
+// ciMethod::equals
+//
+// Returns true if the methods are the same, taking redefined methods
+// into account.
+bool ciMethod::equals(const ciMethod* m) const {
+  if (this == m) return true;
+  VM_ENTRY_MARK;
+  Method* m1 = this->get_Method();
+  Method* m2 = m->get_Method();
+  if (m1->is_old()) m1 = m1->get_new_method();
+  if (m2->is_old()) m2 = m2->get_new_method();
+  return m1 == m2;
+}
+
+
 // ------------------------------------------------------------------
 // ciMethod::resolve_invoke
 //

src/hotspot/share/ci/ciMethod.hpp

@@ -366,6 +366,8 @@ class ciMethod : public ciMetadata {
 
   bool can_omit_stack_trace() const;
 
+  bool equals(const ciMethod* m) const;
+
   // Replay data methods
   static void dump_name_as_ascii(outputStream* st, Method* method);
   void dump_name_as_ascii(outputStream* st);