rev 1083 : [mq]: indy.compiler.inline.patch

          --- old/src/share/vm/ci/ciExceptionHandler.cpp
          +++ new/src/share/vm/ci/ciExceptionHandler.cpp
   1    1  /*
   2      - * Copyright 1999-2003 Sun Microsystems, Inc.  All Rights Reserved.
        2 + * Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
   3    3   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   4    4   *
   5    5   * This code is free software; you can redistribute it and/or modify it
   6    6   * under the terms of the GNU General Public License version 2 only, as
   7    7   * published by the Free Software Foundation.
   8    8   *
   9    9   * This code is distributed in the hope that it will be useful, but WITHOUT
  10   10   * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  11   11   * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  12   12   * version 2 for more details (a copy is included in the LICENSE file that

  13   13   * accompanied this code).
  14   14   *
  15   15   * You should have received a copy of the GNU General Public License version
  16   16   * 2 along with this work; if not, write to the Free Software Foundation,
  17   17   * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  18   18   *
  19   19   * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  20   20   * CA 95054 USA or visit www.sun.com if you need additional information or
  21   21   * have any questions.
  22   22   *
  23   23   */
  24   24  
  25   25  #include "incls/_precompiled.incl"
  26   26  #include "incls/_ciExceptionHandler.cpp.incl"

  27   27  
  28   28  // ciExceptionHandler
  29   29  //
  30   30  // This class represents an exception handler for a method.
  31   31  
  32   32  // ------------------------------------------------------------------
  33   33  // ciExceptionHandler::catch_klass
  34   34  //
  35   35  // Get the exception klass that this handler catches.
  36   36  ciInstanceKlass* ciExceptionHandler::catch_klass() {
       37 +  VM_ENTRY_MARK;
  37   38    assert(!is_catch_all(), "bad index");
  38   39    if (_catch_klass == NULL) {
  39   40      bool will_link;
  40      -    ciKlass* k = CURRENT_ENV->get_klass_by_index(_loading_klass,
       41 +    assert(_loading_klass->get_instanceKlass()->is_linked(), "must be linked before accessing constant pool");
       42 +    constantPoolHandle cpool(_loading_klass->get_instanceKlass()->constants());
       43 +    ciKlass* k = CURRENT_ENV->get_klass_by_index(cpool,
  41   44                                                   _catch_klass_index,
  42      -                                                 will_link);
       45 +                                                 will_link,
       46 +                                                 _loading_klass);
  43   47      if (!will_link && k->is_loaded()) {
  44   48        GUARDED_VM_ENTRY(
  45   49          k = CURRENT_ENV->get_unloaded_klass(_loading_klass, k->name());
  46   50        )
  47   51      }
  48   52      _catch_klass = k->as_instance_klass();
  49   53    }
  50   54    return _catch_klass;
  51   55  }
  52   56  

  53   57  // ------------------------------------------------------------------
  54   58  // ciExceptionHandler::print()
  55   59  void ciExceptionHandler::print() {
  56   60    tty->print("<ciExceptionHandler start=%d limit=%d"
  57   61               " handler_bci=%d ex_klass_index=%d",
  58   62               start(), limit(), handler_bci(), catch_klass_index());
  59   63    if (_catch_klass != NULL) {
  60   64      tty->print(" ex_klass=");
  61   65      _catch_klass->print();
  62   66    }
  63   67    tty->print(">");
  64   68  }

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX