hotspot/src/share/vm/prims/methodComparator.cpp
author jrose
Fri, 28 May 2010 16:23:51 -0700
changeset 5696 93e15b419ad4
parent 5688 9052dc91ea67
child 5697 0cf7190475ee
permissions -rw-r--r--
6957004: MethodComparator uses the wrong CP index accessor Summary: Change two uses of get_index_u2 to get_index_u2_cpcache; also tweak some debugging print functions Reviewed-by: kvn
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
     1
/*
5688
9052dc91ea67 6939207: refactor constant pool index processing
jrose
parents: 3261
diff changeset
     2
 * Copyright 2000-2010 Sun Microsystems, Inc.  All Rights Reserved.
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
489c9b5090e2 Initial load
duke
parents:
diff changeset
     4
 *
489c9b5090e2 Initial load
duke
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
489c9b5090e2 Initial load
duke
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
489c9b5090e2 Initial load
duke
parents:
diff changeset
     7
 * published by the Free Software Foundation.
489c9b5090e2 Initial load
duke
parents:
diff changeset
     8
 *
489c9b5090e2 Initial load
duke
parents:
diff changeset
     9
 * This code is distributed in the hope that it will be useful, but WITHOUT
489c9b5090e2 Initial load
duke
parents:
diff changeset
    10
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
489c9b5090e2 Initial load
duke
parents:
diff changeset
    11
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
489c9b5090e2 Initial load
duke
parents:
diff changeset
    12
 * version 2 for more details (a copy is included in the LICENSE file that
489c9b5090e2 Initial load
duke
parents:
diff changeset
    13
 * accompanied this code).
489c9b5090e2 Initial load
duke
parents:
diff changeset
    14
 *
489c9b5090e2 Initial load
duke
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License version
489c9b5090e2 Initial load
duke
parents:
diff changeset
    16
 * 2 along with this work; if not, write to the Free Software Foundation,
489c9b5090e2 Initial load
duke
parents:
diff changeset
    17
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
489c9b5090e2 Initial load
duke
parents:
diff changeset
    18
 *
489c9b5090e2 Initial load
duke
parents:
diff changeset
    19
 * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
489c9b5090e2 Initial load
duke
parents:
diff changeset
    20
 * CA 95054 USA or visit www.sun.com if you need additional information or
489c9b5090e2 Initial load
duke
parents:
diff changeset
    21
 * have any questions.
489c9b5090e2 Initial load
duke
parents:
diff changeset
    22
 *
489c9b5090e2 Initial load
duke
parents:
diff changeset
    23
 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
    24
489c9b5090e2 Initial load
duke
parents:
diff changeset
    25
# include "incls/_precompiled.incl"
489c9b5090e2 Initial load
duke
parents:
diff changeset
    26
# include "incls/_methodComparator.cpp.incl"
489c9b5090e2 Initial load
duke
parents:
diff changeset
    27
489c9b5090e2 Initial load
duke
parents:
diff changeset
    28
BytecodeStream *MethodComparator::_s_old;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    29
BytecodeStream *MethodComparator::_s_new;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    30
constantPoolOop MethodComparator::_old_cp;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    31
constantPoolOop MethodComparator::_new_cp;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    32
BciMap *MethodComparator::_bci_map;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    33
bool MethodComparator::_switchable_test;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    34
GrowableArray<int> *MethodComparator::_fwd_jmps;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    35
489c9b5090e2 Initial load
duke
parents:
diff changeset
    36
bool MethodComparator::methods_EMCP(methodOop old_method, methodOop new_method) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
    37
  if (old_method->code_size() != new_method->code_size())
489c9b5090e2 Initial load
duke
parents:
diff changeset
    38
    return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    39
  if (check_stack_and_locals_size(old_method, new_method) != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
    40
    // RC_TRACE macro has an embedded ResourceMark
489c9b5090e2 Initial load
duke
parents:
diff changeset
    41
    RC_TRACE(0x00800000, ("Methods %s non-comparable with diagnosis %d",
489c9b5090e2 Initial load
duke
parents:
diff changeset
    42
      old_method->name()->as_C_string(),
489c9b5090e2 Initial load
duke
parents:
diff changeset
    43
      check_stack_and_locals_size(old_method, new_method)));
489c9b5090e2 Initial load
duke
parents:
diff changeset
    44
    return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    45
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
    46
489c9b5090e2 Initial load
duke
parents:
diff changeset
    47
  _old_cp = old_method->constants();
489c9b5090e2 Initial load
duke
parents:
diff changeset
    48
  _new_cp = new_method->constants();
489c9b5090e2 Initial load
duke
parents:
diff changeset
    49
  BytecodeStream s_old(old_method);
489c9b5090e2 Initial load
duke
parents:
diff changeset
    50
  BytecodeStream s_new(new_method);
489c9b5090e2 Initial load
duke
parents:
diff changeset
    51
  _s_old = &s_old;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    52
  _s_new = &s_new;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    53
  _switchable_test = false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    54
  Bytecodes::Code c_old, c_new;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    55
489c9b5090e2 Initial load
duke
parents:
diff changeset
    56
  while ((c_old = s_old.next()) >= 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
    57
    if ((c_new = s_new.next()) < 0 || c_old != c_new)
489c9b5090e2 Initial load
duke
parents:
diff changeset
    58
      return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    59
489c9b5090e2 Initial load
duke
parents:
diff changeset
    60
    if (! args_same(c_old, c_new))
489c9b5090e2 Initial load
duke
parents:
diff changeset
    61
      return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    62
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
    63
  return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    64
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
    65
489c9b5090e2 Initial load
duke
parents:
diff changeset
    66
489c9b5090e2 Initial load
duke
parents:
diff changeset
    67
bool MethodComparator::methods_switchable(methodOop old_method, methodOop new_method,
489c9b5090e2 Initial load
duke
parents:
diff changeset
    68
                                          BciMap &bci_map) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
    69
  if (old_method->code_size() > new_method->code_size())
489c9b5090e2 Initial load
duke
parents:
diff changeset
    70
    // Something has definitely been deleted in the new method, compared to the old one.
489c9b5090e2 Initial load
duke
parents:
diff changeset
    71
    return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    72
489c9b5090e2 Initial load
duke
parents:
diff changeset
    73
  if (! check_stack_and_locals_size(old_method, new_method))
489c9b5090e2 Initial load
duke
parents:
diff changeset
    74
    return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    75
489c9b5090e2 Initial load
duke
parents:
diff changeset
    76
  _old_cp = old_method->constants();
489c9b5090e2 Initial load
duke
parents:
diff changeset
    77
  _new_cp = new_method->constants();
489c9b5090e2 Initial load
duke
parents:
diff changeset
    78
  BytecodeStream s_old(old_method);
489c9b5090e2 Initial load
duke
parents:
diff changeset
    79
  BytecodeStream s_new(new_method);
489c9b5090e2 Initial load
duke
parents:
diff changeset
    80
  _s_old = &s_old;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    81
  _s_new = &s_new;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    82
  _bci_map = &bci_map;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    83
  _switchable_test = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    84
  GrowableArray<int> fwd_jmps(16);
489c9b5090e2 Initial load
duke
parents:
diff changeset
    85
  _fwd_jmps = &fwd_jmps;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    86
  Bytecodes::Code c_old, c_new;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    87
489c9b5090e2 Initial load
duke
parents:
diff changeset
    88
  while ((c_old = s_old.next()) >= 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
    89
    if ((c_new = s_new.next()) < 0)
489c9b5090e2 Initial load
duke
parents:
diff changeset
    90
      return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    91
    if (! (c_old == c_new && args_same(c_old, c_new))) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
    92
      int old_bci = s_old.bci();
489c9b5090e2 Initial load
duke
parents:
diff changeset
    93
      int new_st_bci = s_new.bci();
489c9b5090e2 Initial load
duke
parents:
diff changeset
    94
      bool found_match = false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    95
      do {
489c9b5090e2 Initial load
duke
parents:
diff changeset
    96
        c_new = s_new.next();
489c9b5090e2 Initial load
duke
parents:
diff changeset
    97
        if (c_new == c_old && args_same(c_old, c_new)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
    98
          found_match = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    99
          break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   100
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   101
      } while (c_new >= 0);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   102
      if (! found_match)
489c9b5090e2 Initial load
duke
parents:
diff changeset
   103
        return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   104
      int new_end_bci = s_new.bci();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   105
      bci_map.store_fragment_location(old_bci, new_st_bci, new_end_bci);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   106
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   107
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   108
489c9b5090e2 Initial load
duke
parents:
diff changeset
   109
  // Now we can test all forward jumps
489c9b5090e2 Initial load
duke
parents:
diff changeset
   110
  for (int i = 0; i < fwd_jmps.length() / 2; i++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   111
    if (! bci_map.old_and_new_locations_same(fwd_jmps.at(i*2), fwd_jmps.at(i*2+1))) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   112
      RC_TRACE(0x00800000,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   113
        ("Fwd jump miss: old dest = %d, calc new dest = %d, act new dest = %d",
489c9b5090e2 Initial load
duke
parents:
diff changeset
   114
        fwd_jmps.at(i*2), bci_map.new_bci_for_old(fwd_jmps.at(i*2)),
489c9b5090e2 Initial load
duke
parents:
diff changeset
   115
        fwd_jmps.at(i*2+1)));
489c9b5090e2 Initial load
duke
parents:
diff changeset
   116
      return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   117
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   118
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   119
489c9b5090e2 Initial load
duke
parents:
diff changeset
   120
  return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   121
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   122
489c9b5090e2 Initial load
duke
parents:
diff changeset
   123
489c9b5090e2 Initial load
duke
parents:
diff changeset
   124
bool MethodComparator::args_same(Bytecodes::Code c_old, Bytecodes::Code c_new) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   125
  // BytecodeStream returns the correct standard Java bytecodes for various "fast"
489c9b5090e2 Initial load
duke
parents:
diff changeset
   126
  // bytecode versions, so we don't have to bother about them here..
489c9b5090e2 Initial load
duke
parents:
diff changeset
   127
  switch (c_old) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   128
  case Bytecodes::_new            : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   129
  case Bytecodes::_anewarray      : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   130
  case Bytecodes::_multianewarray : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   131
  case Bytecodes::_checkcast      : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   132
  case Bytecodes::_instanceof     : {
5688
9052dc91ea67 6939207: refactor constant pool index processing
jrose
parents: 3261
diff changeset
   133
    u2 cpi_old = _s_old->get_index_u2();
9052dc91ea67 6939207: refactor constant pool index processing
jrose
parents: 3261
diff changeset
   134
    u2 cpi_new = _s_new->get_index_u2();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   135
    if ((_old_cp->klass_at_noresolve(cpi_old) != _new_cp->klass_at_noresolve(cpi_new)))
489c9b5090e2 Initial load
duke
parents:
diff changeset
   136
        return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   137
    if (c_old == Bytecodes::_multianewarray &&
489c9b5090e2 Initial load
duke
parents:
diff changeset
   138
        *(jbyte*)(_s_old->bcp() + 3) != *(jbyte*)(_s_new->bcp() + 3))
489c9b5090e2 Initial load
duke
parents:
diff changeset
   139
      return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   140
    break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   141
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   142
489c9b5090e2 Initial load
duke
parents:
diff changeset
   143
  case Bytecodes::_getstatic       : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   144
  case Bytecodes::_putstatic       : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   145
  case Bytecodes::_getfield        : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   146
  case Bytecodes::_putfield        : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   147
  case Bytecodes::_invokevirtual   : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   148
  case Bytecodes::_invokespecial   : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   149
  case Bytecodes::_invokestatic    : // fall through
5688
9052dc91ea67 6939207: refactor constant pool index processing
jrose
parents: 3261
diff changeset
   150
  case Bytecodes::_invokedynamic   : // fall through
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   151
  case Bytecodes::_invokeinterface : {
5696
93e15b419ad4 6957004: MethodComparator uses the wrong CP index accessor
jrose
parents: 5688
diff changeset
   152
    int cpci_old = _s_old->has_index_u4() ? _s_old->get_index_u4() : _s_old->get_index_u2_cpcache();
93e15b419ad4 6957004: MethodComparator uses the wrong CP index accessor
jrose
parents: 5688
diff changeset
   153
    int cpci_new = _s_new->has_index_u4() ? _s_new->get_index_u4() : _s_new->get_index_u2_cpcache();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   154
    // Check if the names of classes, field/method names and signatures at these indexes
489c9b5090e2 Initial load
duke
parents:
diff changeset
   155
    // are the same. Indices which are really into constantpool cache (rather than constant
489c9b5090e2 Initial load
duke
parents:
diff changeset
   156
    // pool itself) are accepted by the constantpool query routines below.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   157
    if ((_old_cp->klass_ref_at_noresolve(cpci_old) != _new_cp->klass_ref_at_noresolve(cpci_new)) ||
489c9b5090e2 Initial load
duke
parents:
diff changeset
   158
        (_old_cp->name_ref_at(cpci_old) != _new_cp->name_ref_at(cpci_new)) ||
489c9b5090e2 Initial load
duke
parents:
diff changeset
   159
        (_old_cp->signature_ref_at(cpci_old) != _new_cp->signature_ref_at(cpci_new)))
489c9b5090e2 Initial load
duke
parents:
diff changeset
   160
      return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   161
    break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   162
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   163
489c9b5090e2 Initial load
duke
parents:
diff changeset
   164
  case Bytecodes::_ldc   : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   165
  case Bytecodes::_ldc_w : {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   166
    u2 cpi_old, cpi_new;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   167
    if (c_old == Bytecodes::_ldc) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   168
      cpi_old = _s_old->bcp()[1];
489c9b5090e2 Initial load
duke
parents:
diff changeset
   169
      cpi_new = _s_new->bcp()[1];
489c9b5090e2 Initial load
duke
parents:
diff changeset
   170
    } else {
5688
9052dc91ea67 6939207: refactor constant pool index processing
jrose
parents: 3261
diff changeset
   171
      cpi_old = _s_old->get_index_u2();
9052dc91ea67 6939207: refactor constant pool index processing
jrose
parents: 3261
diff changeset
   172
      cpi_new = _s_new->get_index_u2();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   173
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   174
    constantTag tag_old = _old_cp->tag_at(cpi_old);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   175
    constantTag tag_new = _new_cp->tag_at(cpi_new);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   176
    if (tag_old.is_int() || tag_old.is_float()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   177
      if (tag_old.value() != tag_new.value())
489c9b5090e2 Initial load
duke
parents:
diff changeset
   178
        return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   179
      if (tag_old.is_int()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   180
        if (_old_cp->int_at(cpi_old) != _new_cp->int_at(cpi_new))
489c9b5090e2 Initial load
duke
parents:
diff changeset
   181
          return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   182
      } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   183
        if (_old_cp->float_at(cpi_old) != _new_cp->float_at(cpi_new))
489c9b5090e2 Initial load
duke
parents:
diff changeset
   184
          return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   185
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   186
    } else if (tag_old.is_string() || tag_old.is_unresolved_string()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   187
      if (! (tag_new.is_unresolved_string() || tag_new.is_string()))
489c9b5090e2 Initial load
duke
parents:
diff changeset
   188
        return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   189
      if (strcmp(_old_cp->string_at_noresolve(cpi_old),
489c9b5090e2 Initial load
duke
parents:
diff changeset
   190
                 _new_cp->string_at_noresolve(cpi_new)) != 0)
489c9b5090e2 Initial load
duke
parents:
diff changeset
   191
        return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   192
    } else { // tag_old should be klass - 4881222
489c9b5090e2 Initial load
duke
parents:
diff changeset
   193
      if (! (tag_new.is_unresolved_klass() || tag_new.is_klass()))
489c9b5090e2 Initial load
duke
parents:
diff changeset
   194
        return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   195
      if (_old_cp->klass_at_noresolve(cpi_old) !=
489c9b5090e2 Initial load
duke
parents:
diff changeset
   196
          _new_cp->klass_at_noresolve(cpi_new))
489c9b5090e2 Initial load
duke
parents:
diff changeset
   197
        return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   198
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   199
    break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   200
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   201
489c9b5090e2 Initial load
duke
parents:
diff changeset
   202
  case Bytecodes::_ldc2_w : {
5688
9052dc91ea67 6939207: refactor constant pool index processing
jrose
parents: 3261
diff changeset
   203
    u2 cpi_old = _s_old->get_index_u2();
9052dc91ea67 6939207: refactor constant pool index processing
jrose
parents: 3261
diff changeset
   204
    u2 cpi_new = _s_new->get_index_u2();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   205
    constantTag tag_old = _old_cp->tag_at(cpi_old);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   206
    constantTag tag_new = _new_cp->tag_at(cpi_new);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   207
    if (tag_old.value() != tag_new.value())
489c9b5090e2 Initial load
duke
parents:
diff changeset
   208
      return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   209
    if (tag_old.is_long()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   210
      if (_old_cp->long_at(cpi_old) != _new_cp->long_at(cpi_new))
489c9b5090e2 Initial load
duke
parents:
diff changeset
   211
        return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   212
    } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   213
      if (_old_cp->double_at(cpi_old) != _new_cp->double_at(cpi_new))
489c9b5090e2 Initial load
duke
parents:
diff changeset
   214
        return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   215
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   216
    break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   217
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   218
489c9b5090e2 Initial load
duke
parents:
diff changeset
   219
  case Bytecodes::_bipush :
489c9b5090e2 Initial load
duke
parents:
diff changeset
   220
    if (_s_old->bcp()[1] != _s_new->bcp()[1])
489c9b5090e2 Initial load
duke
parents:
diff changeset
   221
      return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   222
    break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   223
489c9b5090e2 Initial load
duke
parents:
diff changeset
   224
  case Bytecodes::_sipush    :
5688
9052dc91ea67 6939207: refactor constant pool index processing
jrose
parents: 3261
diff changeset
   225
    if (_s_old->get_index_u2() != _s_new->get_index_u2())
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   226
      return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   227
    break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   228
489c9b5090e2 Initial load
duke
parents:
diff changeset
   229
  case Bytecodes::_aload  : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   230
  case Bytecodes::_astore : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   231
  case Bytecodes::_dload  : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   232
  case Bytecodes::_dstore : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   233
  case Bytecodes::_fload  : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   234
  case Bytecodes::_fstore : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   235
  case Bytecodes::_iload  : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   236
  case Bytecodes::_istore : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   237
  case Bytecodes::_lload  : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   238
  case Bytecodes::_lstore : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   239
  case Bytecodes::_ret    :
489c9b5090e2 Initial load
duke
parents:
diff changeset
   240
    if (_s_old->is_wide() != _s_new->is_wide())
489c9b5090e2 Initial load
duke
parents:
diff changeset
   241
      return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   242
    if (_s_old->get_index() != _s_new->get_index())
489c9b5090e2 Initial load
duke
parents:
diff changeset
   243
      return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   244
    break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   245
489c9b5090e2 Initial load
duke
parents:
diff changeset
   246
  case Bytecodes::_goto      : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   247
  case Bytecodes::_if_acmpeq : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   248
  case Bytecodes::_if_acmpne : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   249
  case Bytecodes::_if_icmpeq : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   250
  case Bytecodes::_if_icmpne : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   251
  case Bytecodes::_if_icmplt : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   252
  case Bytecodes::_if_icmpge : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   253
  case Bytecodes::_if_icmpgt : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   254
  case Bytecodes::_if_icmple : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   255
  case Bytecodes::_ifeq      : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   256
  case Bytecodes::_ifne      : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   257
  case Bytecodes::_iflt      : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   258
  case Bytecodes::_ifge      : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   259
  case Bytecodes::_ifgt      : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   260
  case Bytecodes::_ifle      : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   261
  case Bytecodes::_ifnonnull : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   262
  case Bytecodes::_ifnull    : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   263
  case Bytecodes::_jsr       : {
5688
9052dc91ea67 6939207: refactor constant pool index processing
jrose
parents: 3261
diff changeset
   264
    short old_ofs = (short) _s_old->get_index_u2();
9052dc91ea67 6939207: refactor constant pool index processing
jrose
parents: 3261
diff changeset
   265
    short new_ofs = (short) _s_new->get_index_u2();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   266
    if (_switchable_test) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   267
      int old_dest = _s_old->bci() + old_ofs;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   268
      int new_dest = _s_new->bci() + new_ofs;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   269
      if (old_ofs < 0 && new_ofs < 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   270
        if (! _bci_map->old_and_new_locations_same(old_dest, new_dest))
489c9b5090e2 Initial load
duke
parents:
diff changeset
   271
          return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   272
      } else if (old_ofs > 0 && new_ofs > 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   273
        _fwd_jmps->append(old_dest);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   274
        _fwd_jmps->append(new_dest);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   275
      } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   276
        return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   277
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   278
    } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   279
      if (old_ofs != new_ofs)
489c9b5090e2 Initial load
duke
parents:
diff changeset
   280
        return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   281
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   282
    break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   283
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   284
489c9b5090e2 Initial load
duke
parents:
diff changeset
   285
  case Bytecodes::_iinc :
489c9b5090e2 Initial load
duke
parents:
diff changeset
   286
    if (_s_old->is_wide() != _s_new->is_wide())
489c9b5090e2 Initial load
duke
parents:
diff changeset
   287
      return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   288
    if (! _s_old->is_wide()) {
5688
9052dc91ea67 6939207: refactor constant pool index processing
jrose
parents: 3261
diff changeset
   289
      // We could use get_index_u1 and get_constant_u1, but it's simpler to grab both bytes at once:
9052dc91ea67 6939207: refactor constant pool index processing
jrose
parents: 3261
diff changeset
   290
      if (Bytes::get_Java_u2(_s_old->bcp() + 1) != Bytes::get_Java_u2(_s_new->bcp() + 1))
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   291
        return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   292
    } else {
5688
9052dc91ea67 6939207: refactor constant pool index processing
jrose
parents: 3261
diff changeset
   293
      // We could use get_index_u2 and get_constant_u2, but it's simpler to grab all four bytes at once:
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   294
      if (Bytes::get_Java_u4(_s_old->bcp() + 1) != Bytes::get_Java_u4(_s_new->bcp() + 1))
489c9b5090e2 Initial load
duke
parents:
diff changeset
   295
        return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   296
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   297
    break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   298
489c9b5090e2 Initial load
duke
parents:
diff changeset
   299
  case Bytecodes::_goto_w : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   300
  case Bytecodes::_jsr_w  : {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   301
    int old_ofs = (int) Bytes::get_Java_u4(_s_old->bcp() + 1);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   302
    int new_ofs = (int) Bytes::get_Java_u4(_s_new->bcp() + 1);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   303
    if (_switchable_test) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   304
      int old_dest = _s_old->bci() + old_ofs;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   305
      int new_dest = _s_new->bci() + new_ofs;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   306
      if (old_ofs < 0 && new_ofs < 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   307
        if (! _bci_map->old_and_new_locations_same(old_dest, new_dest))
489c9b5090e2 Initial load
duke
parents:
diff changeset
   308
          return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   309
      } else if (old_ofs > 0 && new_ofs > 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   310
        _fwd_jmps->append(old_dest);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   311
        _fwd_jmps->append(new_dest);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   312
      } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   313
        return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   314
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   315
    } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   316
      if (old_ofs != new_ofs)
489c9b5090e2 Initial load
duke
parents:
diff changeset
   317
        return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   318
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   319
    break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   320
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   321
489c9b5090e2 Initial load
duke
parents:
diff changeset
   322
  case Bytecodes::_lookupswitch : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   323
  case Bytecodes::_tableswitch  : {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   324
    if (_switchable_test) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   325
      address aligned_bcp_old = (address) round_to((intptr_t)_s_old->bcp() + 1, jintSize);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   326
      address aligned_bcp_new = (address) round_to((intptr_t)_s_new->bcp() + 1, jintSize);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   327
      int default_old = (int) Bytes::get_Java_u4(aligned_bcp_old);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   328
      int default_new = (int) Bytes::get_Java_u4(aligned_bcp_new);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   329
      _fwd_jmps->append(_s_old->bci() + default_old);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   330
      _fwd_jmps->append(_s_new->bci() + default_new);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   331
      if (c_old == Bytecodes::_lookupswitch) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   332
        int npairs_old = (int) Bytes::get_Java_u4(aligned_bcp_old + jintSize);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   333
        int npairs_new = (int) Bytes::get_Java_u4(aligned_bcp_new + jintSize);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   334
        if (npairs_old != npairs_new)
489c9b5090e2 Initial load
duke
parents:
diff changeset
   335
          return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   336
        for (int i = 0; i < npairs_old; i++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   337
          int match_old = (int) Bytes::get_Java_u4(aligned_bcp_old + (2+2*i)*jintSize);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   338
          int match_new = (int) Bytes::get_Java_u4(aligned_bcp_new + (2+2*i)*jintSize);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   339
          if (match_old != match_new)
489c9b5090e2 Initial load
duke
parents:
diff changeset
   340
            return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   341
          int ofs_old = (int) Bytes::get_Java_u4(aligned_bcp_old + (2+2*i+1)*jintSize);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   342
          int ofs_new = (int) Bytes::get_Java_u4(aligned_bcp_new + (2+2*i+1)*jintSize);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   343
          _fwd_jmps->append(_s_old->bci() + ofs_old);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   344
          _fwd_jmps->append(_s_new->bci() + ofs_new);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   345
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   346
      } else if (c_old == Bytecodes::_tableswitch) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   347
        int lo_old = (int) Bytes::get_Java_u4(aligned_bcp_old + jintSize);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   348
        int lo_new = (int) Bytes::get_Java_u4(aligned_bcp_new + jintSize);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   349
        if (lo_old != lo_new)
489c9b5090e2 Initial load
duke
parents:
diff changeset
   350
          return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   351
        int hi_old = (int) Bytes::get_Java_u4(aligned_bcp_old + 2*jintSize);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   352
        int hi_new = (int) Bytes::get_Java_u4(aligned_bcp_new + 2*jintSize);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   353
        if (hi_old != hi_new)
489c9b5090e2 Initial load
duke
parents:
diff changeset
   354
          return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   355
        for (int i = 0; i < hi_old - lo_old + 1; i++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   356
          int ofs_old = (int) Bytes::get_Java_u4(aligned_bcp_old + (3+i)*jintSize);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   357
          int ofs_new = (int) Bytes::get_Java_u4(aligned_bcp_new + (3+i)*jintSize);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   358
          _fwd_jmps->append(_s_old->bci() + ofs_old);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   359
          _fwd_jmps->append(_s_new->bci() + ofs_new);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   360
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   361
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   362
    } else { // !_switchable_test, can use fast rough compare
5688
9052dc91ea67 6939207: refactor constant pool index processing
jrose
parents: 3261
diff changeset
   363
      int len_old = _s_old->instruction_size();
9052dc91ea67 6939207: refactor constant pool index processing
jrose
parents: 3261
diff changeset
   364
      int len_new = _s_new->instruction_size();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   365
      if (len_old != len_new)
489c9b5090e2 Initial load
duke
parents:
diff changeset
   366
        return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   367
      if (memcmp(_s_old->bcp(), _s_new->bcp(), len_old) != 0)
489c9b5090e2 Initial load
duke
parents:
diff changeset
   368
        return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   369
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   370
    break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   371
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   372
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   373
489c9b5090e2 Initial load
duke
parents:
diff changeset
   374
  return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   375
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   376
489c9b5090e2 Initial load
duke
parents:
diff changeset
   377
489c9b5090e2 Initial load
duke
parents:
diff changeset
   378
int MethodComparator::check_stack_and_locals_size(methodOop old_method, methodOop new_method) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   379
  if (old_method->max_stack() != new_method->max_stack()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   380
    return 1;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   381
  } else if (old_method->max_locals() != new_method->max_locals()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   382
    return 2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   383
  } else if (old_method->size_of_parameters() != new_method->size_of_parameters()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   384
    return 3;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   385
  } else return 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   386
}