src/hotspot/share/ci/ciExceptionHandler.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 1999, 2010, 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) 1999, 2019, 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.
*** 39,49 ****
    VM_ENTRY_MARK;
    assert(!is_catch_all(), "bad index");
    if (_catch_klass == NULL) {
      bool will_link;
      assert(_loading_klass->get_instanceKlass()->is_linked(), "must be linked before accessing constant pool");
!     constantPoolHandle cpool(_loading_klass->get_instanceKlass()->constants());
      ciKlass* k = CURRENT_ENV->get_klass_by_index(cpool,
                                                   _catch_klass_index,
                                                   will_link,
                                                   _loading_klass);
      if (!will_link && k->is_loaded()) {
--- 39,49 ----
    VM_ENTRY_MARK;
    assert(!is_catch_all(), "bad index");
    if (_catch_klass == NULL) {
      bool will_link;
      assert(_loading_klass->get_instanceKlass()->is_linked(), "must be linked before accessing constant pool");
!     constantPoolHandle cpool(THREAD, _loading_klass->get_instanceKlass()->constants());
      ciKlass* k = CURRENT_ENV->get_klass_by_index(cpool,
                                                   _catch_klass_index,
                                                   will_link,
                                                   _loading_klass);
      if (!will_link && k->is_loaded()) {