src/hotspot/share/code/vtableStubs.cpp

@@ -206,80 +206,84 @@
    check_and_set_size_limit(is_vtable_stub, masm->offset(), slop_bytes);
    s->set_exception_points(npe_addr, ame_addr);
  }
  
  
- address VtableStubs::find_stub(bool is_vtable_stub, int vtable_index) {
+ address VtableStubs::find_stub(bool is_vtable_stub, int vtable_index, bool caller_is_c1) {
    assert(vtable_index >= 0, "must be positive");
  
    VtableStub* s;
    {
      MutexLocker ml(VtableStubs_lock, Mutex::_no_safepoint_check_flag);
-     s = lookup(is_vtable_stub, vtable_index);
+     s = lookup(is_vtable_stub, vtable_index, caller_is_c1);
      if (s == nullptr) {
        if (is_vtable_stub) {
-         s = create_vtable_stub(vtable_index);
+         s = create_vtable_stub(vtable_index, caller_is_c1);
        } else {
-         s = create_itable_stub(vtable_index);
+         s = create_itable_stub(vtable_index, caller_is_c1);
        }
  
        // Creation of vtable or itable can fail if there is not enough free space in the code cache.
        if (s == nullptr) {
          return nullptr;
        }
  
-       enter(is_vtable_stub, vtable_index, s);
+       enter(is_vtable_stub, vtable_index, caller_is_c1, s);
        if (PrintAdapterHandlers) {
-         tty->print_cr("Decoding VtableStub %s[%d]@" PTR_FORMAT " [" PTR_FORMAT ", " PTR_FORMAT "] (" SIZE_FORMAT " bytes)",
+         tty->print_cr("Decoding VtableStub (%s) %s[%d]@" PTR_FORMAT " [" PTR_FORMAT ", " PTR_FORMAT "] (" SIZE_FORMAT " bytes)",
+                       caller_is_c1 ? "c1" : "full opt",
                        is_vtable_stub? "vtbl": "itbl", vtable_index, p2i(VtableStub::receiver_location()),
                        p2i(s->code_begin()), p2i(s->code_end()), pointer_delta(s->code_end(), s->code_begin(), 1));
          Disassembler::decode(s->code_begin(), s->code_end());
        }
        // Notify JVMTI about this stub. The event will be recorded by the enclosing
        // JvmtiDynamicCodeEventCollector and posted when this thread has released
        // all locks. Only post this event if a new state is not required. Creating a new state would
        // cause a safepoint and the caller of this code has a NoSafepointVerifier.
        if (JvmtiExport::should_post_dynamic_code_generated()) {
-         JvmtiExport::post_dynamic_code_generated_while_holding_locks(is_vtable_stub? "vtable stub": "itable stub",
+         JvmtiExport::post_dynamic_code_generated_while_holding_locks(is_vtable_stub? "vtable stub": "itable stub",  // FIXME: need to pass caller_is_c1??
                                                                       s->code_begin(), s->code_end());
        }
      }
    }
    return s->entry_point();
  }
  
  
- inline uint VtableStubs::hash(bool is_vtable_stub, int vtable_index){
+ inline uint VtableStubs::hash(bool is_vtable_stub, int vtable_index, bool caller_is_c1) {
    // Assumption: receiver_location < 4 in most cases.
    int hash = ((vtable_index << 2) ^ VtableStub::receiver_location()->value()) + vtable_index;
+   if (caller_is_c1) {
+     hash = 7 - hash;
+   }
    return (is_vtable_stub ? ~hash : hash)  & mask;
  }
  
  
- VtableStub* VtableStubs::lookup(bool is_vtable_stub, int vtable_index) {
+ VtableStub* VtableStubs::lookup(bool is_vtable_stub, int vtable_index, bool caller_is_c1) {
    assert_lock_strong(VtableStubs_lock);
-   unsigned hash = VtableStubs::hash(is_vtable_stub, vtable_index);
+   unsigned hash = VtableStubs::hash(is_vtable_stub, vtable_index, caller_is_c1);
    VtableStub* s = Atomic::load(&_table[hash]);
-   while( s && !s->matches(is_vtable_stub, vtable_index)) s = s->next();
+   while( s && !s->matches(is_vtable_stub, vtable_index, caller_is_c1)) s = s->next();
    return s;
  }
  
  
- void VtableStubs::enter(bool is_vtable_stub, int vtable_index, VtableStub* s) {
+ void VtableStubs::enter(bool is_vtable_stub, int vtable_index, bool caller_is_c1, VtableStub* s) {
    assert_lock_strong(VtableStubs_lock);
-   assert(s->matches(is_vtable_stub, vtable_index), "bad vtable stub");
-   unsigned int h = VtableStubs::hash(is_vtable_stub, vtable_index);
+   assert(s->matches(is_vtable_stub, vtable_index, caller_is_c1), "bad vtable stub");
+   unsigned int h = VtableStubs::hash(is_vtable_stub, vtable_index, caller_is_c1);
    // Insert s at the beginning of the corresponding list.
    s->set_next(Atomic::load(&_table[h]));
    // Make sure that concurrent readers not taking the mutex observe the writing of "next".
    Atomic::release_store(&_table[h], s);
  }
  
  VtableStub* VtableStubs::entry_point(address pc) {
    MutexLocker ml(VtableStubs_lock, Mutex::_no_safepoint_check_flag);
    VtableStub* stub = (VtableStub*)(pc - VtableStub::entry_offset());
-   uint hash = VtableStubs::hash(stub->is_vtable_stub(), stub->index());
+   uint hash = VtableStubs::hash(stub->is_vtable_stub(), stub->index(), stub->caller_is_c1());
    VtableStub* s;
    for (s = Atomic::load(&_table[hash]); s != nullptr && s != stub; s = s->next()) {}
    return (s == stub) ? s : nullptr;
  }