annotate src/share/vm/prims/methodComparator.cpp @ 3602:da91efe96a93

6964458: Reimplement class meta-data storage to use native memory Summary: Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland Contributed-by: jmasa <jon.masamitsu@oracle.com>, stefank <stefan.karlsson@oracle.com>, mgerdin <mikael.gerdin@oracle.com>, never <tom.rodriguez@oracle.com>
author coleenp
date Sat, 01 Sep 2012 13:25:18 -0400
parents 3582bf76420e
children 080a0772cf95
rev   line source
duke@0 1 /*
coleenp@3602 2 * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
duke@0 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
duke@0 4 *
duke@0 5 * This code is free software; you can redistribute it and/or modify it
duke@0 6 * under the terms of the GNU General Public License version 2 only, as
duke@0 7 * published by the Free Software Foundation.
duke@0 8 *
duke@0 9 * This code is distributed in the hope that it will be useful, but WITHOUT
duke@0 10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
duke@0 11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
duke@0 12 * version 2 for more details (a copy is included in the LICENSE file that
duke@0 13 * accompanied this code).
duke@0 14 *
duke@0 15 * You should have received a copy of the GNU General Public License version
duke@0 16 * 2 along with this work; if not, write to the Free Software Foundation,
duke@0 17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
duke@0 18 *
trims@1472 19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
trims@1472 20 * or visit www.oracle.com if you need additional information or have any
trims@1472 21 * questions.
duke@0 22 *
duke@0 23 */
duke@0 24
stefank@1879 25 #include "precompiled.hpp"
stefank@1879 26 #include "oops/oop.inline.hpp"
coleenp@2062 27 #include "oops/symbol.hpp"
stefank@1879 28 #include "prims/jvmtiRedefineClassesTrace.hpp"
stefank@1879 29 #include "prims/methodComparator.hpp"
stefank@1879 30 #include "runtime/handles.inline.hpp"
stefank@1879 31 #include "utilities/globalDefinitions.hpp"
duke@0 32
duke@0 33 BytecodeStream *MethodComparator::_s_old;
duke@0 34 BytecodeStream *MethodComparator::_s_new;
coleenp@3602 35 ConstantPool* MethodComparator::_old_cp;
coleenp@3602 36 ConstantPool* MethodComparator::_new_cp;
duke@0 37 BciMap *MethodComparator::_bci_map;
duke@0 38 bool MethodComparator::_switchable_test;
duke@0 39 GrowableArray<int> *MethodComparator::_fwd_jmps;
duke@0 40
coleenp@3602 41 bool MethodComparator::methods_EMCP(Method* old_method, Method* new_method) {
duke@0 42 if (old_method->code_size() != new_method->code_size())
duke@0 43 return false;
duke@0 44 if (check_stack_and_locals_size(old_method, new_method) != 0) {
duke@0 45 // RC_TRACE macro has an embedded ResourceMark
duke@0 46 RC_TRACE(0x00800000, ("Methods %s non-comparable with diagnosis %d",
duke@0 47 old_method->name()->as_C_string(),
duke@0 48 check_stack_and_locals_size(old_method, new_method)));
duke@0 49 return false;
duke@0 50 }
duke@0 51
duke@0 52 _old_cp = old_method->constants();
duke@0 53 _new_cp = new_method->constants();
duke@0 54 BytecodeStream s_old(old_method);
duke@0 55 BytecodeStream s_new(new_method);
duke@0 56 _s_old = &s_old;
duke@0 57 _s_new = &s_new;
duke@0 58 _switchable_test = false;
duke@0 59 Bytecodes::Code c_old, c_new;
duke@0 60
duke@0 61 while ((c_old = s_old.next()) >= 0) {
duke@0 62 if ((c_new = s_new.next()) < 0 || c_old != c_new)
duke@0 63 return false;
duke@0 64
duke@0 65 if (! args_same(c_old, c_new))
duke@0 66 return false;
duke@0 67 }
duke@0 68 return true;
duke@0 69 }
duke@0 70
duke@0 71
coleenp@3602 72 bool MethodComparator::methods_switchable(Method* old_method, Method* new_method,
duke@0 73 BciMap &bci_map) {
duke@0 74 if (old_method->code_size() > new_method->code_size())
duke@0 75 // Something has definitely been deleted in the new method, compared to the old one.
duke@0 76 return false;
duke@0 77
duke@0 78 if (! check_stack_and_locals_size(old_method, new_method))
duke@0 79 return false;
duke@0 80
duke@0 81 _old_cp = old_method->constants();
duke@0 82 _new_cp = new_method->constants();
duke@0 83 BytecodeStream s_old(old_method);
duke@0 84 BytecodeStream s_new(new_method);
duke@0 85 _s_old = &s_old;
duke@0 86 _s_new = &s_new;
duke@0 87 _bci_map = &bci_map;
duke@0 88 _switchable_test = true;
duke@0 89 GrowableArray<int> fwd_jmps(16);
duke@0 90 _fwd_jmps = &fwd_jmps;
duke@0 91 Bytecodes::Code c_old, c_new;
duke@0 92
duke@0 93 while ((c_old = s_old.next()) >= 0) {
duke@0 94 if ((c_new = s_new.next()) < 0)
duke@0 95 return false;
duke@0 96 if (! (c_old == c_new && args_same(c_old, c_new))) {
duke@0 97 int old_bci = s_old.bci();
duke@0 98 int new_st_bci = s_new.bci();
duke@0 99 bool found_match = false;
duke@0 100 do {
duke@0 101 c_new = s_new.next();
duke@0 102 if (c_new == c_old && args_same(c_old, c_new)) {
duke@0 103 found_match = true;
duke@0 104 break;
duke@0 105 }
duke@0 106 } while (c_new >= 0);
duke@0 107 if (! found_match)
duke@0 108 return false;
duke@0 109 int new_end_bci = s_new.bci();
duke@0 110 bci_map.store_fragment_location(old_bci, new_st_bci, new_end_bci);
duke@0 111 }
duke@0 112 }
duke@0 113
duke@0 114 // Now we can test all forward jumps
duke@0 115 for (int i = 0; i < fwd_jmps.length() / 2; i++) {
duke@0 116 if (! bci_map.old_and_new_locations_same(fwd_jmps.at(i*2), fwd_jmps.at(i*2+1))) {
duke@0 117 RC_TRACE(0x00800000,
duke@0 118 ("Fwd jump miss: old dest = %d, calc new dest = %d, act new dest = %d",
duke@0 119 fwd_jmps.at(i*2), bci_map.new_bci_for_old(fwd_jmps.at(i*2)),
duke@0 120 fwd_jmps.at(i*2+1)));
duke@0 121 return false;
duke@0 122 }
duke@0 123 }
duke@0 124
duke@0 125 return true;
duke@0 126 }
duke@0 127
duke@0 128
duke@0 129 bool MethodComparator::args_same(Bytecodes::Code c_old, Bytecodes::Code c_new) {
duke@0 130 // BytecodeStream returns the correct standard Java bytecodes for various "fast"
duke@0 131 // bytecode versions, so we don't have to bother about them here..
duke@0 132 switch (c_old) {
duke@0 133 case Bytecodes::_new : // fall through
duke@0 134 case Bytecodes::_anewarray : // fall through
duke@0 135 case Bytecodes::_multianewarray : // fall through
duke@0 136 case Bytecodes::_checkcast : // fall through
duke@0 137 case Bytecodes::_instanceof : {
jrose@1485 138 u2 cpi_old = _s_old->get_index_u2();
jrose@1485 139 u2 cpi_new = _s_new->get_index_u2();
duke@0 140 if ((_old_cp->klass_at_noresolve(cpi_old) != _new_cp->klass_at_noresolve(cpi_new)))
duke@0 141 return false;
duke@0 142 if (c_old == Bytecodes::_multianewarray &&
duke@0 143 *(jbyte*)(_s_old->bcp() + 3) != *(jbyte*)(_s_new->bcp() + 3))
duke@0 144 return false;
duke@0 145 break;
duke@0 146 }
duke@0 147
duke@0 148 case Bytecodes::_getstatic : // fall through
duke@0 149 case Bytecodes::_putstatic : // fall through
duke@0 150 case Bytecodes::_getfield : // fall through
duke@0 151 case Bytecodes::_putfield : // fall through
duke@0 152 case Bytecodes::_invokevirtual : // fall through
duke@0 153 case Bytecodes::_invokespecial : // fall through
duke@0 154 case Bytecodes::_invokestatic : // fall through
duke@0 155 case Bytecodes::_invokeinterface : {
jrose@1833 156 int cpci_old = _s_old->get_index_u2_cpcache();
jrose@1833 157 int cpci_new = _s_new->get_index_u2_cpcache();
duke@0 158 // Check if the names of classes, field/method names and signatures at these indexes
duke@0 159 // are the same. Indices which are really into constantpool cache (rather than constant
duke@0 160 // pool itself) are accepted by the constantpool query routines below.
duke@0 161 if ((_old_cp->klass_ref_at_noresolve(cpci_old) != _new_cp->klass_ref_at_noresolve(cpci_new)) ||
duke@0 162 (_old_cp->name_ref_at(cpci_old) != _new_cp->name_ref_at(cpci_new)) ||
duke@0 163 (_old_cp->signature_ref_at(cpci_old) != _new_cp->signature_ref_at(cpci_new)))
duke@0 164 return false;
duke@0 165 break;
duke@0 166 }
jrose@1833 167 case Bytecodes::_invokedynamic: {
jrose@1833 168 int cpci_old = _s_old->get_index_u4();
jrose@1833 169 int cpci_new = _s_new->get_index_u4();
coleenp@3602 170
jrose@1833 171 // Check if the names of classes, field/method names and signatures at these indexes
jrose@1833 172 // are the same. Indices which are really into constantpool cache (rather than constant
jrose@1833 173 // pool itself) are accepted by the constantpool query routines below.
jrose@1833 174 if ((_old_cp->name_ref_at(cpci_old) != _new_cp->name_ref_at(cpci_new)) ||
jrose@1833 175 (_old_cp->signature_ref_at(cpci_old) != _new_cp->signature_ref_at(cpci_new)))
jrose@1833 176 return false;
coleenp@3602 177
coleenp@3602 178 // Translate object indexes to constant pool cache indexes.
coleenp@3602 179 cpci_old = _old_cp->invokedynamic_cp_cache_index(cpci_old);
coleenp@3602 180 cpci_new = _new_cp->invokedynamic_cp_cache_index(cpci_new);
coleenp@3602 181
coleenp@3602 182 int cpi_old = _old_cp->cache()->entry_at(cpci_old)->constant_pool_index();
coleenp@3602 183 int cpi_new = _new_cp->cache()->entry_at(cpci_new)->constant_pool_index();
jrose@1833 184 int bsm_old = _old_cp->invoke_dynamic_bootstrap_method_ref_index_at(cpi_old);
jrose@1833 185 int bsm_new = _new_cp->invoke_dynamic_bootstrap_method_ref_index_at(cpi_new);
jrose@1833 186 if (!pool_constants_same(bsm_old, bsm_new))
jrose@1833 187 return false;
jrose@1833 188 int cnt_old = _old_cp->invoke_dynamic_argument_count_at(cpi_old);
jrose@1833 189 int cnt_new = _new_cp->invoke_dynamic_argument_count_at(cpi_new);
jrose@1833 190 if (cnt_old != cnt_new)
jrose@1833 191 return false;
jrose@1833 192 for (int arg_i = 0; arg_i < cnt_old; arg_i++) {
jrose@1833 193 int idx_old = _old_cp->invoke_dynamic_argument_index_at(cpi_old, arg_i);
jrose@1833 194 int idx_new = _new_cp->invoke_dynamic_argument_index_at(cpi_new, arg_i);
jrose@1833 195 if (!pool_constants_same(idx_old, idx_new))
jrose@1833 196 return false;
jrose@1833 197 }
jrose@1833 198 break;
jrose@1833 199 }
duke@0 200
duke@0 201 case Bytecodes::_ldc : // fall through
duke@0 202 case Bytecodes::_ldc_w : {
never@2027 203 Bytecode_loadconstant ldc_old(_s_old->method(), _s_old->bci());
never@2027 204 Bytecode_loadconstant ldc_new(_s_new->method(), _s_new->bci());
never@2027 205 int cpi_old = ldc_old.pool_index();
never@2027 206 int cpi_new = ldc_new.pool_index();
jrose@1833 207 if (!pool_constants_same(cpi_old, cpi_new))
jrose@1833 208 return false;
duke@0 209 break;
duke@0 210 }
duke@0 211
duke@0 212 case Bytecodes::_ldc2_w : {
jrose@1485 213 u2 cpi_old = _s_old->get_index_u2();
jrose@1485 214 u2 cpi_new = _s_new->get_index_u2();
duke@0 215 constantTag tag_old = _old_cp->tag_at(cpi_old);
duke@0 216 constantTag tag_new = _new_cp->tag_at(cpi_new);
duke@0 217 if (tag_old.value() != tag_new.value())
duke@0 218 return false;
duke@0 219 if (tag_old.is_long()) {
duke@0 220 if (_old_cp->long_at(cpi_old) != _new_cp->long_at(cpi_new))
duke@0 221 return false;
duke@0 222 } else {
jrose@1494 223 // Use jlong_cast to compare the bits rather than numerical values.
jrose@1494 224 // This makes a difference for NaN constants.
jrose@1494 225 if (jlong_cast(_old_cp->double_at(cpi_old)) != jlong_cast(_new_cp->double_at(cpi_new)))
duke@0 226 return false;
duke@0 227 }
duke@0 228 break;
duke@0 229 }
duke@0 230
duke@0 231 case Bytecodes::_bipush :
duke@0 232 if (_s_old->bcp()[1] != _s_new->bcp()[1])
duke@0 233 return false;
duke@0 234 break;
duke@0 235
duke@0 236 case Bytecodes::_sipush :
jrose@1485 237 if (_s_old->get_index_u2() != _s_new->get_index_u2())
duke@0 238 return false;
duke@0 239 break;
duke@0 240
duke@0 241 case Bytecodes::_aload : // fall through
duke@0 242 case Bytecodes::_astore : // fall through
duke@0 243 case Bytecodes::_dload : // fall through
duke@0 244 case Bytecodes::_dstore : // fall through
duke@0 245 case Bytecodes::_fload : // fall through
duke@0 246 case Bytecodes::_fstore : // fall through
duke@0 247 case Bytecodes::_iload : // fall through
duke@0 248 case Bytecodes::_istore : // fall through
duke@0 249 case Bytecodes::_lload : // fall through
duke@0 250 case Bytecodes::_lstore : // fall through
duke@0 251 case Bytecodes::_ret :
duke@0 252 if (_s_old->is_wide() != _s_new->is_wide())
duke@0 253 return false;
duke@0 254 if (_s_old->get_index() != _s_new->get_index())
duke@0 255 return false;
duke@0 256 break;
duke@0 257
duke@0 258 case Bytecodes::_goto : // fall through
duke@0 259 case Bytecodes::_if_acmpeq : // fall through
duke@0 260 case Bytecodes::_if_acmpne : // fall through
duke@0 261 case Bytecodes::_if_icmpeq : // fall through
duke@0 262 case Bytecodes::_if_icmpne : // fall through
duke@0 263 case Bytecodes::_if_icmplt : // fall through
duke@0 264 case Bytecodes::_if_icmpge : // fall through
duke@0 265 case Bytecodes::_if_icmpgt : // fall through
duke@0 266 case Bytecodes::_if_icmple : // fall through
duke@0 267 case Bytecodes::_ifeq : // fall through
duke@0 268 case Bytecodes::_ifne : // fall through
duke@0 269 case Bytecodes::_iflt : // fall through
duke@0 270 case Bytecodes::_ifge : // fall through
duke@0 271 case Bytecodes::_ifgt : // fall through
duke@0 272 case Bytecodes::_ifle : // fall through
duke@0 273 case Bytecodes::_ifnonnull : // fall through
duke@0 274 case Bytecodes::_ifnull : // fall through
duke@0 275 case Bytecodes::_jsr : {
never@2027 276 int old_ofs = _s_old->bytecode().get_offset_s2(c_old);
never@2027 277 int new_ofs = _s_new->bytecode().get_offset_s2(c_new);
duke@0 278 if (_switchable_test) {
duke@0 279 int old_dest = _s_old->bci() + old_ofs;
duke@0 280 int new_dest = _s_new->bci() + new_ofs;
duke@0 281 if (old_ofs < 0 && new_ofs < 0) {
duke@0 282 if (! _bci_map->old_and_new_locations_same(old_dest, new_dest))
duke@0 283 return false;
duke@0 284 } else if (old_ofs > 0 && new_ofs > 0) {
duke@0 285 _fwd_jmps->append(old_dest);
duke@0 286 _fwd_jmps->append(new_dest);
duke@0 287 } else {
duke@0 288 return false;
duke@0 289 }
duke@0 290 } else {
duke@0 291 if (old_ofs != new_ofs)
duke@0 292 return false;
duke@0 293 }
duke@0 294 break;
duke@0 295 }
duke@0 296
duke@0 297 case Bytecodes::_iinc :
duke@0 298 if (_s_old->is_wide() != _s_new->is_wide())
duke@0 299 return false;
duke@0 300 if (! _s_old->is_wide()) {
jrose@1485 301 // We could use get_index_u1 and get_constant_u1, but it's simpler to grab both bytes at once:
jrose@1485 302 if (Bytes::get_Java_u2(_s_old->bcp() + 1) != Bytes::get_Java_u2(_s_new->bcp() + 1))
duke@0 303 return false;
duke@0 304 } else {
jrose@1485 305 // We could use get_index_u2 and get_constant_u2, but it's simpler to grab all four bytes at once:
duke@0 306 if (Bytes::get_Java_u4(_s_old->bcp() + 1) != Bytes::get_Java_u4(_s_new->bcp() + 1))
duke@0 307 return false;
duke@0 308 }
duke@0 309 break;
duke@0 310
duke@0 311 case Bytecodes::_goto_w : // fall through
duke@0 312 case Bytecodes::_jsr_w : {
never@2027 313 int old_ofs = _s_old->bytecode().get_offset_s4(c_old);
never@2027 314 int new_ofs = _s_new->bytecode().get_offset_s4(c_new);
duke@0 315 if (_switchable_test) {
duke@0 316 int old_dest = _s_old->bci() + old_ofs;
duke@0 317 int new_dest = _s_new->bci() + new_ofs;
duke@0 318 if (old_ofs < 0 && new_ofs < 0) {
duke@0 319 if (! _bci_map->old_and_new_locations_same(old_dest, new_dest))
duke@0 320 return false;
duke@0 321 } else if (old_ofs > 0 && new_ofs > 0) {
duke@0 322 _fwd_jmps->append(old_dest);
duke@0 323 _fwd_jmps->append(new_dest);
duke@0 324 } else {
duke@0 325 return false;
duke@0 326 }
duke@0 327 } else {
duke@0 328 if (old_ofs != new_ofs)
duke@0 329 return false;
duke@0 330 }
duke@0 331 break;
duke@0 332 }
duke@0 333
duke@0 334 case Bytecodes::_lookupswitch : // fall through
duke@0 335 case Bytecodes::_tableswitch : {
duke@0 336 if (_switchable_test) {
duke@0 337 address aligned_bcp_old = (address) round_to((intptr_t)_s_old->bcp() + 1, jintSize);
duke@0 338 address aligned_bcp_new = (address) round_to((intptr_t)_s_new->bcp() + 1, jintSize);
duke@0 339 int default_old = (int) Bytes::get_Java_u4(aligned_bcp_old);
duke@0 340 int default_new = (int) Bytes::get_Java_u4(aligned_bcp_new);
duke@0 341 _fwd_jmps->append(_s_old->bci() + default_old);
duke@0 342 _fwd_jmps->append(_s_new->bci() + default_new);
duke@0 343 if (c_old == Bytecodes::_lookupswitch) {
duke@0 344 int npairs_old = (int) Bytes::get_Java_u4(aligned_bcp_old + jintSize);
duke@0 345 int npairs_new = (int) Bytes::get_Java_u4(aligned_bcp_new + jintSize);
duke@0 346 if (npairs_old != npairs_new)
duke@0 347 return false;
duke@0 348 for (int i = 0; i < npairs_old; i++) {
duke@0 349 int match_old = (int) Bytes::get_Java_u4(aligned_bcp_old + (2+2*i)*jintSize);
duke@0 350 int match_new = (int) Bytes::get_Java_u4(aligned_bcp_new + (2+2*i)*jintSize);
duke@0 351 if (match_old != match_new)
duke@0 352 return false;
duke@0 353 int ofs_old = (int) Bytes::get_Java_u4(aligned_bcp_old + (2+2*i+1)*jintSize);
duke@0 354 int ofs_new = (int) Bytes::get_Java_u4(aligned_bcp_new + (2+2*i+1)*jintSize);
duke@0 355 _fwd_jmps->append(_s_old->bci() + ofs_old);
duke@0 356 _fwd_jmps->append(_s_new->bci() + ofs_new);
duke@0 357 }
duke@0 358 } else if (c_old == Bytecodes::_tableswitch) {
duke@0 359 int lo_old = (int) Bytes::get_Java_u4(aligned_bcp_old + jintSize);
duke@0 360 int lo_new = (int) Bytes::get_Java_u4(aligned_bcp_new + jintSize);
duke@0 361 if (lo_old != lo_new)
duke@0 362 return false;
duke@0 363 int hi_old = (int) Bytes::get_Java_u4(aligned_bcp_old + 2*jintSize);
duke@0 364 int hi_new = (int) Bytes::get_Java_u4(aligned_bcp_new + 2*jintSize);
duke@0 365 if (hi_old != hi_new)
duke@0 366 return false;
duke@0 367 for (int i = 0; i < hi_old - lo_old + 1; i++) {
duke@0 368 int ofs_old = (int) Bytes::get_Java_u4(aligned_bcp_old + (3+i)*jintSize);
duke@0 369 int ofs_new = (int) Bytes::get_Java_u4(aligned_bcp_new + (3+i)*jintSize);
duke@0 370 _fwd_jmps->append(_s_old->bci() + ofs_old);
duke@0 371 _fwd_jmps->append(_s_new->bci() + ofs_new);
duke@0 372 }
duke@0 373 }
duke@0 374 } else { // !_switchable_test, can use fast rough compare
jrose@1485 375 int len_old = _s_old->instruction_size();
jrose@1485 376 int len_new = _s_new->instruction_size();
duke@0 377 if (len_old != len_new)
duke@0 378 return false;
duke@0 379 if (memcmp(_s_old->bcp(), _s_new->bcp(), len_old) != 0)
duke@0 380 return false;
duke@0 381 }
duke@0 382 break;
duke@0 383 }
duke@0 384 }
duke@0 385
duke@0 386 return true;
duke@0 387 }
duke@0 388
jrose@1833 389 bool MethodComparator::pool_constants_same(int cpi_old, int cpi_new) {
jrose@1833 390 constantTag tag_old = _old_cp->tag_at(cpi_old);
jrose@1833 391 constantTag tag_new = _new_cp->tag_at(cpi_new);
jrose@1833 392 if (tag_old.is_int() || tag_old.is_float()) {
jrose@1833 393 if (tag_old.value() != tag_new.value())
jrose@1833 394 return false;
jrose@1833 395 if (tag_old.is_int()) {
jrose@1833 396 if (_old_cp->int_at(cpi_old) != _new_cp->int_at(cpi_new))
jrose@1833 397 return false;
jrose@1833 398 } else {
jrose@1833 399 // Use jint_cast to compare the bits rather than numerical values.
jrose@1833 400 // This makes a difference for NaN constants.
jrose@1833 401 if (jint_cast(_old_cp->float_at(cpi_old)) != jint_cast(_new_cp->float_at(cpi_new)))
jrose@1833 402 return false;
jrose@1833 403 }
coleenp@3602 404 } else if (tag_old.is_string() && tag_new.is_string()) {
jrose@1833 405 if (strcmp(_old_cp->string_at_noresolve(cpi_old),
jrose@1833 406 _new_cp->string_at_noresolve(cpi_new)) != 0)
jrose@1833 407 return false;
jrose@1833 408 } else if (tag_old.is_klass() || tag_old.is_unresolved_klass()) {
jrose@1833 409 // tag_old should be klass - 4881222
jrose@1833 410 if (! (tag_new.is_unresolved_klass() || tag_new.is_klass()))
jrose@1833 411 return false;
jrose@1833 412 if (_old_cp->klass_at_noresolve(cpi_old) !=
jrose@1833 413 _new_cp->klass_at_noresolve(cpi_new))
jrose@1833 414 return false;
jrose@1833 415 } else if (tag_old.is_method_type() && tag_new.is_method_type()) {
jrose@1833 416 int mti_old = _old_cp->method_type_index_at(cpi_old);
jrose@1833 417 int mti_new = _new_cp->method_type_index_at(cpi_new);
jrose@1833 418 if ((_old_cp->symbol_at(mti_old) != _new_cp->symbol_at(mti_new)))
jrose@1833 419 return false;
jrose@1833 420 } else if (tag_old.is_method_handle() && tag_new.is_method_handle()) {
jrose@1833 421 if (_old_cp->method_handle_ref_kind_at(cpi_old) !=
jrose@1833 422 _new_cp->method_handle_ref_kind_at(cpi_new))
jrose@1833 423 return false;
jrose@1833 424 int mhi_old = _old_cp->method_handle_index_at(cpi_old);
jrose@1833 425 int mhi_new = _new_cp->method_handle_index_at(cpi_new);
jrose@1833 426 if ((_old_cp->uncached_klass_ref_at_noresolve(mhi_old) != _new_cp->uncached_klass_ref_at_noresolve(mhi_new)) ||
jrose@1833 427 (_old_cp->uncached_name_ref_at(mhi_old) != _new_cp->uncached_name_ref_at(mhi_new)) ||
jrose@1833 428 (_old_cp->uncached_signature_ref_at(mhi_old) != _new_cp->uncached_signature_ref_at(mhi_new)))
jrose@1833 429 return false;
jrose@1833 430 } else {
jrose@1833 431 return false; // unknown tag
jrose@1833 432 }
jrose@1833 433 return true;
jrose@1833 434 }
jrose@1833 435
duke@0 436
coleenp@3602 437 int MethodComparator::check_stack_and_locals_size(Method* old_method, Method* new_method) {
duke@0 438 if (old_method->max_stack() != new_method->max_stack()) {
duke@0 439 return 1;
duke@0 440 } else if (old_method->max_locals() != new_method->max_locals()) {
duke@0 441 return 2;
duke@0 442 } else if (old_method->size_of_parameters() != new_method->size_of_parameters()) {
duke@0 443 return 3;
duke@0 444 } else return 0;
duke@0 445 }