src/share/vm/interpreter/rewriter.cpp

rev 10555 : imported patch primitive arrays
rev 10556 : imported patch update dates

*** 1,7 ****
  /*
!  * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 63,77 ****
    }
  
    // Record limits of resolved reference map for constant pool cache indices
    record_map_limits();
  
!   guarantee((int)_cp_cache_map.length()-1 <= (int)((u2)-1),
              "all cp cache indexes fit in a u2");
  
!   if (saw_mh_symbol)
!     _method_handle_invokers.initialize(length, (int)0);
  }
  
  // Unrewrite the bytecodes if an error occurs.
  void Rewriter::restore_bytecodes() {
    int len = _methods->length();
--- 63,78 ----
    }
  
    // Record limits of resolved reference map for constant pool cache indices
    record_map_limits();
  
!   guarantee((int) _cp_cache_map.length() - 1 <= (int) ((u2)-1),
              "all cp cache indexes fit in a u2");
  
!   if (saw_mh_symbol) {
!     _method_handle_invokers.at_grow(length, 0);
!   }
  }
  
  // Unrewrite the bytecodes if an error occurs.
  void Rewriter::restore_bytecodes() {
    int len = _methods->length();
*** 191,201 ****
          // allow invokespecial as an alias, although it would be very odd:
          (*opc) == (u1)Bytecodes::_invokespecial) {
        assert(_pool->tag_at(cp_index).is_method(), "wrong index");
        // Determine whether this is a signature-polymorphic method.
        if (cp_index >= _method_handle_invokers.length())  return;
!       int status = _method_handle_invokers[cp_index];
        assert(status >= -1 && status <= 1, "oob tri-state");
        if (status == 0) {
          if (_pool->klass_ref_at_noresolve(cp_index) == vmSymbols::java_lang_invoke_MethodHandle() &&
              MethodHandles::is_signature_polymorphic_name(SystemDictionary::MethodHandle_klass(),
                                                           _pool->name_ref_at(cp_index))) {
--- 192,202 ----
          // allow invokespecial as an alias, although it would be very odd:
          (*opc) == (u1)Bytecodes::_invokespecial) {
        assert(_pool->tag_at(cp_index).is_method(), "wrong index");
        // Determine whether this is a signature-polymorphic method.
        if (cp_index >= _method_handle_invokers.length())  return;
!       int status = _method_handle_invokers.at(cp_index);
        assert(status >= -1 && status <= 1, "oob tri-state");
        if (status == 0) {
          if (_pool->klass_ref_at_noresolve(cp_index) == vmSymbols::java_lang_invoke_MethodHandle() &&
              MethodHandles::is_signature_polymorphic_name(SystemDictionary::MethodHandle_klass(),
                                                           _pool->name_ref_at(cp_index))) {
*** 209,219 ****
            add_invokedynamic_resolved_references_entries(cp_index, cache_index);
            status = +1;
          } else {
            status = -1;
          }
!         _method_handle_invokers[cp_index] = status;
        }
        // We use a special internal bytecode for such methods (if non-static).
        // The basic reason for this is that such methods need an extra "appendix" argument
        // to transmit the call site's intended call type.
        if (status > 0) {
--- 210,220 ----
            add_invokedynamic_resolved_references_entries(cp_index, cache_index);
            status = +1;
          } else {
            status = -1;
          }
!         _method_handle_invokers.at(cp_index) = status;
        }
        // We use a special internal bytecode for such methods (if non-static).
        // The basic reason for this is that such methods need an extra "appendix" argument
        // to transmit the call site's intended call type.
        if (status > 0) {
*** 285,295 ****
  
        // invokedynamic resolved references map also points to cp cache and must
        // add delta to each.
        int resolved_index = _patch_invokedynamic_refs->at(i);
        for (int entry = 0; entry < ConstantPoolCacheEntry::_indy_resolved_references_entries; entry++) {
!         assert(_invokedynamic_references_map[resolved_index+entry] == cache_index,
               "should be the same index");
          _invokedynamic_references_map.at_put(resolved_index+entry,
                                               cache_index + delta);
        }
      }
--- 286,296 ----
  
        // invokedynamic resolved references map also points to cp cache and must
        // add delta to each.
        int resolved_index = _patch_invokedynamic_refs->at(i);
        for (int entry = 0; entry < ConstantPoolCacheEntry::_indy_resolved_references_entries; entry++) {
!         assert(_invokedynamic_references_map.at(resolved_index + entry) == cache_index,
               "should be the same index");
          _invokedynamic_references_map.at_put(resolved_index+entry,
                                               cache_index + delta);
        }
      }
*** 518,528 ****
  }
  
  Rewriter::Rewriter(instanceKlassHandle klass, const constantPoolHandle& cpool, Array<Method*>* methods, TRAPS)
    : _klass(klass),
      _pool(cpool),
!     _methods(methods)
  {
  
    // Rewrite bytecodes - exception here exits.
    rewrite_bytecodes(CHECK);
  
--- 519,536 ----
  }
  
  Rewriter::Rewriter(instanceKlassHandle klass, const constantPoolHandle& cpool, Array<Method*>* methods, TRAPS)
    : _klass(klass),
      _pool(cpool),
!     _methods(methods),
!     _cp_map(cpool->length()),
!     _cp_cache_map(cpool->length() / 2),
!     _reference_map(cpool->length()),
!     _resolved_references_map(cpool->length() / 2),
!     _invokedynamic_references_map(cpool->length() / 2),
!     _method_handle_invokers(cpool->length()),
!     _invokedynamic_cp_cache_map(cpool->length() / 4)
  {
  
    // Rewrite bytecodes - exception here exits.
    rewrite_bytecodes(CHECK);