annotate src/share/vm/prims/methodComparator.cpp @ 1838:3b2dea75431e

6984311: JSR 292 needs optional bootstrap method parameters Summary: Allow CONSTANT_InvokeDynamic nodes to have any number of extra operands. Reviewed-by: twisti
author jrose
date Sat, 30 Oct 2010 13:08:23 -0700
parents 136b78722a08
children f95d63e2154a
rev   line source
duke@0 1 /*
jrose@1500 2 * Copyright (c) 2000, 2010, 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
duke@0 25 # include "incls/_precompiled.incl"
duke@0 26 # include "incls/_methodComparator.cpp.incl"
duke@0 27
duke@0 28 BytecodeStream *MethodComparator::_s_old;
duke@0 29 BytecodeStream *MethodComparator::_s_new;
duke@0 30 constantPoolOop MethodComparator::_old_cp;
duke@0 31 constantPoolOop MethodComparator::_new_cp;
duke@0 32 BciMap *MethodComparator::_bci_map;
duke@0 33 bool MethodComparator::_switchable_test;
duke@0 34 GrowableArray<int> *MethodComparator::_fwd_jmps;
duke@0 35
duke@0 36 bool MethodComparator::methods_EMCP(methodOop old_method, methodOop new_method) {
duke@0 37 if (old_method->code_size() != new_method->code_size())
duke@0 38 return false;
duke@0 39 if (check_stack_and_locals_size(old_method, new_method) != 0) {
duke@0 40 // RC_TRACE macro has an embedded ResourceMark
duke@0 41 RC_TRACE(0x00800000, ("Methods %s non-comparable with diagnosis %d",
duke@0 42 old_method->name()->as_C_string(),
duke@0 43 check_stack_and_locals_size(old_method, new_method)));
duke@0 44 return false;
duke@0 45 }
duke@0 46
duke@0 47 _old_cp = old_method->constants();
duke@0 48 _new_cp = new_method->constants();
duke@0 49 BytecodeStream s_old(old_method);
duke@0 50 BytecodeStream s_new(new_method);
duke@0 51 _s_old = &s_old;
duke@0 52 _s_new = &s_new;
duke@0 53 _switchable_test = false;
duke@0 54 Bytecodes::Code c_old, c_new;
duke@0 55
duke@0 56 while ((c_old = s_old.next()) >= 0) {
duke@0 57 if ((c_new = s_new.next()) < 0 || c_old != c_new)
duke@0 58 return false;
duke@0 59
duke@0 60 if (! args_same(c_old, c_new))
duke@0 61 return false;
duke@0 62 }
duke@0 63 return true;
duke@0 64 }
duke@0 65
duke@0 66
duke@0 67 bool MethodComparator::methods_switchable(methodOop old_method, methodOop new_method,
duke@0 68 BciMap &bci_map) {
duke@0 69 if (old_method->code_size() > new_method->code_size())
duke@0 70 // Something has definitely been deleted in the new method, compared to the old one.
duke@0 71 return false;
duke@0 72
duke@0 73 if (! check_stack_and_locals_size(old_method, new_method))
duke@0 74 return false;
duke@0 75
duke@0 76 _old_cp = old_method->constants();
duke@0 77 _new_cp = new_method->constants();
duke@0 78 BytecodeStream s_old(old_method);
duke@0 79 BytecodeStream s_new(new_method);
duke@0 80 _s_old = &s_old;
duke@0 81 _s_new = &s_new;
duke@0 82 _bci_map = &bci_map;
duke@0 83 _switchable_test = true;
duke@0 84 GrowableArray<int> fwd_jmps(16);
duke@0 85 _fwd_jmps = &fwd_jmps;
duke@0 86 Bytecodes::Code c_old, c_new;
duke@0 87
duke@0 88 while ((c_old = s_old.next()) >= 0) {
duke@0 89 if ((c_new = s_new.next()) < 0)
duke@0 90 return false;
duke@0 91 if (! (c_old == c_new && args_same(c_old, c_new))) {
duke@0 92 int old_bci = s_old.bci();
duke@0 93 int new_st_bci = s_new.bci();
duke@0 94 bool found_match = false;
duke@0 95 do {
duke@0 96 c_new = s_new.next();
duke@0 97 if (c_new == c_old && args_same(c_old, c_new)) {
duke@0 98 found_match = true;
duke@0 99 break;
duke@0 100 }
duke@0 101 } while (c_new >= 0);
duke@0 102 if (! found_match)
duke@0 103 return false;
duke@0 104 int new_end_bci = s_new.bci();
duke@0 105 bci_map.store_fragment_location(old_bci, new_st_bci, new_end_bci);
duke@0 106 }
duke@0 107 }
duke@0 108
duke@0 109 // Now we can test all forward jumps
duke@0 110 for (int i = 0; i < fwd_jmps.length() / 2; i++) {
duke@0 111 if (! bci_map.old_and_new_locations_same(fwd_jmps.at(i*2), fwd_jmps.at(i*2+1))) {
duke@0 112 RC_TRACE(0x00800000,
duke@0 113 ("Fwd jump miss: old dest = %d, calc new dest = %d, act new dest = %d",
duke@0 114 fwd_jmps.at(i*2), bci_map.new_bci_for_old(fwd_jmps.at(i*2)),
duke@0 115 fwd_jmps.at(i*2+1)));
duke@0 116 return false;
duke@0 117 }
duke@0 118 }
duke@0 119
duke@0 120 return true;
duke@0 121 }
duke@0 122
duke@0 123
duke@0 124 bool MethodComparator::args_same(Bytecodes::Code c_old, Bytecodes::Code c_new) {
duke@0 125 // BytecodeStream returns the correct standard Java bytecodes for various "fast"
duke@0 126 // bytecode versions, so we don't have to bother about them here..
duke@0 127 switch (c_old) {
duke@0 128 case Bytecodes::_new : // fall through
duke@0 129 case Bytecodes::_anewarray : // fall through
duke@0 130 case Bytecodes::_multianewarray : // fall through
duke@0 131 case Bytecodes::_checkcast : // fall through
duke@0 132 case Bytecodes::_instanceof : {
jrose@1486 133 u2 cpi_old = _s_old->get_index_u2();
jrose@1486 134 u2 cpi_new = _s_new->get_index_u2();
duke@0 135 if ((_old_cp->klass_at_noresolve(cpi_old) != _new_cp->klass_at_noresolve(cpi_new)))
duke@0 136 return false;
duke@0 137 if (c_old == Bytecodes::_multianewarray &&
duke@0 138 *(jbyte*)(_s_old->bcp() + 3) != *(jbyte*)(_s_new->bcp() + 3))
duke@0 139 return false;
duke@0 140 break;
duke@0 141 }
duke@0 142
duke@0 143 case Bytecodes::_getstatic : // fall through
duke@0 144 case Bytecodes::_putstatic : // fall through
duke@0 145 case Bytecodes::_getfield : // fall through
duke@0 146 case Bytecodes::_putfield : // fall through
duke@0 147 case Bytecodes::_invokevirtual : // fall through
duke@0 148 case Bytecodes::_invokespecial : // fall through
duke@0 149 case Bytecodes::_invokestatic : // fall through
duke@0 150 case Bytecodes::_invokeinterface : {
jrose@1838 151 int cpci_old = _s_old->get_index_u2_cpcache();
jrose@1838 152 int cpci_new = _s_new->get_index_u2_cpcache();
duke@0 153 // Check if the names of classes, field/method names and signatures at these indexes
duke@0 154 // are the same. Indices which are really into constantpool cache (rather than constant
duke@0 155 // pool itself) are accepted by the constantpool query routines below.
duke@0 156 if ((_old_cp->klass_ref_at_noresolve(cpci_old) != _new_cp->klass_ref_at_noresolve(cpci_new)) ||
duke@0 157 (_old_cp->name_ref_at(cpci_old) != _new_cp->name_ref_at(cpci_new)) ||
duke@0 158 (_old_cp->signature_ref_at(cpci_old) != _new_cp->signature_ref_at(cpci_new)))
duke@0 159 return false;
duke@0 160 break;
duke@0 161 }
jrose@1838 162 case Bytecodes::_invokedynamic: {
jrose@1838 163 int cpci_old = _s_old->get_index_u4();
jrose@1838 164 int cpci_new = _s_new->get_index_u4();
jrose@1838 165 // Check if the names of classes, field/method names and signatures at these indexes
jrose@1838 166 // are the same. Indices which are really into constantpool cache (rather than constant
jrose@1838 167 // pool itself) are accepted by the constantpool query routines below.
jrose@1838 168 if ((_old_cp->name_ref_at(cpci_old) != _new_cp->name_ref_at(cpci_new)) ||
jrose@1838 169 (_old_cp->signature_ref_at(cpci_old) != _new_cp->signature_ref_at(cpci_new)))
jrose@1838 170 return false;
jrose@1838 171 int cpi_old = _old_cp->cache()->main_entry_at(cpci_old)->constant_pool_index();
jrose@1838 172 int cpi_new = _new_cp->cache()->main_entry_at(cpci_new)->constant_pool_index();
jrose@1838 173 int bsm_old = _old_cp->invoke_dynamic_bootstrap_method_ref_index_at(cpi_old);
jrose@1838 174 int bsm_new = _new_cp->invoke_dynamic_bootstrap_method_ref_index_at(cpi_new);
jrose@1838 175 if (!pool_constants_same(bsm_old, bsm_new))
jrose@1838 176 return false;
jrose@1838 177 int cnt_old = _old_cp->invoke_dynamic_argument_count_at(cpi_old);
jrose@1838 178 int cnt_new = _new_cp->invoke_dynamic_argument_count_at(cpi_new);
jrose@1838 179 if (cnt_old != cnt_new)
jrose@1838 180 return false;
jrose@1838 181 for (int arg_i = 0; arg_i < cnt_old; arg_i++) {
jrose@1838 182 int idx_old = _old_cp->invoke_dynamic_argument_index_at(cpi_old, arg_i);
jrose@1838 183 int idx_new = _new_cp->invoke_dynamic_argument_index_at(cpi_new, arg_i);
jrose@1838 184 if (!pool_constants_same(idx_old, idx_new))
jrose@1838 185 return false;
jrose@1838 186 }
jrose@1838 187 break;
jrose@1838 188 }
duke@0 189
duke@0 190 case Bytecodes::_ldc : // fall through
duke@0 191 case Bytecodes::_ldc_w : {
jrose@1524 192 Bytecode_loadconstant* ldc_old = Bytecode_loadconstant_at(_s_old->method(), _s_old->bci());
jrose@1524 193 Bytecode_loadconstant* ldc_new = Bytecode_loadconstant_at(_s_new->method(), _s_new->bci());
jrose@1524 194 int cpi_old = ldc_old->pool_index();
jrose@1524 195 int cpi_new = ldc_new->pool_index();
jrose@1838 196 if (!pool_constants_same(cpi_old, cpi_new))
jrose@1838 197 return false;
duke@0 198 break;
duke@0 199 }
duke@0 200
duke@0 201 case Bytecodes::_ldc2_w : {
jrose@1486 202 u2 cpi_old = _s_old->get_index_u2();
jrose@1486 203 u2 cpi_new = _s_new->get_index_u2();
duke@0 204 constantTag tag_old = _old_cp->tag_at(cpi_old);
duke@0 205 constantTag tag_new = _new_cp->tag_at(cpi_new);
duke@0 206 if (tag_old.value() != tag_new.value())
duke@0 207 return false;
duke@0 208 if (tag_old.is_long()) {
duke@0 209 if (_old_cp->long_at(cpi_old) != _new_cp->long_at(cpi_new))
duke@0 210 return false;
duke@0 211 } else {
jrose@1495 212 // Use jlong_cast to compare the bits rather than numerical values.
jrose@1495 213 // This makes a difference for NaN constants.
jrose@1495 214 if (jlong_cast(_old_cp->double_at(cpi_old)) != jlong_cast(_new_cp->double_at(cpi_new)))
duke@0 215 return false;
duke@0 216 }
duke@0 217 break;
duke@0 218 }
duke@0 219
duke@0 220 case Bytecodes::_bipush :
duke@0 221 if (_s_old->bcp()[1] != _s_new->bcp()[1])
duke@0 222 return false;
duke@0 223 break;
duke@0 224
duke@0 225 case Bytecodes::_sipush :
jrose@1486 226 if (_s_old->get_index_u2() != _s_new->get_index_u2())
duke@0 227 return false;
duke@0 228 break;
duke@0 229
duke@0 230 case Bytecodes::_aload : // fall through
duke@0 231 case Bytecodes::_astore : // fall through
duke@0 232 case Bytecodes::_dload : // fall through
duke@0 233 case Bytecodes::_dstore : // fall through
duke@0 234 case Bytecodes::_fload : // fall through
duke@0 235 case Bytecodes::_fstore : // fall through
duke@0 236 case Bytecodes::_iload : // fall through
duke@0 237 case Bytecodes::_istore : // fall through
duke@0 238 case Bytecodes::_lload : // fall through
duke@0 239 case Bytecodes::_lstore : // fall through
duke@0 240 case Bytecodes::_ret :
duke@0 241 if (_s_old->is_wide() != _s_new->is_wide())
duke@0 242 return false;
duke@0 243 if (_s_old->get_index() != _s_new->get_index())
duke@0 244 return false;
duke@0 245 break;
duke@0 246
duke@0 247 case Bytecodes::_goto : // fall through
duke@0 248 case Bytecodes::_if_acmpeq : // fall through
duke@0 249 case Bytecodes::_if_acmpne : // fall through
duke@0 250 case Bytecodes::_if_icmpeq : // fall through
duke@0 251 case Bytecodes::_if_icmpne : // fall through
duke@0 252 case Bytecodes::_if_icmplt : // fall through
duke@0 253 case Bytecodes::_if_icmpge : // fall through
duke@0 254 case Bytecodes::_if_icmpgt : // fall through
duke@0 255 case Bytecodes::_if_icmple : // fall through
duke@0 256 case Bytecodes::_ifeq : // fall through
duke@0 257 case Bytecodes::_ifne : // fall through
duke@0 258 case Bytecodes::_iflt : // fall through
duke@0 259 case Bytecodes::_ifge : // fall through
duke@0 260 case Bytecodes::_ifgt : // fall through
duke@0 261 case Bytecodes::_ifle : // fall through
duke@0 262 case Bytecodes::_ifnonnull : // fall through
duke@0 263 case Bytecodes::_ifnull : // fall through
duke@0 264 case Bytecodes::_jsr : {
jrose@1495 265 int old_ofs = _s_old->bytecode()->get_offset_s2(c_old);
jrose@1495 266 int new_ofs = _s_new->bytecode()->get_offset_s2(c_new);
duke@0 267 if (_switchable_test) {
duke@0 268 int old_dest = _s_old->bci() + old_ofs;
duke@0 269 int new_dest = _s_new->bci() + new_ofs;
duke@0 270 if (old_ofs < 0 && new_ofs < 0) {
duke@0 271 if (! _bci_map->old_and_new_locations_same(old_dest, new_dest))
duke@0 272 return false;
duke@0 273 } else if (old_ofs > 0 && new_ofs > 0) {
duke@0 274 _fwd_jmps->append(old_dest);
duke@0 275 _fwd_jmps->append(new_dest);
duke@0 276 } else {
duke@0 277 return false;
duke@0 278 }
duke@0 279 } else {
duke@0 280 if (old_ofs != new_ofs)
duke@0 281 return false;
duke@0 282 }
duke@0 283 break;
duke@0 284 }
duke@0 285
duke@0 286 case Bytecodes::_iinc :
duke@0 287 if (_s_old->is_wide() != _s_new->is_wide())
duke@0 288 return false;
duke@0 289 if (! _s_old->is_wide()) {
jrose@1486 290 // We could use get_index_u1 and get_constant_u1, but it's simpler to grab both bytes at once:
jrose@1486 291 if (Bytes::get_Java_u2(_s_old->bcp() + 1) != Bytes::get_Java_u2(_s_new->bcp() + 1))
duke@0 292 return false;
duke@0 293 } else {
jrose@1486 294 // We could use get_index_u2 and get_constant_u2, but it's simpler to grab all four bytes at once:
duke@0 295 if (Bytes::get_Java_u4(_s_old->bcp() + 1) != Bytes::get_Java_u4(_s_new->bcp() + 1))
duke@0 296 return false;
duke@0 297 }
duke@0 298 break;
duke@0 299
duke@0 300 case Bytecodes::_goto_w : // fall through
duke@0 301 case Bytecodes::_jsr_w : {
jrose@1495 302 int old_ofs = _s_old->bytecode()->get_offset_s4(c_old);
jrose@1495 303 int new_ofs = _s_new->bytecode()->get_offset_s4(c_new);
duke@0 304 if (_switchable_test) {
duke@0 305 int old_dest = _s_old->bci() + old_ofs;
duke@0 306 int new_dest = _s_new->bci() + new_ofs;
duke@0 307 if (old_ofs < 0 && new_ofs < 0) {
duke@0 308 if (! _bci_map->old_and_new_locations_same(old_dest, new_dest))
duke@0 309 return false;
duke@0 310 } else if (old_ofs > 0 && new_ofs > 0) {
duke@0 311 _fwd_jmps->append(old_dest);
duke@0 312 _fwd_jmps->append(new_dest);
duke@0 313 } else {
duke@0 314 return false;
duke@0 315 }
duke@0 316 } else {
duke@0 317 if (old_ofs != new_ofs)
duke@0 318 return false;
duke@0 319 }
duke@0 320 break;
duke@0 321 }
duke@0 322
duke@0 323 case Bytecodes::_lookupswitch : // fall through
duke@0 324 case Bytecodes::_tableswitch : {
duke@0 325 if (_switchable_test) {
duke@0 326 address aligned_bcp_old = (address) round_to((intptr_t)_s_old->bcp() + 1, jintSize);
duke@0 327 address aligned_bcp_new = (address) round_to((intptr_t)_s_new->bcp() + 1, jintSize);
duke@0 328 int default_old = (int) Bytes::get_Java_u4(aligned_bcp_old);
duke@0 329 int default_new = (int) Bytes::get_Java_u4(aligned_bcp_new);
duke@0 330 _fwd_jmps->append(_s_old->bci() + default_old);
duke@0 331 _fwd_jmps->append(_s_new->bci() + default_new);
duke@0 332 if (c_old == Bytecodes::_lookupswitch) {
duke@0 333 int npairs_old = (int) Bytes::get_Java_u4(aligned_bcp_old + jintSize);
duke@0 334 int npairs_new = (int) Bytes::get_Java_u4(aligned_bcp_new + jintSize);
duke@0 335 if (npairs_old != npairs_new)
duke@0 336 return false;
duke@0 337 for (int i = 0; i < npairs_old; i++) {
duke@0 338 int match_old = (int) Bytes::get_Java_u4(aligned_bcp_old + (2+2*i)*jintSize);
duke@0 339 int match_new = (int) Bytes::get_Java_u4(aligned_bcp_new + (2+2*i)*jintSize);
duke@0 340 if (match_old != match_new)
duke@0 341 return false;
duke@0 342 int ofs_old = (int) Bytes::get_Java_u4(aligned_bcp_old + (2+2*i+1)*jintSize);
duke@0 343 int ofs_new = (int) Bytes::get_Java_u4(aligned_bcp_new + (2+2*i+1)*jintSize);
duke@0 344 _fwd_jmps->append(_s_old->bci() + ofs_old);
duke@0 345 _fwd_jmps->append(_s_new->bci() + ofs_new);
duke@0 346 }
duke@0 347 } else if (c_old == Bytecodes::_tableswitch) {
duke@0 348 int lo_old = (int) Bytes::get_Java_u4(aligned_bcp_old + jintSize);
duke@0 349 int lo_new = (int) Bytes::get_Java_u4(aligned_bcp_new + jintSize);
duke@0 350 if (lo_old != lo_new)
duke@0 351 return false;
duke@0 352 int hi_old = (int) Bytes::get_Java_u4(aligned_bcp_old + 2*jintSize);
duke@0 353 int hi_new = (int) Bytes::get_Java_u4(aligned_bcp_new + 2*jintSize);
duke@0 354 if (hi_old != hi_new)
duke@0 355 return false;
duke@0 356 for (int i = 0; i < hi_old - lo_old + 1; i++) {
duke@0 357 int ofs_old = (int) Bytes::get_Java_u4(aligned_bcp_old + (3+i)*jintSize);
duke@0 358 int ofs_new = (int) Bytes::get_Java_u4(aligned_bcp_new + (3+i)*jintSize);
duke@0 359 _fwd_jmps->append(_s_old->bci() + ofs_old);
duke@0 360 _fwd_jmps->append(_s_new->bci() + ofs_new);
duke@0 361 }
duke@0 362 }
duke@0 363 } else { // !_switchable_test, can use fast rough compare
jrose@1486 364 int len_old = _s_old->instruction_size();
jrose@1486 365 int len_new = _s_new->instruction_size();
duke@0 366 if (len_old != len_new)
duke@0 367 return false;
duke@0 368 if (memcmp(_s_old->bcp(), _s_new->bcp(), len_old) != 0)
duke@0 369 return false;
duke@0 370 }
duke@0 371 break;
duke@0 372 }
duke@0 373 }
duke@0 374
duke@0 375 return true;
duke@0 376 }
duke@0 377
jrose@1838 378 bool MethodComparator::pool_constants_same(int cpi_old, int cpi_new) {
jrose@1838 379 constantTag tag_old = _old_cp->tag_at(cpi_old);
jrose@1838 380 constantTag tag_new = _new_cp->tag_at(cpi_new);
jrose@1838 381 if (tag_old.is_int() || tag_old.is_float()) {
jrose@1838 382 if (tag_old.value() != tag_new.value())
jrose@1838 383 return false;
jrose@1838 384 if (tag_old.is_int()) {
jrose@1838 385 if (_old_cp->int_at(cpi_old) != _new_cp->int_at(cpi_new))
jrose@1838 386 return false;
jrose@1838 387 } else {
jrose@1838 388 // Use jint_cast to compare the bits rather than numerical values.
jrose@1838 389 // This makes a difference for NaN constants.
jrose@1838 390 if (jint_cast(_old_cp->float_at(cpi_old)) != jint_cast(_new_cp->float_at(cpi_new)))
jrose@1838 391 return false;
jrose@1838 392 }
jrose@1838 393 } else if (tag_old.is_string() || tag_old.is_unresolved_string()) {
jrose@1838 394 if (! (tag_new.is_unresolved_string() || tag_new.is_string()))
jrose@1838 395 return false;
jrose@1838 396 if (strcmp(_old_cp->string_at_noresolve(cpi_old),
jrose@1838 397 _new_cp->string_at_noresolve(cpi_new)) != 0)
jrose@1838 398 return false;
jrose@1838 399 } else if (tag_old.is_klass() || tag_old.is_unresolved_klass()) {
jrose@1838 400 // tag_old should be klass - 4881222
jrose@1838 401 if (! (tag_new.is_unresolved_klass() || tag_new.is_klass()))
jrose@1838 402 return false;
jrose@1838 403 if (_old_cp->klass_at_noresolve(cpi_old) !=
jrose@1838 404 _new_cp->klass_at_noresolve(cpi_new))
jrose@1838 405 return false;
jrose@1838 406 } else if (tag_old.is_method_type() && tag_new.is_method_type()) {
jrose@1838 407 int mti_old = _old_cp->method_type_index_at(cpi_old);
jrose@1838 408 int mti_new = _new_cp->method_type_index_at(cpi_new);
jrose@1838 409 if ((_old_cp->symbol_at(mti_old) != _new_cp->symbol_at(mti_new)))
jrose@1838 410 return false;
jrose@1838 411 } else if (tag_old.is_method_handle() && tag_new.is_method_handle()) {
jrose@1838 412 if (_old_cp->method_handle_ref_kind_at(cpi_old) !=
jrose@1838 413 _new_cp->method_handle_ref_kind_at(cpi_new))
jrose@1838 414 return false;
jrose@1838 415 int mhi_old = _old_cp->method_handle_index_at(cpi_old);
jrose@1838 416 int mhi_new = _new_cp->method_handle_index_at(cpi_new);
jrose@1838 417 if ((_old_cp->uncached_klass_ref_at_noresolve(mhi_old) != _new_cp->uncached_klass_ref_at_noresolve(mhi_new)) ||
jrose@1838 418 (_old_cp->uncached_name_ref_at(mhi_old) != _new_cp->uncached_name_ref_at(mhi_new)) ||
jrose@1838 419 (_old_cp->uncached_signature_ref_at(mhi_old) != _new_cp->uncached_signature_ref_at(mhi_new)))
jrose@1838 420 return false;
jrose@1838 421 } else {
jrose@1838 422 return false; // unknown tag
jrose@1838 423 }
jrose@1838 424 return true;
jrose@1838 425 }
jrose@1838 426
duke@0 427
duke@0 428 int MethodComparator::check_stack_and_locals_size(methodOop old_method, methodOop new_method) {
duke@0 429 if (old_method->max_stack() != new_method->max_stack()) {
duke@0 430 return 1;
duke@0 431 } else if (old_method->max_locals() != new_method->max_locals()) {
duke@0 432 return 2;
duke@0 433 } else if (old_method->size_of_parameters() != new_method->size_of_parameters()) {
duke@0 434 return 3;
duke@0 435 } else return 0;
duke@0 436 }