Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/oops/generateOopMap.cpp	Fri Oct 30 10:12:52 2009 -0700
     1.2 +++ b/src/share/vm/oops/generateOopMap.cpp	Fri Oct 30 16:22:59 2009 -0700
     1.3 @@ -1556,13 +1556,13 @@
     1.4      case Bytecodes::_getfield:          do_field(true,  false, itr->get_index_big(), itr->bci()); break;
     1.5      case Bytecodes::_putfield:          do_field(false, false, itr->get_index_big(), itr->bci()); break;
     1.6  
     1.7 -    case Bytecodes::_invokevirtual:
     1.8 -    case Bytecodes::_invokespecial:     do_method(false, false, itr->get_index_big(), itr->bci()); break;
     1.9 -    case Bytecodes::_invokestatic:      do_method(true,  false, itr->get_index_big(), itr->bci()); break;
    1.10 -    case Bytecodes::_invokedynamic:     do_method(false, true,  itr->get_index_int(), itr->bci()); break;
    1.11 -    case Bytecodes::_invokeinterface:   do_method(false, true,  itr->get_index_big(), itr->bci()); break;
    1.12 -    case Bytecodes::_newarray:
    1.13 -    case Bytecodes::_anewarray:         pp_new_ref(vCTS, itr->bci()); break;
    1.14 +   case Bytecodes::_invokevirtual:
    1.15 +   case Bytecodes::_invokespecial:     do_method(false, false, itr->get_index_big(), itr->bci()); break;
    1.16 +   case Bytecodes::_invokestatic:      do_method(true,  false, itr->get_index_big(), itr->bci()); break;
    1.17 +    case Bytecodes::_invokedynamic:     do_method(true,  false, itr->get_index_int(), itr->bci()); break;
    1.18 +   case Bytecodes::_invokeinterface:   do_method(false, true,  itr->get_index_big(), itr->bci()); break;
    1.19 +   case Bytecodes::_newarray:
    1.20 +   case Bytecodes::_anewarray:         pp_new_ref(vCTS, itr->bci()); break;
    1.21      case Bytecodes::_checkcast:         do_checkcast(); break;
    1.22      case Bytecodes::_arraylength:
    1.23      case Bytecodes::_instanceof:        pp(rCTS, vCTS); break;
    1.24 @@ -1900,11 +1900,9 @@
    1.25  }
    1.26  
    1.27  void GenerateOopMap::do_method(int is_static, int is_interface, int idx, int bci) {
    1.28 -  // Dig up signature for field in constant pool
    1.29 -  constantPoolOop cp    = _method->constants();
    1.30 -  int nameAndTypeIdx    = cp->name_and_type_ref_index_at(idx);
    1.31 -  int signatureIdx      = cp->signature_ref_index_at(nameAndTypeIdx);  // @@@@@
    1.32 -  symbolOop signature   = cp->symbol_at(signatureIdx);
    1.33 + // Dig up signature for field in constant pool
    1.34 +  constantPoolOop cp  = _method->constants();
    1.35 +  symbolOop signature = cp->signature_ref_at(idx);
    1.36  
    1.37    // Parse method signature
    1.38    CellTypeState out[4];