src/share/vm/oops/compiledICHolder.hpp

*** 1,7 ****
  /*
!  * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 24,33 ****
--- 24,35 ----
  
  #ifndef SHARE_VM_OOPS_COMPILEDICHOLDEROOP_HPP
  #define SHARE_VM_OOPS_COMPILEDICHOLDEROOP_HPP
  
  #include "oops/oop.hpp"
+ #include "oops/klass.hpp"
+ #include "oops/method.hpp"
  
  // A CompiledICHolder* is a helper object for the inline cache implementation.
  // It holds:
  //   (1) (method+klass pair) when converting from compiled to an interpreted call
  //   (2) (klass+klass pair) when calling itable stub from megamorphic compiled call
*** 46,60 ****
                                                 // reachable by iterating over nmethods
  
    Metadata* _holder_metadata;
    Klass*    _holder_klass;    // to avoid name conflict with oopDesc::_klass
    CompiledICHolder* _next;
  
   public:
    // Constructor
!   CompiledICHolder(Metadata* metadata, Klass* klass)
!       : _holder_metadata(metadata), _holder_klass(klass) {
  #ifdef ASSERT
      Atomic::inc(&_live_count);
      Atomic::inc(&_live_not_claimed_count);
  #endif
    }
--- 48,63 ----
                                                 // reachable by iterating over nmethods
  
    Metadata* _holder_metadata;
    Klass*    _holder_klass;    // to avoid name conflict with oopDesc::_klass
    CompiledICHolder* _next;
+   bool _is_metadata_method;
  
   public:
    // Constructor
!   CompiledICHolder(Metadata* metadata, Klass* klass, bool is_method = true)
!       : _holder_metadata(metadata), _holder_klass(klass), _is_metadata_method(is_method) {
  #ifdef ASSERT
      Atomic::inc(&_live_count);
      Atomic::inc(&_live_not_claimed_count);
  #endif
    }
*** 80,90 ****
    static int holder_klass_offset()    { return offset_of(CompiledICHolder, _holder_klass); }
  
    CompiledICHolder* next()     { return _next; }
    void set_next(CompiledICHolder* n) { _next = n; }
  
!   bool is_loader_alive(BoolObjectClosure* is_alive);
  
    // Verify
    void verify_on(outputStream* st);
  
    // Printing
--- 83,102 ----
    static int holder_klass_offset()    { return offset_of(CompiledICHolder, _holder_klass); }
  
    CompiledICHolder* next()     { return _next; }
    void set_next(CompiledICHolder* n) { _next = n; }
  
!   inline bool is_loader_alive(BoolObjectClosure* is_alive) {
!     Klass* k = _is_metadata_method ? ((Method*)_holder_metadata)->method_holder() : (Klass*)_holder_metadata;
!     if (!k->is_loader_alive(is_alive)) {
!       return false;
!     }
!     if (!_holder_klass->is_loader_alive(is_alive)) {
!       return false;
!     }
!     return true;
!   }
  
    // Verify
    void verify_on(outputStream* st);
  
    // Printing