hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp
author mbaesken
Tue, 18 Jul 2017 15:46:04 -0400
changeset 46689 59f0972cf342
parent 46630 75aa3e39d02c
permissions -rw-r--r--
8184323: compile-time guard some UseSharedSpaces-only coding with the INCLUDE_CDS macro Reviewed-by: jiangli, shade, simonis
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
     1
/*
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
     2
 * Copyright (c) 2003, 2017, Oracle and/or its affiliates. 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
 *
5547
f4b087cbb361 6941466: Oracle rebranding changes for Hotspot repositories
trims
parents: 4571
diff changeset
    19
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
f4b087cbb361 6941466: Oracle rebranding changes for Hotspot repositories
trims
parents: 4571
diff changeset
    20
 * or visit www.oracle.com if you need additional information or have any
f4b087cbb361 6941466: Oracle rebranding changes for Hotspot repositories
trims
parents: 4571
diff changeset
    21
 * questions.
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    22
 *
489c9b5090e2 Initial load
duke
parents:
diff changeset
    23
 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
    24
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    25
#include "precompiled.hpp"
42650
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 40635
diff changeset
    26
#include "aot/aotLoader.hpp"
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 33612
diff changeset
    27
#include "classfile/classFileStream.hpp"
15430
7c35f12cf1e5 8006040: NPG: on_stack processing wastes space in ConstantPool
coleenp
parents: 15229
diff changeset
    28
#include "classfile/metadataOnStackMark.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    29
#include "classfile/systemDictionary.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    30
#include "classfile/verifier.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    31
#include "code/codeCache.hpp"
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
    32
#include "compiler/compileBroker.hpp"
30764
fec48bf5a827 8079792: GC directory structure cleanup
pliden
parents: 30289
diff changeset
    33
#include "gc/shared/gcLocker.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    34
#include "interpreter/oopMapCache.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    35
#include "interpreter/rewriter.hpp"
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
    36
#include "logging/logStream.hpp"
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
    37
#include "memory/metadataFactory.hpp"
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
    38
#include "memory/metaspaceShared.hpp"
37248
11a660dbbb8e 8132524: Missing includes to resourceArea.hpp
jprovino
parents: 36353
diff changeset
    39
#include "memory/resourceArea.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    40
#include "memory/universe.inline.hpp"
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
    41
#include "oops/fieldStreams.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    42
#include "oops/klassVtable.hpp"
29081
c61eb4914428 8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents: 28734
diff changeset
    43
#include "oops/oop.inline.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    44
#include "prims/jvmtiImpl.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    45
#include "prims/jvmtiRedefineClasses.hpp"
46505
fd4bc78630b1 8174749: Use hash table/oops for MemberName table
coleenp
parents: 46427
diff changeset
    46
#include "prims/resolvedMethodTable.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    47
#include "prims/methodComparator.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    48
#include "runtime/deoptimization.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    49
#include "runtime/relocator.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    50
#include "utilities/bitMap.inline.hpp"
31234
48000028382c 8081219: hs_err improvement: Add event logging for class redefinition to the hs_err file
coleenp
parents: 30773
diff changeset
    51
#include "utilities/events.hpp"
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    52
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
    53
Array<Method*>* VM_RedefineClasses::_old_methods = NULL;
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
    54
Array<Method*>* VM_RedefineClasses::_new_methods = NULL;
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
    55
Method**  VM_RedefineClasses::_matching_old_methods = NULL;
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
    56
Method**  VM_RedefineClasses::_matching_new_methods = NULL;
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
    57
Method**  VM_RedefineClasses::_deleted_methods      = NULL;
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
    58
Method**  VM_RedefineClasses::_added_methods        = NULL;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    59
int         VM_RedefineClasses::_matching_methods_length = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    60
int         VM_RedefineClasses::_deleted_methods_length  = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    61
int         VM_RedefineClasses::_added_methods_length    = 0;
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
    62
Klass*      VM_RedefineClasses::_the_class = NULL;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    63
489c9b5090e2 Initial load
duke
parents:
diff changeset
    64
489c9b5090e2 Initial load
duke
parents:
diff changeset
    65
VM_RedefineClasses::VM_RedefineClasses(jint class_count,
489c9b5090e2 Initial load
duke
parents:
diff changeset
    66
                                       const jvmtiClassDefinition *class_defs,
489c9b5090e2 Initial load
duke
parents:
diff changeset
    67
                                       JvmtiClassLoadKind class_load_kind) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
    68
  _class_count = class_count;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    69
  _class_defs = class_defs;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    70
  _class_load_kind = class_load_kind;
46505
fd4bc78630b1 8174749: Use hash table/oops for MemberName table
coleenp
parents: 46427
diff changeset
    71
  _any_class_has_resolved_methods = false;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    72
  _res = JVMTI_ERROR_NONE;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    73
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
    74
38309
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
    75
static inline InstanceKlass* get_ik(jclass def) {
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
    76
  oop mirror = JNIHandles::resolve_non_null(def);
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
    77
  return InstanceKlass::cast(java_lang_Class::as_Klass(mirror));
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
    78
}
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
    79
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
    80
// If any of the classes are being redefined, wait
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
    81
// Parallel constant pool merging leads to indeterminate constant pools.
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
    82
void VM_RedefineClasses::lock_classes() {
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
    83
  MutexLocker ml(RedefineClasses_lock);
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
    84
  bool has_redefined;
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
    85
  do {
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
    86
    has_redefined = false;
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
    87
    // Go through classes each time until none are being redefined.
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
    88
    for (int i = 0; i < _class_count; i++) {
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
    89
      if (get_ik(_class_defs[i].klass)->is_being_redefined()) {
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
    90
        RedefineClasses_lock->wait();
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
    91
        has_redefined = true;
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
    92
        break;  // for loop
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
    93
      }
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
    94
    }
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
    95
  } while (has_redefined);
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
    96
  for (int i = 0; i < _class_count; i++) {
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
    97
    get_ik(_class_defs[i].klass)->set_is_being_redefined(true);
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
    98
  }
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
    99
  RedefineClasses_lock->notify_all();
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
   100
}
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
   101
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
   102
void VM_RedefineClasses::unlock_classes() {
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
   103
  MutexLocker ml(RedefineClasses_lock);
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
   104
  for (int i = 0; i < _class_count; i++) {
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
   105
    assert(get_ik(_class_defs[i].klass)->is_being_redefined(),
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
   106
           "should be being redefined to get here");
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
   107
    get_ik(_class_defs[i].klass)->set_is_being_redefined(false);
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
   108
  }
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
   109
  RedefineClasses_lock->notify_all();
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
   110
}
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
   111
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   112
bool VM_RedefineClasses::doit_prologue() {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   113
  if (_class_count == 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   114
    _res = JVMTI_ERROR_NONE;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   115
    return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   116
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   117
  if (_class_defs == NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   118
    _res = JVMTI_ERROR_NULL_POINTER;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   119
    return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   120
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   121
  for (int i = 0; i < _class_count; i++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   122
    if (_class_defs[i].klass == NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   123
      _res = JVMTI_ERROR_INVALID_CLASS;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   124
      return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   125
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   126
    if (_class_defs[i].class_byte_count == 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   127
      _res = JVMTI_ERROR_INVALID_CLASS_FORMAT;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   128
      return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   129
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   130
    if (_class_defs[i].class_bytes == NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   131
      _res = JVMTI_ERROR_NULL_POINTER;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   132
      return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   133
    }
38309
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
   134
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
   135
    oop mirror = JNIHandles::resolve_non_null(_class_defs[i].klass);
40635
22fa174b2af8 8145964: NoClassDefFound error in transforming lambdas
coleenp
parents: 38309
diff changeset
   136
    // classes for primitives and arrays and vm anonymous classes cannot be redefined
38309
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
   137
    // check here so following code can assume these classes are InstanceKlass
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
   138
    if (!is_modifiable_class(mirror)) {
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
   139
      _res = JVMTI_ERROR_UNMODIFIABLE_CLASS;
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
   140
      return false;
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
   141
    }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   142
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   143
489c9b5090e2 Initial load
duke
parents:
diff changeset
   144
  // Start timer after all the sanity checks; not quite accurate, but
489c9b5090e2 Initial load
duke
parents:
diff changeset
   145
  // better than adding a bunch of stop() calls.
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   146
  if (log_is_enabled(Info, redefine, class, timer)) {
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   147
    _timer_vm_op_prologue.start();
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   148
  }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   149
38309
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
   150
  lock_classes();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   151
  // We first load new class versions in the prologue, because somewhere down the
489c9b5090e2 Initial load
duke
parents:
diff changeset
   152
  // call chain it is required that the current thread is a Java thread.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   153
  _res = load_new_class_versions(Thread::current());
489c9b5090e2 Initial load
duke
parents:
diff changeset
   154
  if (_res != JVMTI_ERROR_NONE) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   155
    // free any successfully created classes, since none are redefined
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   156
    for (int i = 0; i < _class_count; i++) {
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   157
      if (_scratch_classes[i] != NULL) {
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   158
        ClassLoaderData* cld = _scratch_classes[i]->class_loader_data();
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   159
        // Free the memory for this class at class unloading time.  Not before
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   160
        // because CMS might think this is still live.
33602
16053580a684 8139163: InstanceKlass::cast passes through NULL
coleenp
parents: 33594
diff changeset
   161
        cld->add_to_deallocate_list(InstanceKlass::cast(_scratch_classes[i]));
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   162
      }
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   163
    }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   164
    // Free os::malloc allocated memory in load_new_class_version.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   165
    os::free(_scratch_classes);
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   166
    _timer_vm_op_prologue.stop();
38309
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
   167
    unlock_classes();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   168
    return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   169
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   170
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   171
  _timer_vm_op_prologue.stop();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   172
  return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   173
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   174
489c9b5090e2 Initial load
duke
parents:
diff changeset
   175
void VM_RedefineClasses::doit() {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   176
  Thread *thread = Thread::current();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   177
46689
59f0972cf342 8184323: compile-time guard some UseSharedSpaces-only coding with the INCLUDE_CDS macro
mbaesken
parents: 46630
diff changeset
   178
#if INCLUDE_CDS
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   179
  if (UseSharedSpaces) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   180
    // Sharing is enabled so we remap the shared readonly space to
489c9b5090e2 Initial load
duke
parents:
diff changeset
   181
    // shared readwrite, private just in case we need to redefine
489c9b5090e2 Initial load
duke
parents:
diff changeset
   182
    // a shared class. We do the remap during the doit() phase of
489c9b5090e2 Initial load
duke
parents:
diff changeset
   183
    // the safepoint to be safer.
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   184
    if (!MetaspaceShared::remap_shared_readonly_as_readwrite()) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   185
      log_info(redefine, class, load)("failed to remap shared readonly space to readwrite, private");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   186
      _res = JVMTI_ERROR_INTERNAL;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   187
      return;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   188
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   189
  }
46689
59f0972cf342 8184323: compile-time guard some UseSharedSpaces-only coding with the INCLUDE_CDS macro
mbaesken
parents: 46630
diff changeset
   190
#endif
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   191
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   192
  // Mark methods seen on stack and everywhere else so old methods are not
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   193
  // cleaned up if they're on the stack.
26558
b7df27df6384 8055008: Clean up code that saves the previous versions of redefined classes
coleenp
parents: 24459
diff changeset
   194
  MetadataOnStackMark md_on_stack(true);
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   195
  HandleMark hm(thread);   // make sure any handles created are deleted
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   196
                           // before the stack walk again.
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   197
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   198
  for (int i = 0; i < _class_count; i++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   199
    redefine_single_class(_class_defs[i].klass, _scratch_classes[i], thread);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   200
  }
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   201
28365
ccf31849c7a4 8067713: Move clean_weak_method_links for redefinition out of class unloading
coleenp
parents: 27401
diff changeset
   202
  // Clean out MethodData pointing to old Method*
29576
c223b0a9872e 8061205: MetadataOnStackMark only needs to walk code cache during class redefinition
coleenp
parents: 29316
diff changeset
   203
  // Have to do this after all classes are redefined and all methods that
c223b0a9872e 8061205: MetadataOnStackMark only needs to walk code cache during class redefinition
coleenp
parents: 29316
diff changeset
   204
  // are redefined are marked as old.
28365
ccf31849c7a4 8067713: Move clean_weak_method_links for redefinition out of class unloading
coleenp
parents: 27401
diff changeset
   205
  MethodDataCleaner clean_weak_method_links;
ccf31849c7a4 8067713: Move clean_weak_method_links for redefinition out of class unloading
coleenp
parents: 27401
diff changeset
   206
  ClassLoaderDataGraph::classes_do(&clean_weak_method_links);
ccf31849c7a4 8067713: Move clean_weak_method_links for redefinition out of class unloading
coleenp
parents: 27401
diff changeset
   207
46505
fd4bc78630b1 8174749: Use hash table/oops for MemberName table
coleenp
parents: 46427
diff changeset
   208
  // JSR-292 support
fd4bc78630b1 8174749: Use hash table/oops for MemberName table
coleenp
parents: 46427
diff changeset
   209
  if (_any_class_has_resolved_methods) {
fd4bc78630b1 8174749: Use hash table/oops for MemberName table
coleenp
parents: 46427
diff changeset
   210
    bool trace_name_printed = false;
fd4bc78630b1 8174749: Use hash table/oops for MemberName table
coleenp
parents: 46427
diff changeset
   211
    ResolvedMethodTable::adjust_method_entries(&trace_name_printed);
fd4bc78630b1 8174749: Use hash table/oops for MemberName table
coleenp
parents: 46427
diff changeset
   212
  }
fd4bc78630b1 8174749: Use hash table/oops for MemberName table
coleenp
parents: 46427
diff changeset
   213
22503
45d730e9202e 8030662: "assert(counter_changed) failed: failed dependencies, but counter didn't change" still fails
roland
parents: 22231
diff changeset
   214
  // Disable any dependent concurrent compilations
45d730e9202e 8030662: "assert(counter_changed) failed: failed dependencies, but counter didn't change" still fails
roland
parents: 22231
diff changeset
   215
  SystemDictionary::notice_modification();
45d730e9202e 8030662: "assert(counter_changed) failed: failed dependencies, but counter didn't change" still fails
roland
parents: 22231
diff changeset
   216
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   217
  // Set flag indicating that some invariants are no longer true.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   218
  // See jvmtiExport.hpp for detailed explanation.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   219
  JvmtiExport::set_has_redefined_a_class();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   220
28365
ccf31849c7a4 8067713: Move clean_weak_method_links for redefinition out of class unloading
coleenp
parents: 27401
diff changeset
   221
  // check_class() is optionally called for product bits, but is
ccf31849c7a4 8067713: Move clean_weak_method_links for redefinition out of class unloading
coleenp
parents: 27401
diff changeset
   222
  // always called for non-product bits.
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
   223
#ifdef PRODUCT
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   224
  if (log_is_enabled(Trace, redefine, class, obsolete, metadata)) {
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
   225
#endif
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   226
    log_trace(redefine, class, obsolete, metadata)("calling check_class");
17373
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
   227
    CheckClass check_class(thread);
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
   228
    ClassLoaderDataGraph::classes_do(&check_class);
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
   229
#ifdef PRODUCT
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
   230
  }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   231
#endif
489c9b5090e2 Initial load
duke
parents:
diff changeset
   232
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   233
489c9b5090e2 Initial load
duke
parents:
diff changeset
   234
void VM_RedefineClasses::doit_epilogue() {
38309
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
   235
  unlock_classes();
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
   236
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   237
  // Free os::malloc allocated memory.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   238
  os::free(_scratch_classes);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   239
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
   240
  // Reset the_class to null for error printing.
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
   241
  _the_class = NULL;
31234
48000028382c 8081219: hs_err improvement: Add event logging for class redefinition to the hs_err file
coleenp
parents: 30773
diff changeset
   242
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   243
  if (log_is_enabled(Info, redefine, class, timer)) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   244
    // Used to have separate timers for "doit" and "all", but the timer
489c9b5090e2 Initial load
duke
parents:
diff changeset
   245
    // overhead skewed the measurements.
46630
75aa3e39d02c 8182299: Enable disabled clang warnings, build on OSX 10 + Xcode 8
jwilhelm
parents: 46505
diff changeset
   246
    julong doit_time = _timer_rsc_phase1.milliseconds() +
75aa3e39d02c 8182299: Enable disabled clang warnings, build on OSX 10 + Xcode 8
jwilhelm
parents: 46505
diff changeset
   247
                       _timer_rsc_phase2.milliseconds();
75aa3e39d02c 8182299: Enable disabled clang warnings, build on OSX 10 + Xcode 8
jwilhelm
parents: 46505
diff changeset
   248
    julong all_time = _timer_vm_op_prologue.milliseconds() + doit_time;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   249
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   250
    log_info(redefine, class, timer)
46630
75aa3e39d02c 8182299: Enable disabled clang warnings, build on OSX 10 + Xcode 8
jwilhelm
parents: 46505
diff changeset
   251
      ("vm_op: all=" JULONG_FORMAT "  prologue=" JULONG_FORMAT "  doit=" JULONG_FORMAT,
75aa3e39d02c 8182299: Enable disabled clang warnings, build on OSX 10 + Xcode 8
jwilhelm
parents: 46505
diff changeset
   252
       all_time, (julong)_timer_vm_op_prologue.milliseconds(), doit_time);
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   253
    log_info(redefine, class, timer)
46630
75aa3e39d02c 8182299: Enable disabled clang warnings, build on OSX 10 + Xcode 8
jwilhelm
parents: 46505
diff changeset
   254
      ("redefine_single_class: phase1=" JULONG_FORMAT "  phase2=" JULONG_FORMAT,
75aa3e39d02c 8182299: Enable disabled clang warnings, build on OSX 10 + Xcode 8
jwilhelm
parents: 46505
diff changeset
   255
       (julong)_timer_rsc_phase1.milliseconds(), (julong)_timer_rsc_phase2.milliseconds());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   256
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   257
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   258
489c9b5090e2 Initial load
duke
parents:
diff changeset
   259
bool VM_RedefineClasses::is_modifiable_class(oop klass_mirror) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   260
  // classes for primitives cannot be redefined
489c9b5090e2 Initial load
duke
parents:
diff changeset
   261
  if (java_lang_Class::is_primitive(klass_mirror)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   262
    return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   263
  }
40635
22fa174b2af8 8145964: NoClassDefFound error in transforming lambdas
coleenp
parents: 38309
diff changeset
   264
  Klass* k = java_lang_Class::as_Klass(klass_mirror);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   265
  // classes for arrays cannot be redefined
40635
22fa174b2af8 8145964: NoClassDefFound error in transforming lambdas
coleenp
parents: 38309
diff changeset
   266
  if (k == NULL || !k->is_instance_klass()) {
22fa174b2af8 8145964: NoClassDefFound error in transforming lambdas
coleenp
parents: 38309
diff changeset
   267
    return false;
22fa174b2af8 8145964: NoClassDefFound error in transforming lambdas
coleenp
parents: 38309
diff changeset
   268
  }
22fa174b2af8 8145964: NoClassDefFound error in transforming lambdas
coleenp
parents: 38309
diff changeset
   269
22fa174b2af8 8145964: NoClassDefFound error in transforming lambdas
coleenp
parents: 38309
diff changeset
   270
  // Cannot redefine or retransform an anonymous class.
22fa174b2af8 8145964: NoClassDefFound error in transforming lambdas
coleenp
parents: 38309
diff changeset
   271
  if (InstanceKlass::cast(k)->is_anonymous()) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   272
    return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   273
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   274
  return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   275
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   276
489c9b5090e2 Initial load
duke
parents:
diff changeset
   277
// Append the current entry at scratch_i in scratch_cp to *merge_cp_p
489c9b5090e2 Initial load
duke
parents:
diff changeset
   278
// where the end of *merge_cp_p is specified by *merge_cp_length_p. For
489c9b5090e2 Initial load
duke
parents:
diff changeset
   279
// direct CP entries, there is just the current entry to append. For
489c9b5090e2 Initial load
duke
parents:
diff changeset
   280
// indirect and double-indirect CP entries, there are zero or more
489c9b5090e2 Initial load
duke
parents:
diff changeset
   281
// referenced CP entries along with the current entry to append.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   282
// Indirect and double-indirect CP entries are handled by recursive
489c9b5090e2 Initial load
duke
parents:
diff changeset
   283
// calls to append_entry() as needed. The referenced CP entries are
489c9b5090e2 Initial load
duke
parents:
diff changeset
   284
// always appended to *merge_cp_p before the referee CP entry. These
489c9b5090e2 Initial load
duke
parents:
diff changeset
   285
// referenced CP entries may already exist in *merge_cp_p in which case
489c9b5090e2 Initial load
duke
parents:
diff changeset
   286
// there is nothing extra to append and only the current entry is
489c9b5090e2 Initial load
duke
parents:
diff changeset
   287
// appended.
33593
60764a78fa5c 8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents: 33148
diff changeset
   288
void VM_RedefineClasses::append_entry(const constantPoolHandle& scratch_cp,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   289
       int scratch_i, constantPoolHandle *merge_cp_p, int *merge_cp_length_p,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   290
       TRAPS) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   291
489c9b5090e2 Initial load
duke
parents:
diff changeset
   292
  // append is different depending on entry tag type
489c9b5090e2 Initial load
duke
parents:
diff changeset
   293
  switch (scratch_cp->tag_at(scratch_i).value()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   294
489c9b5090e2 Initial load
duke
parents:
diff changeset
   295
    // The old verifier is implemented outside the VM. It loads classes,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   296
    // but does not resolve constant pool entries directly so we never
489c9b5090e2 Initial load
duke
parents:
diff changeset
   297
    // see Class entries here with the old verifier. Similarly the old
489c9b5090e2 Initial load
duke
parents:
diff changeset
   298
    // verifier does not like Class entries in the input constant pool.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   299
    // The split-verifier is implemented in the VM so it can optionally
489c9b5090e2 Initial load
duke
parents:
diff changeset
   300
    // and directly resolve constant pool entries to load classes. The
489c9b5090e2 Initial load
duke
parents:
diff changeset
   301
    // split-verifier can accept either Class entries or UnresolvedClass
489c9b5090e2 Initial load
duke
parents:
diff changeset
   302
    // entries in the input constant pool. We revert the appended copy
489c9b5090e2 Initial load
duke
parents:
diff changeset
   303
    // back to UnresolvedClass so that either verifier will be happy
489c9b5090e2 Initial load
duke
parents:
diff changeset
   304
    // with the constant pool entry.
46427
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46408
diff changeset
   305
    //
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46408
diff changeset
   306
    // this is an indirect CP entry so it needs special handling
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   307
    case JVM_CONSTANT_Class:
46427
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46408
diff changeset
   308
    case JVM_CONSTANT_UnresolvedClass:
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   309
    {
46427
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46408
diff changeset
   310
      int name_i = scratch_cp->klass_name_index_at(scratch_i);
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46408
diff changeset
   311
      int new_name_i = find_or_append_indirect_entry(scratch_cp, name_i, merge_cp_p,
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46408
diff changeset
   312
                                                     merge_cp_length_p, THREAD);
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46408
diff changeset
   313
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46408
diff changeset
   314
      if (new_name_i != name_i) {
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46408
diff changeset
   315
        log_trace(redefine, class, constantpool)
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46408
diff changeset
   316
          ("Class entry@%d name_index change: %d to %d",
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46408
diff changeset
   317
           *merge_cp_length_p, name_i, new_name_i);
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46408
diff changeset
   318
      }
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46408
diff changeset
   319
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46408
diff changeset
   320
      (*merge_cp_p)->temp_unresolved_klass_at_put(*merge_cp_length_p, new_name_i);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   321
      if (scratch_i != *merge_cp_length_p) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   322
        // The new entry in *merge_cp_p is at a different index than
489c9b5090e2 Initial load
duke
parents:
diff changeset
   323
        // the new entry in scratch_cp so we need to map the index values.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   324
        map_index(scratch_cp, scratch_i, *merge_cp_length_p);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   325
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   326
      (*merge_cp_length_p)++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   327
    } break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   328
489c9b5090e2 Initial load
duke
parents:
diff changeset
   329
    // these are direct CP entries so they can be directly appended,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   330
    // but double and long take two constant pool entries
489c9b5090e2 Initial load
duke
parents:
diff changeset
   331
    case JVM_CONSTANT_Double:  // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   332
    case JVM_CONSTANT_Long:
489c9b5090e2 Initial load
duke
parents:
diff changeset
   333
    {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   334
      ConstantPool::copy_entry_to(scratch_cp, scratch_i, *merge_cp_p, *merge_cp_length_p,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   335
        THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   336
489c9b5090e2 Initial load
duke
parents:
diff changeset
   337
      if (scratch_i != *merge_cp_length_p) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   338
        // The new entry in *merge_cp_p is at a different index than
489c9b5090e2 Initial load
duke
parents:
diff changeset
   339
        // the new entry in scratch_cp so we need to map the index values.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   340
        map_index(scratch_cp, scratch_i, *merge_cp_length_p);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   341
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   342
      (*merge_cp_length_p) += 2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   343
    } break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   344
489c9b5090e2 Initial load
duke
parents:
diff changeset
   345
    // these are direct CP entries so they can be directly appended
489c9b5090e2 Initial load
duke
parents:
diff changeset
   346
    case JVM_CONSTANT_Float:   // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   347
    case JVM_CONSTANT_Integer: // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   348
    case JVM_CONSTANT_Utf8:    // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   349
489c9b5090e2 Initial load
duke
parents:
diff changeset
   350
    // This was an indirect CP entry, but it has been changed into
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   351
    // Symbol*s so this entry can be directly appended.
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   352
    case JVM_CONSTANT_String:      // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   353
    {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   354
      ConstantPool::copy_entry_to(scratch_cp, scratch_i, *merge_cp_p, *merge_cp_length_p,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   355
        THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   356
489c9b5090e2 Initial load
duke
parents:
diff changeset
   357
      if (scratch_i != *merge_cp_length_p) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   358
        // The new entry in *merge_cp_p is at a different index than
489c9b5090e2 Initial load
duke
parents:
diff changeset
   359
        // the new entry in scratch_cp so we need to map the index values.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   360
        map_index(scratch_cp, scratch_i, *merge_cp_length_p);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   361
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   362
      (*merge_cp_length_p)++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   363
    } break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   364
489c9b5090e2 Initial load
duke
parents:
diff changeset
   365
    // this is an indirect CP entry so it needs special handling
489c9b5090e2 Initial load
duke
parents:
diff changeset
   366
    case JVM_CONSTANT_NameAndType:
489c9b5090e2 Initial load
duke
parents:
diff changeset
   367
    {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   368
      int name_ref_i = scratch_cp->name_ref_index_at(scratch_i);
15444
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   369
      int new_name_ref_i = find_or_append_indirect_entry(scratch_cp, name_ref_i, merge_cp_p,
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   370
                                                         merge_cp_length_p, THREAD);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   371
489c9b5090e2 Initial load
duke
parents:
diff changeset
   372
      int signature_ref_i = scratch_cp->signature_ref_index_at(scratch_i);
15444
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   373
      int new_signature_ref_i = find_or_append_indirect_entry(scratch_cp, signature_ref_i,
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   374
                                                              merge_cp_p, merge_cp_length_p,
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   375
                                                              THREAD);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   376
489c9b5090e2 Initial load
duke
parents:
diff changeset
   377
      // If the referenced entries already exist in *merge_cp_p, then
489c9b5090e2 Initial load
duke
parents:
diff changeset
   378
      // both new_name_ref_i and new_signature_ref_i will both be 0.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   379
      // In that case, all we are appending is the current entry.
15444
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   380
      if (new_name_ref_i != name_ref_i) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   381
        log_trace(redefine, class, constantpool)
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   382
          ("NameAndType entry@%d name_ref_index change: %d to %d",
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   383
           *merge_cp_length_p, name_ref_i, new_name_ref_i);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   384
      }
15444
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   385
      if (new_signature_ref_i != signature_ref_i) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   386
        log_trace(redefine, class, constantpool)
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   387
          ("NameAndType entry@%d signature_ref_index change: %d to %d",
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   388
           *merge_cp_length_p, signature_ref_i, new_signature_ref_i);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   389
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   390
489c9b5090e2 Initial load
duke
parents:
diff changeset
   391
      (*merge_cp_p)->name_and_type_at_put(*merge_cp_length_p,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   392
        new_name_ref_i, new_signature_ref_i);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   393
      if (scratch_i != *merge_cp_length_p) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   394
        // The new entry in *merge_cp_p is at a different index than
489c9b5090e2 Initial load
duke
parents:
diff changeset
   395
        // the new entry in scratch_cp so we need to map the index values.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   396
        map_index(scratch_cp, scratch_i, *merge_cp_length_p);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   397
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   398
      (*merge_cp_length_p)++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   399
    } break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   400
489c9b5090e2 Initial load
duke
parents:
diff changeset
   401
    // this is a double-indirect CP entry so it needs special handling
489c9b5090e2 Initial load
duke
parents:
diff changeset
   402
    case JVM_CONSTANT_Fieldref:           // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   403
    case JVM_CONSTANT_InterfaceMethodref: // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   404
    case JVM_CONSTANT_Methodref:
489c9b5090e2 Initial load
duke
parents:
diff changeset
   405
    {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   406
      int klass_ref_i = scratch_cp->uncached_klass_ref_index_at(scratch_i);
15444
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   407
      int new_klass_ref_i = find_or_append_indirect_entry(scratch_cp, klass_ref_i,
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   408
                                                          merge_cp_p, merge_cp_length_p, THREAD);
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   409
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   410
      int name_and_type_ref_i = scratch_cp->uncached_name_and_type_ref_index_at(scratch_i);
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   411
      int new_name_and_type_ref_i = find_or_append_indirect_entry(scratch_cp, name_and_type_ref_i,
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   412
                                                          merge_cp_p, merge_cp_length_p, THREAD);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   413
33589
7cbd1b2c139b 8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
goetz
parents: 33148
diff changeset
   414
      const char *entry_name = NULL;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   415
      switch (scratch_cp->tag_at(scratch_i).value()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   416
      case JVM_CONSTANT_Fieldref:
489c9b5090e2 Initial load
duke
parents:
diff changeset
   417
        entry_name = "Fieldref";
489c9b5090e2 Initial load
duke
parents:
diff changeset
   418
        (*merge_cp_p)->field_at_put(*merge_cp_length_p, new_klass_ref_i,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   419
          new_name_and_type_ref_i);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   420
        break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   421
      case JVM_CONSTANT_InterfaceMethodref:
489c9b5090e2 Initial load
duke
parents:
diff changeset
   422
        entry_name = "IFMethodref";
489c9b5090e2 Initial load
duke
parents:
diff changeset
   423
        (*merge_cp_p)->interface_method_at_put(*merge_cp_length_p,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   424
          new_klass_ref_i, new_name_and_type_ref_i);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   425
        break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   426
      case JVM_CONSTANT_Methodref:
489c9b5090e2 Initial load
duke
parents:
diff changeset
   427
        entry_name = "Methodref";
489c9b5090e2 Initial load
duke
parents:
diff changeset
   428
        (*merge_cp_p)->method_at_put(*merge_cp_length_p, new_klass_ref_i,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   429
          new_name_and_type_ref_i);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   430
        break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   431
      default:
489c9b5090e2 Initial load
duke
parents:
diff changeset
   432
        guarantee(false, "bad switch");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   433
        break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   434
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   435
489c9b5090e2 Initial load
duke
parents:
diff changeset
   436
      if (klass_ref_i != new_klass_ref_i) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   437
        log_trace(redefine, class, constantpool)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   438
          ("%s entry@%d class_index changed: %d to %d", entry_name, *merge_cp_length_p, klass_ref_i, new_klass_ref_i);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   439
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   440
      if (name_and_type_ref_i != new_name_and_type_ref_i) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   441
        log_trace(redefine, class, constantpool)
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   442
          ("%s entry@%d name_and_type_index changed: %d to %d",
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   443
           entry_name, *merge_cp_length_p, name_and_type_ref_i, new_name_and_type_ref_i);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   444
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   445
489c9b5090e2 Initial load
duke
parents:
diff changeset
   446
      if (scratch_i != *merge_cp_length_p) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   447
        // The new entry in *merge_cp_p is at a different index than
489c9b5090e2 Initial load
duke
parents:
diff changeset
   448
        // the new entry in scratch_cp so we need to map the index values.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   449
        map_index(scratch_cp, scratch_i, *merge_cp_length_p);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   450
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   451
      (*merge_cp_length_p)++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   452
    } break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   453
15444
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   454
    // this is an indirect CP entry so it needs special handling
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   455
    case JVM_CONSTANT_MethodType:
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   456
    {
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   457
      int ref_i = scratch_cp->method_type_index_at(scratch_i);
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   458
      int new_ref_i = find_or_append_indirect_entry(scratch_cp, ref_i, merge_cp_p,
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   459
                                                    merge_cp_length_p, THREAD);
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   460
      if (new_ref_i != ref_i) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   461
        log_trace(redefine, class, constantpool)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   462
          ("MethodType entry@%d ref_index change: %d to %d", *merge_cp_length_p, ref_i, new_ref_i);
15444
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   463
      }
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   464
      (*merge_cp_p)->method_type_index_at_put(*merge_cp_length_p, new_ref_i);
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   465
      if (scratch_i != *merge_cp_length_p) {
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   466
        // The new entry in *merge_cp_p is at a different index than
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   467
        // the new entry in scratch_cp so we need to map the index values.
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   468
        map_index(scratch_cp, scratch_i, *merge_cp_length_p);
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   469
      }
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   470
      (*merge_cp_length_p)++;
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   471
    } break;
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   472
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   473
    // this is an indirect CP entry so it needs special handling
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   474
    case JVM_CONSTANT_MethodHandle:
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   475
    {
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   476
      int ref_kind = scratch_cp->method_handle_ref_kind_at(scratch_i);
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   477
      int ref_i = scratch_cp->method_handle_index_at(scratch_i);
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   478
      int new_ref_i = find_or_append_indirect_entry(scratch_cp, ref_i, merge_cp_p,
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   479
                                                    merge_cp_length_p, THREAD);
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   480
      if (new_ref_i != ref_i) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   481
        log_trace(redefine, class, constantpool)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   482
          ("MethodHandle entry@%d ref_index change: %d to %d", *merge_cp_length_p, ref_i, new_ref_i);
15444
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   483
      }
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   484
      (*merge_cp_p)->method_handle_index_at_put(*merge_cp_length_p, ref_kind, new_ref_i);
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   485
      if (scratch_i != *merge_cp_length_p) {
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   486
        // The new entry in *merge_cp_p is at a different index than
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   487
        // the new entry in scratch_cp so we need to map the index values.
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   488
        map_index(scratch_cp, scratch_i, *merge_cp_length_p);
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   489
      }
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   490
      (*merge_cp_length_p)++;
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   491
    } break;
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   492
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   493
    // this is an indirect CP entry so it needs special handling
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   494
    case JVM_CONSTANT_InvokeDynamic:
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   495
    {
17077
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   496
      // Index of the bootstrap specifier in the operands array
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   497
      int old_bs_i = scratch_cp->invoke_dynamic_bootstrap_specifier_index(scratch_i);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   498
      int new_bs_i = find_or_append_operand(scratch_cp, old_bs_i, merge_cp_p,
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   499
                                            merge_cp_length_p, THREAD);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   500
      // The bootstrap method NameAndType_info index
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   501
      int old_ref_i = scratch_cp->invoke_dynamic_name_and_type_ref_index_at(scratch_i);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   502
      int new_ref_i = find_or_append_indirect_entry(scratch_cp, old_ref_i, merge_cp_p,
15444
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   503
                                                    merge_cp_length_p, THREAD);
17077
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   504
      if (new_bs_i != old_bs_i) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   505
        log_trace(redefine, class, constantpool)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   506
          ("InvokeDynamic entry@%d bootstrap_method_attr_index change: %d to %d",
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   507
           *merge_cp_length_p, old_bs_i, new_bs_i);
15444
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   508
      }
17077
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   509
      if (new_ref_i != old_ref_i) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   510
        log_trace(redefine, class, constantpool)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   511
          ("InvokeDynamic entry@%d name_and_type_index change: %d to %d", *merge_cp_length_p, old_ref_i, new_ref_i);
17077
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   512
      }
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   513
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   514
      (*merge_cp_p)->invoke_dynamic_at_put(*merge_cp_length_p, new_bs_i, new_ref_i);
15444
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   515
      if (scratch_i != *merge_cp_length_p) {
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   516
        // The new entry in *merge_cp_p is at a different index than
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   517
        // the new entry in scratch_cp so we need to map the index values.
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   518
        map_index(scratch_cp, scratch_i, *merge_cp_length_p);
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   519
      }
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   520
      (*merge_cp_length_p)++;
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   521
    } break;
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   522
46427
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46408
diff changeset
   523
    // At this stage, Class or UnresolvedClass could be in scratch_cp, but not
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   524
    // ClassIndex
489c9b5090e2 Initial load
duke
parents:
diff changeset
   525
    case JVM_CONSTANT_ClassIndex: // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   526
489c9b5090e2 Initial load
duke
parents:
diff changeset
   527
    // Invalid is used as the tag for the second constant pool entry
489c9b5090e2 Initial load
duke
parents:
diff changeset
   528
    // occupied by JVM_CONSTANT_Double or JVM_CONSTANT_Long. It should
489c9b5090e2 Initial load
duke
parents:
diff changeset
   529
    // not be seen by itself.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   530
    case JVM_CONSTANT_Invalid: // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   531
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   532
    // At this stage, String could be here, but not StringIndex
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   533
    case JVM_CONSTANT_StringIndex: // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   534
489c9b5090e2 Initial load
duke
parents:
diff changeset
   535
    // At this stage JVM_CONSTANT_UnresolvedClassInError should not be
489c9b5090e2 Initial load
duke
parents:
diff changeset
   536
    // here
489c9b5090e2 Initial load
duke
parents:
diff changeset
   537
    case JVM_CONSTANT_UnresolvedClassInError: // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   538
489c9b5090e2 Initial load
duke
parents:
diff changeset
   539
    default:
489c9b5090e2 Initial load
duke
parents:
diff changeset
   540
    {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   541
      // leave a breadcrumb
489c9b5090e2 Initial load
duke
parents:
diff changeset
   542
      jbyte bad_value = scratch_cp->tag_at(scratch_i).value();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   543
      ShouldNotReachHere();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   544
    } break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   545
  } // end switch tag value
489c9b5090e2 Initial load
duke
parents:
diff changeset
   546
} // end append_entry()
489c9b5090e2 Initial load
duke
parents:
diff changeset
   547
489c9b5090e2 Initial load
duke
parents:
diff changeset
   548
33593
60764a78fa5c 8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents: 33148
diff changeset
   549
int VM_RedefineClasses::find_or_append_indirect_entry(const constantPoolHandle& scratch_cp,
15444
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   550
      int ref_i, constantPoolHandle *merge_cp_p, int *merge_cp_length_p, TRAPS) {
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   551
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   552
  int new_ref_i = ref_i;
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   553
  bool match = (ref_i < *merge_cp_length_p) &&
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   554
               scratch_cp->compare_entry_to(ref_i, *merge_cp_p, ref_i, THREAD);
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   555
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   556
  if (!match) {
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   557
    // forward reference in *merge_cp_p or not a direct match
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   558
    int found_i = scratch_cp->find_matching_entry(ref_i, *merge_cp_p, THREAD);
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   559
    if (found_i != 0) {
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   560
      guarantee(found_i != ref_i, "compare_entry_to() and find_matching_entry() do not agree");
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   561
      // Found a matching entry somewhere else in *merge_cp_p so just need a mapping entry.
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   562
      new_ref_i = found_i;
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   563
      map_index(scratch_cp, ref_i, found_i);
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   564
    } else {
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   565
      // no match found so we have to append this entry to *merge_cp_p
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   566
      append_entry(scratch_cp, ref_i, merge_cp_p, merge_cp_length_p, THREAD);
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   567
      // The above call to append_entry() can only append one entry
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   568
      // so the post call query of *merge_cp_length_p is only for
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   569
      // the sake of consistency.
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   570
      new_ref_i = *merge_cp_length_p - 1;
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   571
    }
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   572
  }
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   573
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   574
  return new_ref_i;
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   575
} // end find_or_append_indirect_entry()
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   576
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   577
17077
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   578
// Append a bootstrap specifier into the merge_cp operands that is semantically equal
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   579
// to the scratch_cp operands bootstrap specifier passed by the old_bs_i index.
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   580
// Recursively append new merge_cp entries referenced by the new bootstrap specifier.
33593
60764a78fa5c 8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents: 33148
diff changeset
   581
void VM_RedefineClasses::append_operand(const constantPoolHandle& scratch_cp, int old_bs_i,
17077
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   582
       constantPoolHandle *merge_cp_p, int *merge_cp_length_p, TRAPS) {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   583
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   584
  int old_ref_i = scratch_cp->operand_bootstrap_method_ref_index_at(old_bs_i);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   585
  int new_ref_i = find_or_append_indirect_entry(scratch_cp, old_ref_i, merge_cp_p,
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   586
                                                merge_cp_length_p, THREAD);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   587
  if (new_ref_i != old_ref_i) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   588
    log_trace(redefine, class, constantpool)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   589
      ("operands entry@%d bootstrap method ref_index change: %d to %d", _operands_cur_length, old_ref_i, new_ref_i);
17077
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   590
  }
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   591
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   592
  Array<u2>* merge_ops = (*merge_cp_p)->operands();
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   593
  int new_bs_i = _operands_cur_length;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   594
  // We have _operands_cur_length == 0 when the merge_cp operands is empty yet.
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   595
  // However, the operand_offset_at(0) was set in the extend_operands() call.
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   596
  int new_base = (new_bs_i == 0) ? (*merge_cp_p)->operand_offset_at(0)
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   597
                                 : (*merge_cp_p)->operand_next_offset_at(new_bs_i - 1);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   598
  int argc     = scratch_cp->operand_argument_count_at(old_bs_i);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   599
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   600
  ConstantPool::operand_offset_at_put(merge_ops, _operands_cur_length, new_base);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   601
  merge_ops->at_put(new_base++, new_ref_i);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   602
  merge_ops->at_put(new_base++, argc);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   603
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   604
  for (int i = 0; i < argc; i++) {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   605
    int old_arg_ref_i = scratch_cp->operand_argument_index_at(old_bs_i, i);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   606
    int new_arg_ref_i = find_or_append_indirect_entry(scratch_cp, old_arg_ref_i, merge_cp_p,
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   607
                                                      merge_cp_length_p, THREAD);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   608
    merge_ops->at_put(new_base++, new_arg_ref_i);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   609
    if (new_arg_ref_i != old_arg_ref_i) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   610
      log_trace(redefine, class, constantpool)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   611
        ("operands entry@%d bootstrap method argument ref_index change: %d to %d",
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   612
         _operands_cur_length, old_arg_ref_i, new_arg_ref_i);
17077
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   613
    }
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   614
  }
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   615
  if (old_bs_i != _operands_cur_length) {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   616
    // The bootstrap specifier in *merge_cp_p is at a different index than
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   617
    // that in scratch_cp so we need to map the index values.
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   618
    map_operand_index(old_bs_i, new_bs_i);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   619
  }
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   620
  _operands_cur_length++;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   621
} // end append_operand()
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   622
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   623
33593
60764a78fa5c 8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents: 33148
diff changeset
   624
int VM_RedefineClasses::find_or_append_operand(const constantPoolHandle& scratch_cp,
17077
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   625
      int old_bs_i, constantPoolHandle *merge_cp_p, int *merge_cp_length_p, TRAPS) {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   626
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   627
  int new_bs_i = old_bs_i; // bootstrap specifier index
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   628
  bool match = (old_bs_i < _operands_cur_length) &&
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   629
               scratch_cp->compare_operand_to(old_bs_i, *merge_cp_p, old_bs_i, THREAD);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   630
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   631
  if (!match) {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   632
    // forward reference in *merge_cp_p or not a direct match
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   633
    int found_i = scratch_cp->find_matching_operand(old_bs_i, *merge_cp_p,
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   634
                                                    _operands_cur_length, THREAD);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   635
    if (found_i != -1) {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   636
      guarantee(found_i != old_bs_i, "compare_operand_to() and find_matching_operand() disagree");
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   637
      // found a matching operand somewhere else in *merge_cp_p so just need a mapping
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   638
      new_bs_i = found_i;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   639
      map_operand_index(old_bs_i, found_i);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   640
    } else {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   641
      // no match found so we have to append this bootstrap specifier to *merge_cp_p
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   642
      append_operand(scratch_cp, old_bs_i, merge_cp_p, merge_cp_length_p, THREAD);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   643
      new_bs_i = _operands_cur_length - 1;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   644
    }
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   645
  }
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   646
  return new_bs_i;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   647
} // end find_or_append_operand()
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   648
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   649
33593
60764a78fa5c 8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents: 33148
diff changeset
   650
void VM_RedefineClasses::finalize_operands_merge(const constantPoolHandle& merge_cp, TRAPS) {
17077
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   651
  if (merge_cp->operands() == NULL) {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   652
    return;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   653
  }
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   654
  // Shrink the merge_cp operands
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   655
  merge_cp->shrink_operands(_operands_cur_length, CHECK);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   656
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   657
  if (log_is_enabled(Trace, redefine, class, constantpool)) {
17077
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   658
    // don't want to loop unless we are tracing
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   659
    int count = 0;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   660
    for (int i = 1; i < _operands_index_map_p->length(); i++) {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   661
      int value = _operands_index_map_p->at(i);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   662
      if (value != -1) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   663
        log_trace(redefine, class, constantpool)("operands_index_map[%d]: old=%d new=%d", count, i, value);
17077
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   664
        count++;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   665
      }
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   666
    }
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   667
  }
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   668
  // Clean-up
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   669
  _operands_index_map_p = NULL;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   670
  _operands_cur_length = 0;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   671
  _operands_index_map_count = 0;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   672
} // end finalize_operands_merge()
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   673
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   674
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   675
jvmtiError VM_RedefineClasses::compare_and_normalize_class_versions(
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
   676
             InstanceKlass* the_class,
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
   677
             InstanceKlass* scratch_class) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   678
  int i;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   679
489c9b5090e2 Initial load
duke
parents:
diff changeset
   680
  // Check superclasses, or rather their names, since superclasses themselves can be
489c9b5090e2 Initial load
duke
parents:
diff changeset
   681
  // requested to replace.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   682
  // Check for NULL superclass first since this might be java.lang.Object
489c9b5090e2 Initial load
duke
parents:
diff changeset
   683
  if (the_class->super() != scratch_class->super() &&
489c9b5090e2 Initial load
duke
parents:
diff changeset
   684
      (the_class->super() == NULL || scratch_class->super() == NULL ||
14488
ab48109f7d1b 8001471: Klass::cast() does nothing
hseigel
parents: 13952
diff changeset
   685
       the_class->super()->name() !=
ab48109f7d1b 8001471: Klass::cast() does nothing
hseigel
parents: 13952
diff changeset
   686
       scratch_class->super()->name())) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   687
    return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_HIERARCHY_CHANGED;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   688
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   689
489c9b5090e2 Initial load
duke
parents:
diff changeset
   690
  // Check if the number, names and order of directly implemented interfaces are the same.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   691
  // I think in principle we should just check if the sets of names of directly implemented
489c9b5090e2 Initial load
duke
parents:
diff changeset
   692
  // interfaces are the same, i.e. the order of declaration (which, however, if changed in the
489c9b5090e2 Initial load
duke
parents:
diff changeset
   693
  // .java file, also changes in .class file) should not matter. However, comparing sets is
489c9b5090e2 Initial load
duke
parents:
diff changeset
   694
  // technically a bit more difficult, and, more importantly, I am not sure at present that the
489c9b5090e2 Initial load
duke
parents:
diff changeset
   695
  // order of interfaces does not matter on the implementation level, i.e. that the VM does not
489c9b5090e2 Initial load
duke
parents:
diff changeset
   696
  // rely on it somewhere.
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   697
  Array<Klass*>* k_interfaces = the_class->local_interfaces();
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   698
  Array<Klass*>* k_new_interfaces = scratch_class->local_interfaces();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   699
  int n_intfs = k_interfaces->length();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   700
  if (n_intfs != k_new_interfaces->length()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   701
    return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_HIERARCHY_CHANGED;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   702
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   703
  for (i = 0; i < n_intfs; i++) {
14488
ab48109f7d1b 8001471: Klass::cast() does nothing
hseigel
parents: 13952
diff changeset
   704
    if (k_interfaces->at(i)->name() !=
ab48109f7d1b 8001471: Klass::cast() does nothing
hseigel
parents: 13952
diff changeset
   705
        k_new_interfaces->at(i)->name()) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   706
      return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_HIERARCHY_CHANGED;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   707
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   708
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   709
489c9b5090e2 Initial load
duke
parents:
diff changeset
   710
  // Check whether class is in the error init state.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   711
  if (the_class->is_in_error_state()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   712
    // TBD #5057930: special error code is needed in 1.6
489c9b5090e2 Initial load
duke
parents:
diff changeset
   713
    return JVMTI_ERROR_INVALID_CLASS;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   714
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   715
489c9b5090e2 Initial load
duke
parents:
diff changeset
   716
  // Check whether class modifiers are the same.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   717
  jushort old_flags = (jushort) the_class->access_flags().get_flags();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   718
  jushort new_flags = (jushort) scratch_class->access_flags().get_flags();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   719
  if (old_flags != new_flags) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   720
    return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_CLASS_MODIFIERS_CHANGED;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   721
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   722
489c9b5090e2 Initial load
duke
parents:
diff changeset
   723
  // Check if the number, names, types and order of fields declared in these classes
489c9b5090e2 Initial load
duke
parents:
diff changeset
   724
  // are the same.
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
   725
  JavaFieldStream old_fs(the_class);
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
   726
  JavaFieldStream new_fs(scratch_class);
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
   727
  for (; !old_fs.done() && !new_fs.done(); old_fs.next(), new_fs.next()) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   728
    // access
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
   729
    old_flags = old_fs.access_flags().as_short();
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
   730
    new_flags = new_fs.access_flags().as_short();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   731
    if ((old_flags ^ new_flags) & JVM_RECOGNIZED_FIELD_MODIFIERS) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   732
      return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_SCHEMA_CHANGED;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   733
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   734
    // offset
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
   735
    if (old_fs.offset() != new_fs.offset()) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   736
      return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_SCHEMA_CHANGED;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   737
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   738
    // name and signature
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
   739
    Symbol* name_sym1 = the_class->constants()->symbol_at(old_fs.name_index());
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
   740
    Symbol* sig_sym1 = the_class->constants()->symbol_at(old_fs.signature_index());
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
   741
    Symbol* name_sym2 = scratch_class->constants()->symbol_at(new_fs.name_index());
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
   742
    Symbol* sig_sym2 = scratch_class->constants()->symbol_at(new_fs.signature_index());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   743
    if (name_sym1 != name_sym2 || sig_sym1 != sig_sym2) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   744
      return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_SCHEMA_CHANGED;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   745
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   746
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   747
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
   748
  // If both streams aren't done then we have a differing number of
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
   749
  // fields.
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
   750
  if (!old_fs.done() || !new_fs.done()) {
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
   751
    return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_SCHEMA_CHANGED;
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
   752
  }
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
   753
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   754
  // Do a parallel walk through the old and new methods. Detect
489c9b5090e2 Initial load
duke
parents:
diff changeset
   755
  // cases where they match (exist in both), have been added in
489c9b5090e2 Initial load
duke
parents:
diff changeset
   756
  // the new methods, or have been deleted (exist only in the
489c9b5090e2 Initial load
duke
parents:
diff changeset
   757
  // old methods).  The class file parser places methods in order
489c9b5090e2 Initial load
duke
parents:
diff changeset
   758
  // by method name, but does not order overloaded methods by
489c9b5090e2 Initial load
duke
parents:
diff changeset
   759
  // signature.  In order to determine what fate befell the methods,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   760
  // this code places the overloaded new methods that have matching
489c9b5090e2 Initial load
duke
parents:
diff changeset
   761
  // old methods in the same order as the old methods and places
489c9b5090e2 Initial load
duke
parents:
diff changeset
   762
  // new overloaded methods at the end of overloaded methods of
489c9b5090e2 Initial load
duke
parents:
diff changeset
   763
  // that name. The code for this order normalization is adapted
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   764
  // from the algorithm used in InstanceKlass::find_method().
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   765
  // Since we are swapping out of order entries as we find them,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   766
  // we only have to search forward through the overloaded methods.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   767
  // Methods which are added and have the same name as an existing
489c9b5090e2 Initial load
duke
parents:
diff changeset
   768
  // method (but different signature) will be put at the end of
489c9b5090e2 Initial load
duke
parents:
diff changeset
   769
  // the methods with that name, and the name mismatch code will
489c9b5090e2 Initial load
duke
parents:
diff changeset
   770
  // handle them.
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   771
  Array<Method*>* k_old_methods(the_class->methods());
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   772
  Array<Method*>* k_new_methods(scratch_class->methods());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   773
  int n_old_methods = k_old_methods->length();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   774
  int n_new_methods = k_new_methods->length();
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   775
  Thread* thread = Thread::current();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   776
489c9b5090e2 Initial load
duke
parents:
diff changeset
   777
  int ni = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   778
  int oi = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   779
  while (true) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   780
    Method* k_old_method;
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   781
    Method* k_new_method;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   782
    enum { matched, added, deleted, undetermined } method_was = undetermined;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   783
489c9b5090e2 Initial load
duke
parents:
diff changeset
   784
    if (oi >= n_old_methods) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   785
      if (ni >= n_new_methods) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   786
        break; // we've looked at everything, done
489c9b5090e2 Initial load
duke
parents:
diff changeset
   787
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   788
      // New method at the end
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   789
      k_new_method = k_new_methods->at(ni);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   790
      method_was = added;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   791
    } else if (ni >= n_new_methods) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   792
      // Old method, at the end, is deleted
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   793
      k_old_method = k_old_methods->at(oi);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   794
      method_was = deleted;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   795
    } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   796
      // There are more methods in both the old and new lists
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   797
      k_old_method = k_old_methods->at(oi);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   798
      k_new_method = k_new_methods->at(ni);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   799
      if (k_old_method->name() != k_new_method->name()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   800
        // Methods are sorted by method name, so a mismatch means added
489c9b5090e2 Initial load
duke
parents:
diff changeset
   801
        // or deleted
489c9b5090e2 Initial load
duke
parents:
diff changeset
   802
        if (k_old_method->name()->fast_compare(k_new_method->name()) > 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   803
          method_was = added;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   804
        } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   805
          method_was = deleted;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   806
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   807
      } else if (k_old_method->signature() == k_new_method->signature()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   808
        // Both the name and signature match
489c9b5090e2 Initial load
duke
parents:
diff changeset
   809
        method_was = matched;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   810
      } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   811
        // The name matches, but the signature doesn't, which means we have to
489c9b5090e2 Initial load
duke
parents:
diff changeset
   812
        // search forward through the new overloaded methods.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   813
        int nj;  // outside the loop for post-loop check
489c9b5090e2 Initial load
duke
parents:
diff changeset
   814
        for (nj = ni + 1; nj < n_new_methods; nj++) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   815
          Method* m = k_new_methods->at(nj);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   816
          if (k_old_method->name() != m->name()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   817
            // reached another method name so no more overloaded methods
489c9b5090e2 Initial load
duke
parents:
diff changeset
   818
            method_was = deleted;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   819
            break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   820
          }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   821
          if (k_old_method->signature() == m->signature()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   822
            // found a match so swap the methods
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   823
            k_new_methods->at_put(ni, m);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   824
            k_new_methods->at_put(nj, k_new_method);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   825
            k_new_method = m;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   826
            method_was = matched;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   827
            break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   828
          }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   829
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   830
489c9b5090e2 Initial load
duke
parents:
diff changeset
   831
        if (nj >= n_new_methods) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   832
          // reached the end without a match; so method was deleted
489c9b5090e2 Initial load
duke
parents:
diff changeset
   833
          method_was = deleted;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   834
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   835
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   836
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   837
489c9b5090e2 Initial load
duke
parents:
diff changeset
   838
    switch (method_was) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   839
    case matched:
489c9b5090e2 Initial load
duke
parents:
diff changeset
   840
      // methods match, be sure modifiers do too
489c9b5090e2 Initial load
duke
parents:
diff changeset
   841
      old_flags = (jushort) k_old_method->access_flags().get_flags();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   842
      new_flags = (jushort) k_new_method->access_flags().get_flags();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   843
      if ((old_flags ^ new_flags) & ~(JVM_ACC_NATIVE)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   844
        return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_METHOD_MODIFIERS_CHANGED;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   845
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   846
      {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   847
        u2 new_num = k_new_method->method_idnum();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   848
        u2 old_num = k_old_method->method_idnum();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   849
        if (new_num != old_num) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   850
          Method* idnum_owner = scratch_class->method_with_idnum(old_num);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   851
          if (idnum_owner != NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   852
            // There is already a method assigned this idnum -- switch them
29316
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 29081
diff changeset
   853
            // Take current and original idnum from the new_method
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   854
            idnum_owner->set_method_idnum(new_num);
29316
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 29081
diff changeset
   855
            idnum_owner->set_orig_method_idnum(k_new_method->orig_method_idnum());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   856
          }
29316
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 29081
diff changeset
   857
          // Take current and original idnum from the old_method
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   858
          k_new_method->set_method_idnum(old_num);
29316
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 29081
diff changeset
   859
          k_new_method->set_orig_method_idnum(k_old_method->orig_method_idnum());
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
   860
          if (thread->has_pending_exception()) {
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
   861
            return JVMTI_ERROR_OUT_OF_MEMORY;
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
   862
          }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   863
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   864
      }
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   865
      log_trace(redefine, class, normalize)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   866
        ("Method matched: new: %s [%d] == old: %s [%d]",
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   867
         k_new_method->name_and_sig_as_C_string(), ni, k_old_method->name_and_sig_as_C_string(), oi);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   868
      // advance to next pair of methods
489c9b5090e2 Initial load
duke
parents:
diff changeset
   869
      ++oi;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   870
      ++ni;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   871
      break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   872
    case added:
489c9b5090e2 Initial load
duke
parents:
diff changeset
   873
      // method added, see if it is OK
489c9b5090e2 Initial load
duke
parents:
diff changeset
   874
      new_flags = (jushort) k_new_method->access_flags().get_flags();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   875
      if ((new_flags & JVM_ACC_PRIVATE) == 0
489c9b5090e2 Initial load
duke
parents:
diff changeset
   876
           // hack: private should be treated as final, but alas
489c9b5090e2 Initial load
duke
parents:
diff changeset
   877
          || (new_flags & (JVM_ACC_FINAL|JVM_ACC_STATIC)) == 0
489c9b5090e2 Initial load
duke
parents:
diff changeset
   878
         ) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   879
        // new methods must be private
489c9b5090e2 Initial load
duke
parents:
diff changeset
   880
        return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_METHOD_ADDED;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   881
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   882
      {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   883
        u2 num = the_class->next_method_idnum();
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   884
        if (num == ConstMethod::UNSET_IDNUM) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   885
          // cannot add any more methods
489c9b5090e2 Initial load
duke
parents:
diff changeset
   886
          return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_METHOD_ADDED;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   887
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   888
        u2 new_num = k_new_method->method_idnum();
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   889
        Method* idnum_owner = scratch_class->method_with_idnum(num);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   890
        if (idnum_owner != NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   891
          // There is already a method assigned this idnum -- switch them
29316
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 29081
diff changeset
   892
          // Take current and original idnum from the new_method
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   893
          idnum_owner->set_method_idnum(new_num);
29316
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 29081
diff changeset
   894
          idnum_owner->set_orig_method_idnum(k_new_method->orig_method_idnum());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   895
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   896
        k_new_method->set_method_idnum(num);
29316
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 29081
diff changeset
   897
        k_new_method->set_orig_method_idnum(num);
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   898
        if (thread->has_pending_exception()) {
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   899
          return JVMTI_ERROR_OUT_OF_MEMORY;
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   900
        }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   901
      }
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   902
      log_trace(redefine, class, normalize)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   903
        ("Method added: new: %s [%d]", k_new_method->name_and_sig_as_C_string(), ni);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   904
      ++ni; // advance to next new method
489c9b5090e2 Initial load
duke
parents:
diff changeset
   905
      break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   906
    case deleted:
489c9b5090e2 Initial load
duke
parents:
diff changeset
   907
      // method deleted, see if it is OK
489c9b5090e2 Initial load
duke
parents:
diff changeset
   908
      old_flags = (jushort) k_old_method->access_flags().get_flags();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   909
      if ((old_flags & JVM_ACC_PRIVATE) == 0
489c9b5090e2 Initial load
duke
parents:
diff changeset
   910
           // hack: private should be treated as final, but alas
489c9b5090e2 Initial load
duke
parents:
diff changeset
   911
          || (old_flags & (JVM_ACC_FINAL|JVM_ACC_STATIC)) == 0
489c9b5090e2 Initial load
duke
parents:
diff changeset
   912
         ) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   913
        // deleted methods must be private
489c9b5090e2 Initial load
duke
parents:
diff changeset
   914
        return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_METHOD_DELETED;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   915
      }
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   916
      log_trace(redefine, class, normalize)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
   917
        ("Method deleted: old: %s [%d]", k_old_method->name_and_sig_as_C_string(), oi);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   918
      ++oi; // advance to next old method
489c9b5090e2 Initial load
duke
parents:
diff changeset
   919
      break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   920
    default:
489c9b5090e2 Initial load
duke
parents:
diff changeset
   921
      ShouldNotReachHere();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   922
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   923
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   924
489c9b5090e2 Initial load
duke
parents:
diff changeset
   925
  return JVMTI_ERROR_NONE;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   926
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   927
489c9b5090e2 Initial load
duke
parents:
diff changeset
   928
489c9b5090e2 Initial load
duke
parents:
diff changeset
   929
// Find new constant pool index value for old constant pool index value
489c9b5090e2 Initial load
duke
parents:
diff changeset
   930
// by seaching the index map. Returns zero (0) if there is no mapped
489c9b5090e2 Initial load
duke
parents:
diff changeset
   931
// value for the old constant pool index.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   932
int VM_RedefineClasses::find_new_index(int old_index) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   933
  if (_index_map_count == 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   934
    // map is empty so nothing can be found
489c9b5090e2 Initial load
duke
parents:
diff changeset
   935
    return 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   936
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   937
489c9b5090e2 Initial load
duke
parents:
diff changeset
   938
  if (old_index < 1 || old_index >= _index_map_p->length()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   939
    // The old_index is out of range so it is not mapped. This should
489c9b5090e2 Initial load
duke
parents:
diff changeset
   940
    // not happen in regular constant pool merging use, but it can
489c9b5090e2 Initial load
duke
parents:
diff changeset
   941
    // happen if a corrupt annotation is processed.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   942
    return 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   943
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   944
489c9b5090e2 Initial load
duke
parents:
diff changeset
   945
  int value = _index_map_p->at(old_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   946
  if (value == -1) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   947
    // the old_index is not mapped
489c9b5090e2 Initial load
duke
parents:
diff changeset
   948
    return 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   949
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   950
489c9b5090e2 Initial load
duke
parents:
diff changeset
   951
  return value;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   952
} // end find_new_index()
489c9b5090e2 Initial load
duke
parents:
diff changeset
   953
489c9b5090e2 Initial load
duke
parents:
diff changeset
   954
17077
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   955
// Find new bootstrap specifier index value for old bootstrap specifier index
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   956
// value by seaching the index map. Returns unused index (-1) if there is
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   957
// no mapped value for the old bootstrap specifier index.
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   958
int VM_RedefineClasses::find_new_operand_index(int old_index) {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   959
  if (_operands_index_map_count == 0) {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   960
    // map is empty so nothing can be found
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   961
    return -1;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   962
  }
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   963
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   964
  if (old_index == -1 || old_index >= _operands_index_map_p->length()) {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   965
    // The old_index is out of range so it is not mapped.
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   966
    // This should not happen in regular constant pool merging use.
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   967
    return -1;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   968
  }
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   969
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   970
  int value = _operands_index_map_p->at(old_index);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   971
  if (value == -1) {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   972
    // the old_index is not mapped
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   973
    return -1;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   974
  }
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   975
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   976
  return value;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   977
} // end find_new_operand_index()
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   978
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   979
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   980
// Returns true if the current mismatch is due to a resolved/unresolved
489c9b5090e2 Initial load
duke
parents:
diff changeset
   981
// class pair. Otherwise, returns false.
33593
60764a78fa5c 8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents: 33148
diff changeset
   982
bool VM_RedefineClasses::is_unresolved_class_mismatch(const constantPoolHandle& cp1,
60764a78fa5c 8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents: 33148
diff changeset
   983
       int index1, const constantPoolHandle& cp2, int index2) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   984
489c9b5090e2 Initial load
duke
parents:
diff changeset
   985
  jbyte t1 = cp1->tag_at(index1).value();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   986
  if (t1 != JVM_CONSTANT_Class && t1 != JVM_CONSTANT_UnresolvedClass) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   987
    return false;  // wrong entry type; not our special case
489c9b5090e2 Initial load
duke
parents:
diff changeset
   988
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   989
489c9b5090e2 Initial load
duke
parents:
diff changeset
   990
  jbyte t2 = cp2->tag_at(index2).value();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   991
  if (t2 != JVM_CONSTANT_Class && t2 != JVM_CONSTANT_UnresolvedClass) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   992
    return false;  // wrong entry type; not our special case
489c9b5090e2 Initial load
duke
parents:
diff changeset
   993
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   994
489c9b5090e2 Initial load
duke
parents:
diff changeset
   995
  if (t1 == t2) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   996
    return false;  // not a mismatch; not our special case
489c9b5090e2 Initial load
duke
parents:
diff changeset
   997
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   998
489c9b5090e2 Initial load
duke
parents:
diff changeset
   999
  char *s1 = cp1->klass_name_at(index1)->as_C_string();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1000
  char *s2 = cp2->klass_name_at(index2)->as_C_string();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1001
  if (strcmp(s1, s2) != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1002
    return false;  // strings don't match; not our special case
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1003
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1004
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1005
  return true;  // made it through the gauntlet; this is our special case
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1006
} // end is_unresolved_class_mismatch()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1007
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1008
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1009
jvmtiError VM_RedefineClasses::load_new_class_versions(TRAPS) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1010
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1011
  // For consistency allocate memory using os::malloc wrapper.
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  1012
  _scratch_classes = (InstanceKlass**)
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  1013
    os::malloc(sizeof(InstanceKlass*) * _class_count, mtClass);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1014
  if (_scratch_classes == NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1015
    return JVMTI_ERROR_OUT_OF_MEMORY;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1016
  }
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1017
  // Zero initialize the _scratch_classes array.
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1018
  for (int i = 0; i < _class_count; i++) {
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1019
    _scratch_classes[i] = NULL;
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1020
  }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1021
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1022
  ResourceMark rm(THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1023
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1024
  JvmtiThreadState *state = JvmtiThreadState::state_for(JavaThread::current());
2135
f82c3012ec86 6800721: 3/4 JavaThread::jvmti_thread_state() and JvmtiThreadState::state_for() robustness
dcubed
parents: 1
diff changeset
  1025
  // state can only be NULL if the current thread is exiting which
f82c3012ec86 6800721: 3/4 JavaThread::jvmti_thread_state() and JvmtiThreadState::state_for() robustness
dcubed
parents: 1
diff changeset
  1026
  // should not happen since we're trying to do a RedefineClasses
f82c3012ec86 6800721: 3/4 JavaThread::jvmti_thread_state() and JvmtiThreadState::state_for() robustness
dcubed
parents: 1
diff changeset
  1027
  guarantee(state != NULL, "exiting thread calling load_new_class_versions");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1028
  for (int i = 0; i < _class_count; i++) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1029
    // Create HandleMark so that any handles created while loading new class
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1030
    // versions are deleted. Constant pools are deallocated while merging
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1031
    // constant pools
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1032
    HandleMark hm(THREAD);
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  1033
    InstanceKlass* the_class = get_ik(_class_defs[i].klass);
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7913
diff changeset
  1034
    Symbol*  the_class_sym = the_class->name();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1035
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1036
    log_debug(redefine, class, load)
11399
5dd5c4dd4b7d 7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents: 10546
diff changeset
  1037
      ("loading name=%s kind=%d (avail_mem=" UINT64_FORMAT "K)",
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1038
       the_class->external_name(), _class_load_kind, os::available_memory() >> 10);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1039
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 33612
diff changeset
  1040
    ClassFileStream st((u1*)_class_defs[i].class_bytes,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 33612
diff changeset
  1041
                       _class_defs[i].class_byte_count,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 33612
diff changeset
  1042
                       "__VM_RedefineClasses__",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 33612
diff changeset
  1043
                       ClassFileStream::verify);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1044
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1045
    // Parse the stream.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1046
    Handle the_class_loader(THREAD, the_class->class_loader());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1047
    Handle protection_domain(THREAD, the_class->protection_domain());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1048
    // Set redefined class handle in JvmtiThreadState class.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1049
    // This redefined class is sent to agent event handler for class file
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1050
    // load hook event.
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  1051
    state->set_class_being_redefined(the_class, _class_load_kind);
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  1052
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  1053
    InstanceKlass* scratch_class = SystemDictionary::parse_stream(
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  1054
                                                      the_class_sym,
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  1055
                                                      the_class_loader,
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  1056
                                                      protection_domain,
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  1057
                                                      &st,
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  1058
                                                      THREAD);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1059
    // Clear class_being_redefined just to be sure.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1060
    state->clear_class_being_redefined();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1061
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1062
    // TODO: if this is retransform, and nothing changed we can skip it
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1063
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1064
    // Need to clean up allocated InstanceKlass if there's an error so assign
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1065
    // the result here. Caller deallocates all the scratch classes in case of
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1066
    // an error.
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  1067
    _scratch_classes[i] = scratch_class;
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1068
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1069
    if (HAS_PENDING_EXCEPTION) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1070
      Symbol* ex_name = PENDING_EXCEPTION->klass()->name();
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1071
      log_info(redefine, class, load, exceptions)("parse_stream exception: '%s'", ex_name->as_C_string());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1072
      CLEAR_PENDING_EXCEPTION;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1073
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1074
      if (ex_name == vmSymbols::java_lang_UnsupportedClassVersionError()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1075
        return JVMTI_ERROR_UNSUPPORTED_VERSION;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1076
      } else if (ex_name == vmSymbols::java_lang_ClassFormatError()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1077
        return JVMTI_ERROR_INVALID_CLASS_FORMAT;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1078
      } else if (ex_name == vmSymbols::java_lang_ClassCircularityError()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1079
        return JVMTI_ERROR_CIRCULAR_CLASS_DEFINITION;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1080
      } else if (ex_name == vmSymbols::java_lang_NoClassDefFoundError()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1081
        // The message will be "XXX (wrong name: YYY)"
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1082
        return JVMTI_ERROR_NAMES_DONT_MATCH;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1083
      } else if (ex_name == vmSymbols::java_lang_OutOfMemoryError()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1084
        return JVMTI_ERROR_OUT_OF_MEMORY;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1085
      } else {  // Just in case more exceptions can be thrown..
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1086
        return JVMTI_ERROR_FAILS_VERIFICATION;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1087
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1088
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1089
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1090
    // Ensure class is linked before redefine
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1091
    if (!the_class->is_linked()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1092
      the_class->link_class(THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1093
      if (HAS_PENDING_EXCEPTION) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1094
        Symbol* ex_name = PENDING_EXCEPTION->klass()->name();
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1095
        log_info(redefine, class, load, exceptions)("link_class exception: '%s'", ex_name->as_C_string());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1096
        CLEAR_PENDING_EXCEPTION;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1097
        if (ex_name == vmSymbols::java_lang_OutOfMemoryError()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1098
          return JVMTI_ERROR_OUT_OF_MEMORY;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1099
        } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1100
          return JVMTI_ERROR_INTERNAL;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1101
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1102
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1103
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1104
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1105
    // Do the validity checks in compare_and_normalize_class_versions()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1106
    // before verifying the byte codes. By doing these checks first, we
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1107
    // limit the number of functions that require redirection from
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1108
    // the_class to scratch_class. In particular, we don't have to
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1109
    // modify JNI GetSuperclass() and thus won't change its performance.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1110
    jvmtiError res = compare_and_normalize_class_versions(the_class,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1111
                       scratch_class);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1112
    if (res != JVMTI_ERROR_NONE) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1113
      return res;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1114
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1115
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1116
    // verify what the caller passed us
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1117
    {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1118
      // The bug 6214132 caused the verification to fail.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1119
      // Information about the_class and scratch_class is temporarily
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1120
      // recorded into jvmtiThreadState. This data is used to redirect
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1121
      // the_class to scratch_class in the JVM_* functions called by the
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1122
      // verifier. Please, refer to jvmtiThreadState.hpp for the detailed
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1123
      // description.
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  1124
      RedefineVerifyMark rvm(the_class, scratch_class, state);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1125
      Verifier::verify(
3820
0a8fbbe180db 6830542: Performance: JVM_DefineClass already verified.
acorn
parents: 2154
diff changeset
  1126
        scratch_class, Verifier::ThrowException, true, THREAD);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1127
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1128
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1129
    if (HAS_PENDING_EXCEPTION) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1130
      Symbol* ex_name = PENDING_EXCEPTION->klass()->name();
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1131
      log_info(redefine, class, load, exceptions)("verify_byte_codes exception: '%s'", ex_name->as_C_string());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1132
      CLEAR_PENDING_EXCEPTION;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1133
      if (ex_name == vmSymbols::java_lang_OutOfMemoryError()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1134
        return JVMTI_ERROR_OUT_OF_MEMORY;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1135
      } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1136
        // tell the caller the bytecodes are bad
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1137
        return JVMTI_ERROR_FAILS_VERIFICATION;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1138
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1139
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1140
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1141
    res = merge_cp_and_rewrite(the_class, scratch_class, THREAD);
19962
a1ff113a3e74 8024346: ~CautiouslyPreserveExceptionMark - assert(!_thread->has_pending_exception()) failed: unexpected exception generated
sspitsyn
parents: 19961
diff changeset
  1142
    if (HAS_PENDING_EXCEPTION) {
a1ff113a3e74 8024346: ~CautiouslyPreserveExceptionMark - assert(!_thread->has_pending_exception()) failed: unexpected exception generated
sspitsyn
parents: 19961
diff changeset
  1143
      Symbol* ex_name = PENDING_EXCEPTION->klass()->name();
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1144
      log_info(redefine, class, load, exceptions)("merge_cp_and_rewrite exception: '%s'", ex_name->as_C_string());
19962
a1ff113a3e74 8024346: ~CautiouslyPreserveExceptionMark - assert(!_thread->has_pending_exception()) failed: unexpected exception generated
sspitsyn
parents: 19961
diff changeset
  1145
      CLEAR_PENDING_EXCEPTION;
a1ff113a3e74 8024346: ~CautiouslyPreserveExceptionMark - assert(!_thread->has_pending_exception()) failed: unexpected exception generated
sspitsyn
parents: 19961
diff changeset
  1146
      if (ex_name == vmSymbols::java_lang_OutOfMemoryError()) {
a1ff113a3e74 8024346: ~CautiouslyPreserveExceptionMark - assert(!_thread->has_pending_exception()) failed: unexpected exception generated
sspitsyn
parents: 19961
diff changeset
  1147
        return JVMTI_ERROR_OUT_OF_MEMORY;
a1ff113a3e74 8024346: ~CautiouslyPreserveExceptionMark - assert(!_thread->has_pending_exception()) failed: unexpected exception generated
sspitsyn
parents: 19961
diff changeset
  1148
      } else {
a1ff113a3e74 8024346: ~CautiouslyPreserveExceptionMark - assert(!_thread->has_pending_exception()) failed: unexpected exception generated
sspitsyn
parents: 19961
diff changeset
  1149
        return JVMTI_ERROR_INTERNAL;
a1ff113a3e74 8024346: ~CautiouslyPreserveExceptionMark - assert(!_thread->has_pending_exception()) failed: unexpected exception generated
sspitsyn
parents: 19961
diff changeset
  1150
      }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1151
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1152
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1153
    if (VerifyMergedCPBytecodes) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1154
      // verify what we have done during constant pool merging
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1155
      {
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  1156
        RedefineVerifyMark rvm(the_class, scratch_class, state);
3820
0a8fbbe180db 6830542: Performance: JVM_DefineClass already verified.
acorn
parents: 2154
diff changeset
  1157
        Verifier::verify(scratch_class, Verifier::ThrowException, true, THREAD);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1158
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1159
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1160
      if (HAS_PENDING_EXCEPTION) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1161
        Symbol* ex_name = PENDING_EXCEPTION->klass()->name();
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1162
        log_info(redefine, class, load, exceptions)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1163
          ("verify_byte_codes post merge-CP exception: '%s'", ex_name->as_C_string());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1164
        CLEAR_PENDING_EXCEPTION;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1165
        if (ex_name == vmSymbols::java_lang_OutOfMemoryError()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1166
          return JVMTI_ERROR_OUT_OF_MEMORY;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1167
        } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1168
          // tell the caller that constant pool merging screwed up
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1169
          return JVMTI_ERROR_INTERNAL;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1170
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1171
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1172
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1173
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1174
    Rewriter::rewrite(scratch_class, THREAD);
9971
d496ecd7b9de 7033141: assert(has_cp_cache(i)) failed: oob
coleenp
parents: 8726
diff changeset
  1175
    if (!HAS_PENDING_EXCEPTION) {
15099
b31d40895bbb 8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents: 15097
diff changeset
  1176
      scratch_class->link_methods(THREAD);
9971
d496ecd7b9de 7033141: assert(has_cp_cache(i)) failed: oob
coleenp
parents: 8726
diff changeset
  1177
    }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1178
    if (HAS_PENDING_EXCEPTION) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1179
      Symbol* ex_name = PENDING_EXCEPTION->klass()->name();
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1180
      log_info(redefine, class, load, exceptions)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1181
        ("Rewriter::rewrite or link_methods exception: '%s'", ex_name->as_C_string());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1182
      CLEAR_PENDING_EXCEPTION;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1183
      if (ex_name == vmSymbols::java_lang_OutOfMemoryError()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1184
        return JVMTI_ERROR_OUT_OF_MEMORY;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1185
      } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1186
        return JVMTI_ERROR_INTERNAL;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1187
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1188
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1189
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1190
    log_debug(redefine, class, load)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1191
      ("loaded name=%s (avail_mem=" UINT64_FORMAT "K)", the_class->external_name(), os::available_memory() >> 10);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1192
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1193
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1194
  return JVMTI_ERROR_NONE;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1195
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1196
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1197
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1198
// Map old_index to new_index as needed. scratch_cp is only needed
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1199
// for log calls.
33593
60764a78fa5c 8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents: 33148
diff changeset
  1200
void VM_RedefineClasses::map_index(const constantPoolHandle& scratch_cp,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1201
       int old_index, int new_index) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1202
  if (find_new_index(old_index) != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1203
    // old_index is already mapped
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1204
    return;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1205
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1206
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1207
  if (old_index == new_index) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1208
    // no mapping is needed
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1209
    return;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1210
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1211
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1212
  _index_map_p->at_put(old_index, new_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1213
  _index_map_count++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1214
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1215
  log_trace(redefine, class, constantpool)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1216
    ("mapped tag %d at index %d to %d", scratch_cp->tag_at(old_index).value(), old_index, new_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1217
} // end map_index()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1218
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1219
17077
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1220
// Map old_index to new_index as needed.
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1221
void VM_RedefineClasses::map_operand_index(int old_index, int new_index) {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1222
  if (find_new_operand_index(old_index) != -1) {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1223
    // old_index is already mapped
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1224
    return;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1225
  }
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1226
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1227
  if (old_index == new_index) {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1228
    // no mapping is needed
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1229
    return;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1230
  }
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1231
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1232
  _operands_index_map_p->at_put(old_index, new_index);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1233
  _operands_index_map_count++;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1234
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1235
  log_trace(redefine, class, constantpool)("mapped bootstrap specifier at index %d to %d", old_index, new_index);
17077
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1236
} // end map_index()
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1237
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1238
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1239
// Merge old_cp and scratch_cp and return the results of the merge via
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1240
// merge_cp_p. The number of entries in *merge_cp_p is returned via
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1241
// merge_cp_length_p. The entries in old_cp occupy the same locations
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1242
// in *merge_cp_p. Also creates a map of indices from entries in
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1243
// scratch_cp to the corresponding entry in *merge_cp_p. Index map
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1244
// entries are only created for entries in scratch_cp that occupy a
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1245
// different location in *merged_cp_p.
33593
60764a78fa5c 8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents: 33148
diff changeset
  1246
bool VM_RedefineClasses::merge_constant_pools(const constantPoolHandle& old_cp,
60764a78fa5c 8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents: 33148
diff changeset
  1247
       const constantPoolHandle& scratch_cp, constantPoolHandle *merge_cp_p,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1248
       int *merge_cp_length_p, TRAPS) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1249
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1250
  if (merge_cp_p == NULL) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1251
    assert(false, "caller must provide scratch constantPool");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1252
    return false; // robustness
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1253
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1254
  if (merge_cp_length_p == NULL) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1255
    assert(false, "caller must provide scratch CP length");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1256
    return false; // robustness
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1257
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1258
  // Worst case we need old_cp->length() + scratch_cp()->length(),
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1259
  // but the caller might be smart so make sure we have at least
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1260
  // the minimum.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1261
  if ((*merge_cp_p)->length() < old_cp->length()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1262
    assert(false, "merge area too small");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1263
    return false; // robustness
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1264
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1265
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1266
  log_info(redefine, class, constantpool)("old_cp_len=%d, scratch_cp_len=%d", old_cp->length(), scratch_cp->length());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1267
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1268
  {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1269
    // Pass 0:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1270
    // The old_cp is copied to *merge_cp_p; this means that any code
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1271
    // using old_cp does not have to change. This work looks like a
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1272
    // perfect fit for ConstantPool*::copy_cp_to(), but we need to
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1273
    // handle one special case:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1274
    // - revert JVM_CONSTANT_Class to JVM_CONSTANT_UnresolvedClass
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1275
    // This will make verification happy.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1276
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1277
    int old_i;  // index into old_cp
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1278
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1279
    // index zero (0) is not used in constantPools
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1280
    for (old_i = 1; old_i < old_cp->length(); old_i++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1281
      // leave debugging crumb
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1282
      jbyte old_tag = old_cp->tag_at(old_i).value();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1283
      switch (old_tag) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1284
      case JVM_CONSTANT_Class:
8651
81b517a9249f 6512830: Error: assert(tag_at(which).is_unresolved_klass(), "Corrupted constant pool")
coleenp
parents: 8296
diff changeset
  1285
      case JVM_CONSTANT_UnresolvedClass:
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1286
        // revert the copy to JVM_CONSTANT_UnresolvedClass
8651
81b517a9249f 6512830: Error: assert(tag_at(which).is_unresolved_klass(), "Corrupted constant pool")
coleenp
parents: 8296
diff changeset
  1287
        // May be resolving while calling this so do the same for
81b517a9249f 6512830: Error: assert(tag_at(which).is_unresolved_klass(), "Corrupted constant pool")
coleenp
parents: 8296
diff changeset
  1288
        // JVM_CONSTANT_UnresolvedClass (klass_name_at() deals with transition)
46427
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46408
diff changeset
  1289
        (*merge_cp_p)->temp_unresolved_klass_at_put(old_i,
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46408
diff changeset
  1290
          old_cp->klass_name_index_at(old_i));
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1291
        break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1292
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1293
      case JVM_CONSTANT_Double:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1294
      case JVM_CONSTANT_Long:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1295
        // just copy the entry to *merge_cp_p, but double and long take
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1296
        // two constant pool entries
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1297
        ConstantPool::copy_entry_to(old_cp, old_i, *merge_cp_p, old_i, CHECK_0);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1298
        old_i++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1299
        break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1300
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1301
      default:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1302
        // just copy the entry to *merge_cp_p
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1303
        ConstantPool::copy_entry_to(old_cp, old_i, *merge_cp_p, old_i, CHECK_0);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1304
        break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1305
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1306
    } // end for each old_cp entry
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1307
15433
0f53fd973576 8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents: 15430
diff changeset
  1308
    ConstantPool::copy_operands(old_cp, *merge_cp_p, CHECK_0);
17077
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1309
    (*merge_cp_p)->extend_operands(scratch_cp, CHECK_0);
15433
0f53fd973576 8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents: 15430
diff changeset
  1310
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1311
    // We don't need to sanity check that *merge_cp_length_p is within
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1312
    // *merge_cp_p bounds since we have the minimum on-entry check above.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1313
    (*merge_cp_length_p) = old_i;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1314
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1315
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1316
  // merge_cp_len should be the same as old_cp->length() at this point
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1317
  // so this trace message is really a "warm-and-breathing" message.
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1318
  log_debug(redefine, class, constantpool)("after pass 0: merge_cp_len=%d", *merge_cp_length_p);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1319
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1320
  int scratch_i;  // index into scratch_cp
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1321
  {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1322
    // Pass 1a:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1323
    // Compare scratch_cp entries to the old_cp entries that we have
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1324
    // already copied to *merge_cp_p. In this pass, we are eliminating
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1325
    // exact duplicates (matching entry at same index) so we only
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1326
    // compare entries in the common indice range.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1327
    int increment = 1;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1328
    int pass1a_length = MIN2(old_cp->length(), scratch_cp->length());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1329
    for (scratch_i = 1; scratch_i < pass1a_length; scratch_i += increment) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1330
      switch (scratch_cp->tag_at(scratch_i).value()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1331
      case JVM_CONSTANT_Double:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1332
      case JVM_CONSTANT_Long:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1333
        // double and long take two constant pool entries
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1334
        increment = 2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1335
        break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1336
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1337
      default:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1338
        increment = 1;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1339
        break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1340
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1341
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1342
      bool match = scratch_cp->compare_entry_to(scratch_i, *merge_cp_p,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1343
        scratch_i, CHECK_0);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1344
      if (match) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1345
        // found a match at the same index so nothing more to do
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1346
        continue;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1347
      } else if (is_unresolved_class_mismatch(scratch_cp, scratch_i,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1348
                                              *merge_cp_p, scratch_i)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1349
        // The mismatch in compare_entry_to() above is because of a
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1350
        // resolved versus unresolved class entry at the same index
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1351
        // with the same string value. Since Pass 0 reverted any
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1352
        // class entries to unresolved class entries in *merge_cp_p,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1353
        // we go with the unresolved class entry.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1354
        continue;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1355
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1356
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1357
      int found_i = scratch_cp->find_matching_entry(scratch_i, *merge_cp_p,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1358
        CHECK_0);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1359
      if (found_i != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1360
        guarantee(found_i != scratch_i,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1361
          "compare_entry_to() and find_matching_entry() do not agree");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1362
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1363
        // Found a matching entry somewhere else in *merge_cp_p so
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1364
        // just need a mapping entry.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1365
        map_index(scratch_cp, scratch_i, found_i);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1366
        continue;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1367
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1368
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1369
      // The find_matching_entry() call above could fail to find a match
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1370
      // due to a resolved versus unresolved class or string entry situation
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1371
      // like we solved above with the is_unresolved_*_mismatch() calls.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1372
      // However, we would have to call is_unresolved_*_mismatch() over
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1373
      // all of *merge_cp_p (potentially) and that doesn't seem to be
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1374
      // worth the time.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1375
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1376
      // No match found so we have to append this entry and any unique
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1377
      // referenced entries to *merge_cp_p.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1378
      append_entry(scratch_cp, scratch_i, merge_cp_p, merge_cp_length_p,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1379
        CHECK_0);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1380
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1381
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1382
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1383
  log_debug(redefine, class, constantpool)
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1384
    ("after pass 1a: merge_cp_len=%d, scratch_i=%d, index_map_len=%d",
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1385
     *merge_cp_length_p, scratch_i, _index_map_count);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1386
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1387
  if (scratch_i < scratch_cp->length()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1388
    // Pass 1b:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1389
    // old_cp is smaller than scratch_cp so there are entries in
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1390
    // scratch_cp that we have not yet processed. We take care of
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1391
    // those now.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1392
    int increment = 1;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1393
    for (; scratch_i < scratch_cp->length(); scratch_i += increment) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1394
      switch (scratch_cp->tag_at(scratch_i).value()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1395
      case JVM_CONSTANT_Double:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1396
      case JVM_CONSTANT_Long:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1397
        // double and long take two constant pool entries
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1398
        increment = 2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1399
        break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1400
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1401
      default:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1402
        increment = 1;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1403
        break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1404
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1405
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1406
      int found_i =
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1407
        scratch_cp->find_matching_entry(scratch_i, *merge_cp_p, CHECK_0);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1408
      if (found_i != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1409
        // Found a matching entry somewhere else in *merge_cp_p so
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1410
        // just need a mapping entry.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1411
        map_index(scratch_cp, scratch_i, found_i);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1412
        continue;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1413
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1414
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1415
      // No match found so we have to append this entry and any unique
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1416
      // referenced entries to *merge_cp_p.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1417
      append_entry(scratch_cp, scratch_i, merge_cp_p, merge_cp_length_p,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1418
        CHECK_0);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1419
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1420
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1421
    log_debug(redefine, class, constantpool)
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1422
      ("after pass 1b: merge_cp_len=%d, scratch_i=%d, index_map_len=%d",
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1423
       *merge_cp_length_p, scratch_i, _index_map_count);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1424
  }
17864
29aa71317b51 8014052: JSR292: assert(end_offset == next_offset) failed: matched ending
sspitsyn
parents: 17373
diff changeset
  1425
  finalize_operands_merge(*merge_cp_p, THREAD);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1426
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1427
  return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1428
} // end merge_constant_pools()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1429
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1430
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1431
// Scoped object to clean up the constant pool(s) created for merging
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1432
class MergeCPCleaner {
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1433
  ClassLoaderData*   _loader_data;
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1434
  ConstantPool*      _cp;
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1435
  ConstantPool*      _scratch_cp;
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1436
 public:
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1437
  MergeCPCleaner(ClassLoaderData* loader_data, ConstantPool* merge_cp) :
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1438
                 _loader_data(loader_data), _cp(merge_cp), _scratch_cp(NULL) {}
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1439
  ~MergeCPCleaner() {
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1440
    _loader_data->add_to_deallocate_list(_cp);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1441
    if (_scratch_cp != NULL) {
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1442
      _loader_data->add_to_deallocate_list(_scratch_cp);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1443
    }
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1444
  }
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1445
  void add_scratch_cp(ConstantPool* scratch_cp) { _scratch_cp = scratch_cp; }
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1446
};
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1447
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1448
// Merge constant pools between the_class and scratch_class and
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1449
// potentially rewrite bytecodes in scratch_class to use the merged
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1450
// constant pool.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1451
jvmtiError VM_RedefineClasses::merge_cp_and_rewrite(
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  1452
             InstanceKlass* the_class, InstanceKlass* scratch_class,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1453
             TRAPS) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1454
  // worst case merged constant pool length is old and new combined
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1455
  int merge_cp_length = the_class->constants()->length()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1456
        + scratch_class->constants()->length();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1457
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1458
  // Constant pools are not easily reused so we allocate a new one
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1459
  // each time.
1894
5c343868d071 6692899: CMS: many vm.parallel_class_loading tests fail with assert "missing Printezis mark"
jmasa
parents: 1
diff changeset
  1460
  // merge_cp is created unsafe for concurrent GC processing.  It
8296
b1c2163e4e59 6912621: iCMS: Error: assert(_markBitMap.isMarked(addr + 1),"Missing Printezis bit?")
ysr
parents: 8076
diff changeset
  1461
  // should be marked safe before discarding it. Even though
b1c2163e4e59 6912621: iCMS: Error: assert(_markBitMap.isMarked(addr + 1),"Missing Printezis bit?")
ysr
parents: 8076
diff changeset
  1462
  // garbage,  if it crosses a card boundary, it may be scanned
1894
5c343868d071 6692899: CMS: many vm.parallel_class_loading tests fail with assert "missing Printezis mark"
jmasa
parents: 1
diff changeset
  1463
  // in order to find the start of the first complete object on the card.
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1464
  ClassLoaderData* loader_data = the_class->class_loader_data();
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1465
  ConstantPool* merge_cp_oop =
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1466
    ConstantPool::allocate(loader_data,
19961
04405a08613f 8024345: 'assert(_value != NULL) failed: resolving NULL _value' from VM_RedefineClasses::set_new_constant_pool
sspitsyn
parents: 19960
diff changeset
  1467
                           merge_cp_length,
04405a08613f 8024345: 'assert(_value != NULL) failed: resolving NULL _value' from VM_RedefineClasses::set_new_constant_pool
sspitsyn
parents: 19960
diff changeset
  1468
                           CHECK_(JVMTI_ERROR_OUT_OF_MEMORY));
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1469
  MergeCPCleaner cp_cleaner(loader_data, merge_cp_oop);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1470
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1471
  HandleMark hm(THREAD);  // make sure handles are cleared before
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1472
                          // MergeCPCleaner clears out merge_cp_oop
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1473
  constantPoolHandle merge_cp(THREAD, merge_cp_oop);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1474
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1475
  // Get constants() from the old class because it could have been rewritten
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1476
  // while we were at a safepoint allocating a new constant pool.
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1477
  constantPoolHandle old_cp(THREAD, the_class->constants());
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1478
  constantPoolHandle scratch_cp(THREAD, scratch_class->constants());
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1479
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1480
  // If the length changed, the class was redefined out from under us. Return
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1481
  // an error.
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1482
  if (merge_cp_length != the_class->constants()->length()
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1483
         + scratch_class->constants()->length()) {
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1484
    return JVMTI_ERROR_INTERNAL;
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1485
  }
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1486
37475
0da78fa10d78 8148772: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 37248
diff changeset
  1487
  // Update the version number of the constant pools (may keep scratch_cp)
15229
5341188db763 7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents: 15099
diff changeset
  1488
  merge_cp->increment_and_save_version(old_cp->version());
37475
0da78fa10d78 8148772: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 37248
diff changeset
  1489
  scratch_cp->increment_and_save_version(old_cp->version());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1490
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1491
  ResourceMark rm(THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1492
  _index_map_count = 0;
38031
e0b822facc03 8149374: Replace C1-specific collection classes with universal collection classes
fzhinkin
parents: 36353
diff changeset
  1493
  _index_map_p = new intArray(scratch_cp->length(), scratch_cp->length(), -1);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1494
17077
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1495
  _operands_cur_length = ConstantPool::operand_array_length(old_cp->operands());
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1496
  _operands_index_map_count = 0;
38031
e0b822facc03 8149374: Replace C1-specific collection classes with universal collection classes
fzhinkin
parents: 36353
diff changeset
  1497
  int operands_index_map_len = ConstantPool::operand_array_length(scratch_cp->operands());
e0b822facc03 8149374: Replace C1-specific collection classes with universal collection classes
fzhinkin
parents: 36353
diff changeset
  1498
  _operands_index_map_p = new intArray(operands_index_map_len, operands_index_map_len, -1);
17077
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1499
15433
0f53fd973576 8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents: 15430
diff changeset
  1500
  // reference to the cp holder is needed for copy_operands()
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  1501
  merge_cp->set_pool_holder(scratch_class);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1502
  bool result = merge_constant_pools(old_cp, scratch_cp, &merge_cp,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1503
                  &merge_cp_length, THREAD);
15433
0f53fd973576 8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents: 15430
diff changeset
  1504
  merge_cp->set_pool_holder(NULL);
0f53fd973576 8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents: 15430
diff changeset
  1505
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1506
  if (!result) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1507
    // The merge can fail due to memory allocation failure or due
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1508
    // to robustness checks.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1509
    return JVMTI_ERROR_INTERNAL;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1510
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1511
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1512
  log_info(redefine, class, constantpool)("merge_cp_len=%d, index_map_len=%d", merge_cp_length, _index_map_count);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1513
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1514
  if (_index_map_count == 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1515
    // there is nothing to map between the new and merged constant pools
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1516
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1517
    if (old_cp->length() == scratch_cp->length()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1518
      // The old and new constant pools are the same length and the
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1519
      // index map is empty. This means that the three constant pools
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1520
      // are equivalent (but not the same). Unfortunately, the new
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1521
      // constant pool has not gone through link resolution nor have
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1522
      // the new class bytecodes gone through constant pool cache
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1523
      // rewriting so we can't use the old constant pool with the new
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1524
      // class.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1525
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1526
      // toss the merged constant pool at return
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1527
    } else if (old_cp->length() < scratch_cp->length()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1528
      // The old constant pool has fewer entries than the new constant
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1529
      // pool and the index map is empty. This means the new constant
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1530
      // pool is a superset of the old constant pool. However, the old
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1531
      // class bytecodes have already gone through constant pool cache
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1532
      // rewriting so we can't use the new constant pool with the old
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1533
      // class.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1534
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1535
      // toss the merged constant pool at return
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1536
    } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1537
      // The old constant pool has more entries than the new constant
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1538
      // pool and the index map is empty. This means that both the old
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1539
      // and merged constant pools are supersets of the new constant
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1540
      // pool.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1541
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1542
      // Replace the new constant pool with a shrunken copy of the
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1543
      // merged constant pool
19961
04405a08613f 8024345: 'assert(_value != NULL) failed: resolving NULL _value' from VM_RedefineClasses::set_new_constant_pool
sspitsyn
parents: 19960
diff changeset
  1544
      set_new_constant_pool(loader_data, scratch_class, merge_cp, merge_cp_length,
04405a08613f 8024345: 'assert(_value != NULL) failed: resolving NULL _value' from VM_RedefineClasses::set_new_constant_pool
sspitsyn
parents: 19960
diff changeset
  1545
                            CHECK_(JVMTI_ERROR_OUT_OF_MEMORY));
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1546
      // The new constant pool replaces scratch_cp so have cleaner clean it up.
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1547
      // It can't be cleaned up while there are handles to it.
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1548
      cp_cleaner.add_scratch_cp(scratch_cp());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1549
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1550
  } else {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1551
    if (log_is_enabled(Trace, redefine, class, constantpool)) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1552
      // don't want to loop unless we are tracing
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1553
      int count = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1554
      for (int i = 1; i < _index_map_p->length(); i++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1555
        int value = _index_map_p->at(i);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1556
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1557
        if (value != -1) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1558
          log_trace(redefine, class, constantpool)("index_map[%d]: old=%d new=%d", count, i, value);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1559
          count++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1560
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1561
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1562
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1563
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1564
    // We have entries mapped between the new and merged constant pools
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1565
    // so we have to rewrite some constant pool references.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1566
    if (!rewrite_cp_refs(scratch_class, THREAD)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1567
      return JVMTI_ERROR_INTERNAL;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1568
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1569
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1570
    // Replace the new constant pool with a shrunken copy of the
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1571
    // merged constant pool so now the rewritten bytecodes have
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1572
    // valid references; the previous new constant pool will get
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1573
    // GCed.
19961
04405a08613f 8024345: 'assert(_value != NULL) failed: resolving NULL _value' from VM_RedefineClasses::set_new_constant_pool
sspitsyn
parents: 19960
diff changeset
  1574
    set_new_constant_pool(loader_data, scratch_class, merge_cp, merge_cp_length,
04405a08613f 8024345: 'assert(_value != NULL) failed: resolving NULL _value' from VM_RedefineClasses::set_new_constant_pool
sspitsyn
parents: 19960
diff changeset
  1575
                          CHECK_(JVMTI_ERROR_OUT_OF_MEMORY));
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1576
    // The new constant pool replaces scratch_cp so have cleaner clean it up.
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1577
    // It can't be cleaned up while there are handles to it.
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1578
    cp_cleaner.add_scratch_cp(scratch_cp());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1579
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1580
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1581
  return JVMTI_ERROR_NONE;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1582
} // end merge_cp_and_rewrite()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1583
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1584
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1585
// Rewrite constant pool references in klass scratch_class.
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  1586
bool VM_RedefineClasses::rewrite_cp_refs(InstanceKlass* scratch_class,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1587
       TRAPS) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1588
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1589
  // rewrite constant pool references in the methods:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1590
  if (!rewrite_cp_refs_in_methods(scratch_class, THREAD)) {
2131
98f9cef66a34 6810672: Comment typos
twisti
parents: 1894
diff changeset
  1591
    // propagate failure back to caller
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1592
    return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1593
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1594
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1595
  // rewrite constant pool references in the class_annotations:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1596
  if (!rewrite_cp_refs_in_class_annotations(scratch_class, THREAD)) {
2131
98f9cef66a34 6810672: Comment typos
twisti
parents: 1894
diff changeset
  1597
    // propagate failure back to caller
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1598
    return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1599
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1600
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1601
  // rewrite constant pool references in the fields_annotations:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1602
  if (!rewrite_cp_refs_in_fields_annotations(scratch_class, THREAD)) {
2131
98f9cef66a34 6810672: Comment typos
twisti
parents: 1894
diff changeset
  1603
    // propagate failure back to caller
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1604
    return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1605
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1606
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1607
  // rewrite constant pool references in the methods_annotations:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1608
  if (!rewrite_cp_refs_in_methods_annotations(scratch_class, THREAD)) {
2131
98f9cef66a34 6810672: Comment typos
twisti
parents: 1894
diff changeset
  1609
    // propagate failure back to caller
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1610
    return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1611
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1612
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1613
  // rewrite constant pool references in the methods_parameter_annotations:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1614
  if (!rewrite_cp_refs_in_methods_parameter_annotations(scratch_class,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1615
         THREAD)) {
2131
98f9cef66a34 6810672: Comment typos
twisti
parents: 1894
diff changeset
  1616
    // propagate failure back to caller
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1617
    return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1618
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1619
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1620
  // rewrite constant pool references in the methods_default_annotations:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1621
  if (!rewrite_cp_refs_in_methods_default_annotations(scratch_class,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1622
         THREAD)) {
2131
98f9cef66a34 6810672: Comment typos
twisti
parents: 1894
diff changeset
  1623
    // propagate failure back to caller
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1624
    return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1625
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1626
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  1627
  // rewrite constant pool references in the class_type_annotations:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  1628
  if (!rewrite_cp_refs_in_class_type_annotations(scratch_class, THREAD)) {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  1629
    // propagate failure back to caller
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  1630
    return false;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  1631
  }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  1632
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  1633
  // rewrite constant pool references in the fields_type_annotations:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  1634
  if (!rewrite_cp_refs_in_fields_type_annotations(scratch_class, THREAD)) {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  1635
    // propagate failure back to caller
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  1636
    return false;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  1637
  }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  1638
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  1639
  // rewrite constant pool references in the methods_type_annotations:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  1640
  if (!rewrite_cp_refs_in_methods_type_annotations(scratch_class, THREAD)) {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  1641
    // propagate failure back to caller
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  1642
    return false;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  1643
  }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  1644
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  1645
  // There can be type annotations in the Code part of a method_info attribute.
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  1646
  // These annotations are not accessible, even by reflection.
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  1647
  // Currently they are not even parsed by the ClassFileParser.
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  1648
  // If runtime access is added they will also need to be rewritten.
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  1649
19537
7db00fe9bb8e 8023547: com/sun/jdi/RedefineMulti.sh fails with IllegalArgumentException after JDK-8021948 .
jiangli
parents: 19326
diff changeset
  1650
  // rewrite source file name index:
19326
14cb6cf26a96 8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents: 19278
diff changeset
  1651
  u2 source_file_name_idx = scratch_class->source_file_name_index();
14cb6cf26a96 8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents: 19278
diff changeset
  1652
  if (source_file_name_idx != 0) {
14cb6cf26a96 8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents: 19278
diff changeset
  1653
    u2 new_source_file_name_idx = find_new_index(source_file_name_idx);
19537
7db00fe9bb8e 8023547: com/sun/jdi/RedefineMulti.sh fails with IllegalArgumentException after JDK-8021948 .
jiangli
parents: 19326
diff changeset
  1654
    if (new_source_file_name_idx != 0) {
7db00fe9bb8e 8023547: com/sun/jdi/RedefineMulti.sh fails with IllegalArgumentException after JDK-8021948 .
jiangli
parents: 19326
diff changeset
  1655
      scratch_class->set_source_file_name_index(new_source_file_name_idx);
7db00fe9bb8e 8023547: com/sun/jdi/RedefineMulti.sh fails with IllegalArgumentException after JDK-8021948 .
jiangli
parents: 19326
diff changeset
  1656
    }
19326
14cb6cf26a96 8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents: 19278
diff changeset
  1657
  }
14cb6cf26a96 8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents: 19278
diff changeset
  1658
14cb6cf26a96 8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents: 19278
diff changeset
  1659
  // rewrite class generic signature index:
14cb6cf26a96 8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents: 19278
diff changeset
  1660
  u2 generic_signature_index = scratch_class->generic_signature_index();
14cb6cf26a96 8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents: 19278
diff changeset
  1661
  if (generic_signature_index != 0) {
14cb6cf26a96 8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents: 19278
diff changeset
  1662
    u2 new_generic_signature_index = find_new_index(generic_signature_index);
19537
7db00fe9bb8e 8023547: com/sun/jdi/RedefineMulti.sh fails with IllegalArgumentException after JDK-8021948 .
jiangli
parents: 19326
diff changeset
  1663
    if (new_generic_signature_index != 0) {
7db00fe9bb8e 8023547: com/sun/jdi/RedefineMulti.sh fails with IllegalArgumentException after JDK-8021948 .
jiangli
parents: 19326
diff changeset
  1664
      scratch_class->set_generic_signature_index(new_generic_signature_index);
7db00fe9bb8e 8023547: com/sun/jdi/RedefineMulti.sh fails with IllegalArgumentException after JDK-8021948 .
jiangli
parents: 19326
diff changeset
  1665
    }
19326
14cb6cf26a96 8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents: 19278
diff changeset
  1666
  }
14cb6cf26a96 8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents: 19278
diff changeset
  1667
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1668
  return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1669
} // end rewrite_cp_refs()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1670
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1671
// Rewrite constant pool references in the methods.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1672
bool VM_RedefineClasses::rewrite_cp_refs_in_methods(
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  1673
       InstanceKlass* scratch_class, TRAPS) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1674
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1675
  Array<Method*>* methods = scratch_class->methods();
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1676
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1677
  if (methods == NULL || methods->length() == 0) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1678
    // no methods so nothing to do
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1679
    return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1680
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1681
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1682
  // rewrite constant pool references in the methods:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1683
  for (int i = methods->length() - 1; i >= 0; i--) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1684
    methodHandle method(THREAD, methods->at(i));
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1685
    methodHandle new_method;
19960
49697a1e3782 8017230: Internal Error (jvmtiRedefineClasses.cpp:1662): guarantee(false) failed: insert_space_at() failed
sspitsyn
parents: 19537
diff changeset
  1686
    rewrite_cp_refs_in_method(method, &new_method, THREAD);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1687
    if (!new_method.is_null()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1688
      // the method has been replaced so save the new method version
19960
49697a1e3782 8017230: Internal Error (jvmtiRedefineClasses.cpp:1662): guarantee(false) failed: insert_space_at() failed
sspitsyn
parents: 19537
diff changeset
  1689
      // even in the case of an exception.  original method is on the
49697a1e3782 8017230: Internal Error (jvmtiRedefineClasses.cpp:1662): guarantee(false) failed: insert_space_at() failed
sspitsyn
parents: 19537
diff changeset
  1690
      // deallocation list.
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1691
      methods->at_put(i, new_method());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1692
    }
19960
49697a1e3782 8017230: Internal Error (jvmtiRedefineClasses.cpp:1662): guarantee(false) failed: insert_space_at() failed
sspitsyn
parents: 19537
diff changeset
  1693
    if (HAS_PENDING_EXCEPTION) {
49697a1e3782 8017230: Internal Error (jvmtiRedefineClasses.cpp:1662): guarantee(false) failed: insert_space_at() failed
sspitsyn
parents: 19537
diff changeset
  1694
      Symbol* ex_name = PENDING_EXCEPTION->klass()->name();
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1695
      log_info(redefine, class, load, exceptions)("rewrite_cp_refs_in_method exception: '%s'", ex_name->as_C_string());
19960
49697a1e3782 8017230: Internal Error (jvmtiRedefineClasses.cpp:1662): guarantee(false) failed: insert_space_at() failed
sspitsyn
parents: 19537
diff changeset
  1696
      // Need to clear pending exception here as the super caller sets
49697a1e3782 8017230: Internal Error (jvmtiRedefineClasses.cpp:1662): guarantee(false) failed: insert_space_at() failed
sspitsyn
parents: 19537
diff changeset
  1697
      // the JVMTI_ERROR_INTERNAL if the returned value is false.
49697a1e3782 8017230: Internal Error (jvmtiRedefineClasses.cpp:1662): guarantee(false) failed: insert_space_at() failed
sspitsyn
parents: 19537
diff changeset
  1698
      CLEAR_PENDING_EXCEPTION;
49697a1e3782 8017230: Internal Error (jvmtiRedefineClasses.cpp:1662): guarantee(false) failed: insert_space_at() failed
sspitsyn
parents: 19537
diff changeset
  1699
      return false;
49697a1e3782 8017230: Internal Error (jvmtiRedefineClasses.cpp:1662): guarantee(false) failed: insert_space_at() failed
sspitsyn
parents: 19537
diff changeset
  1700
    }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1701
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1702
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1703
  return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1704
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1705
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1706
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1707
// Rewrite constant pool references in the specific method. This code
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1708
// was adapted from Rewriter::rewrite_method().
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1709
void VM_RedefineClasses::rewrite_cp_refs_in_method(methodHandle method,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1710
       methodHandle *new_method_p, TRAPS) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1711
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1712
  *new_method_p = methodHandle();  // default is no new method
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1713
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1714
  // We cache a pointer to the bytecodes here in code_base. If GC
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1715
  // moves the Method*, then the bytecodes will also move which
35492
c8c0273e6b91 8146690: Make all classes in GC follow the naming convention.
david
parents: 34666
diff changeset
  1716
  // will likely cause a crash. We create a NoSafepointVerifier
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1717
  // object to detect whether we pass a possible safepoint in this
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1718
  // code block.
35492
c8c0273e6b91 8146690: Make all classes in GC follow the naming convention.
david
parents: 34666
diff changeset
  1719
  NoSafepointVerifier nsv;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1720
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1721
  // Bytecodes and their length
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1722
  address code_base = method->code_base();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1723
  int code_length = method->code_size();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1724
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1725
  int bc_length;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1726
  for (int bci = 0; bci < code_length; bci += bc_length) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1727
    address bcp = code_base + bci;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1728
    Bytecodes::Code c = (Bytecodes::Code)(*bcp);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1729
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1730
    bc_length = Bytecodes::length_for(c);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1731
    if (bc_length == 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1732
      // More complicated bytecodes report a length of zero so
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1733
      // we have to try again a slightly different way.
7913
dd096a83bdbb 4926272: methodOopDesc::method_from_bcp is unsafe
never
parents: 7436
diff changeset
  1734
      bc_length = Bytecodes::length_at(method(), bcp);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1735
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1736
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1737
    assert(bc_length != 0, "impossible bytecode length");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1738
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1739
    switch (c) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1740
      case Bytecodes::_ldc:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1741
      {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1742
        int cp_index = *(bcp + 1);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1743
        int new_index = find_new_index(cp_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1744
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1745
        if (StressLdcRewrite && new_index == 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1746
          // If we are stressing ldc -> ldc_w rewriting, then we
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1747
          // always need a new_index value.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1748
          new_index = cp_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1749
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1750
        if (new_index != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1751
          // the original index is mapped so we have more work to do
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1752
          if (!StressLdcRewrite && new_index <= max_jubyte) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1753
            // The new value can still use ldc instead of ldc_w
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1754
            // unless we are trying to stress ldc -> ldc_w rewriting
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1755
            log_trace(redefine, class, constantpool)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1756
              ("%s@" INTPTR_FORMAT " old=%d, new=%d", Bytecodes::name(c), p2i(bcp), cp_index, new_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1757
            *(bcp + 1) = new_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1758
          } else {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1759
            log_trace(redefine, class, constantpool)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1760
              ("%s->ldc_w@" INTPTR_FORMAT " old=%d, new=%d", Bytecodes::name(c), p2i(bcp), cp_index, new_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1761
            // the new value needs ldc_w instead of ldc
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1762
            u_char inst_buffer[4]; // max instruction size is 4 bytes
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1763
            bcp = (address)inst_buffer;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1764
            // construct new instruction sequence
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1765
            *bcp = Bytecodes::_ldc_w;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1766
            bcp++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1767
            // Rewriter::rewrite_method() does not rewrite ldc -> ldc_w.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1768
            // See comment below for difference between put_Java_u2()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1769
            // and put_native_u2().
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1770
            Bytes::put_Java_u2(bcp, new_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1771
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1772
            Relocator rc(method, NULL /* no RelocatorListener needed */);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1773
            methodHandle m;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1774
            {
35492
c8c0273e6b91 8146690: Make all classes in GC follow the naming convention.
david
parents: 34666
diff changeset
  1775
              PauseNoSafepointVerifier pnsv(&nsv);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1776
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1777
              // ldc is 2 bytes and ldc_w is 3 bytes
19960
49697a1e3782 8017230: Internal Error (jvmtiRedefineClasses.cpp:1662): guarantee(false) failed: insert_space_at() failed
sspitsyn
parents: 19537
diff changeset
  1778
              m = rc.insert_space_at(bci, 3, inst_buffer, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1779
            }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1780
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1781
            // return the new method so that the caller can update
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1782
            // the containing class
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1783
            *new_method_p = method = m;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1784
            // switch our bytecode processing loop from the old method
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1785
            // to the new method
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1786
            code_base = method->code_base();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1787
            code_length = method->code_size();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1788
            bcp = code_base + bci;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1789
            c = (Bytecodes::Code)(*bcp);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1790
            bc_length = Bytecodes::length_for(c);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1791
            assert(bc_length != 0, "sanity check");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1792
          } // end we need ldc_w instead of ldc
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1793
        } // end if there is a mapped index
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1794
      } break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1795
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1796
      // these bytecodes have a two-byte constant pool index
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1797
      case Bytecodes::_anewarray      : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1798
      case Bytecodes::_checkcast      : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1799
      case Bytecodes::_getfield       : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1800
      case Bytecodes::_getstatic      : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1801
      case Bytecodes::_instanceof     : // fall through
15446
5ea56212959f 8006731: JSR 292: the VM_RedefineClasses::rewrite_cp_refs_in_method() must support invokedynamic
sspitsyn
parents: 15444
diff changeset
  1802
      case Bytecodes::_invokedynamic  : // fall through
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1803
      case Bytecodes::_invokeinterface: // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1804
      case Bytecodes::_invokespecial  : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1805
      case Bytecodes::_invokestatic   : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1806
      case Bytecodes::_invokevirtual  : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1807
      case Bytecodes::_ldc_w          : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1808
      case Bytecodes::_ldc2_w         : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1809
      case Bytecodes::_multianewarray : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1810
      case Bytecodes::_new            : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1811
      case Bytecodes::_putfield       : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1812
      case Bytecodes::_putstatic      :
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1813
      {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1814
        address p = bcp + 1;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1815
        int cp_index = Bytes::get_Java_u2(p);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1816
        int new_index = find_new_index(cp_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1817
        if (new_index != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1818
          // the original index is mapped so update w/ new value
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1819
          log_trace(redefine, class, constantpool)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1820
            ("%s@" INTPTR_FORMAT " old=%d, new=%d", Bytecodes::name(c),p2i(bcp), cp_index, new_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1821
          // Rewriter::rewrite_method() uses put_native_u2() in this
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1822
          // situation because it is reusing the constant pool index
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  1823
          // location for a native index into the ConstantPoolCache.
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1824
          // Since we are updating the constant pool index prior to
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  1825
          // verification and ConstantPoolCache initialization, we
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1826
          // need to keep the new index in Java byte order.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1827
          Bytes::put_Java_u2(p, new_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1828
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1829
      } break;
46630
75aa3e39d02c 8182299: Enable disabled clang warnings, build on OSX 10 + Xcode 8
jwilhelm
parents: 46505
diff changeset
  1830
      default:
75aa3e39d02c 8182299: Enable disabled clang warnings, build on OSX 10 + Xcode 8
jwilhelm
parents: 46505
diff changeset
  1831
        break;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1832
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1833
  } // end for each bytecode
15744
fd58c7e770b3 8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents: 15601
diff changeset
  1834
fd58c7e770b3 8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents: 15601
diff changeset
  1835
  // We also need to rewrite the parameter name indexes, if there is
fd58c7e770b3 8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents: 15601
diff changeset
  1836
  // method parameter data present
fd58c7e770b3 8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents: 15601
diff changeset
  1837
  if(method->has_method_parameters()) {
fd58c7e770b3 8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents: 15601
diff changeset
  1838
    const int len = method->method_parameters_length();
fd58c7e770b3 8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents: 15601
diff changeset
  1839
    MethodParametersElement* elem = method->method_parameters_start();
fd58c7e770b3 8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents: 15601
diff changeset
  1840
fd58c7e770b3 8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents: 15601
diff changeset
  1841
    for (int i = 0; i < len; i++) {
fd58c7e770b3 8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents: 15601
diff changeset
  1842
      const u2 cp_index = elem[i].name_cp_index;
19537
7db00fe9bb8e 8023547: com/sun/jdi/RedefineMulti.sh fails with IllegalArgumentException after JDK-8021948 .
jiangli
parents: 19326
diff changeset
  1843
      const u2 new_cp_index = find_new_index(cp_index);
7db00fe9bb8e 8023547: com/sun/jdi/RedefineMulti.sh fails with IllegalArgumentException after JDK-8021948 .
jiangli
parents: 19326
diff changeset
  1844
      if (new_cp_index != 0) {
7db00fe9bb8e 8023547: com/sun/jdi/RedefineMulti.sh fails with IllegalArgumentException after JDK-8021948 .
jiangli
parents: 19326
diff changeset
  1845
        elem[i].name_cp_index = new_cp_index;
7db00fe9bb8e 8023547: com/sun/jdi/RedefineMulti.sh fails with IllegalArgumentException after JDK-8021948 .
jiangli
parents: 19326
diff changeset
  1846
      }
15744
fd58c7e770b3 8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents: 15601
diff changeset
  1847
    }
fd58c7e770b3 8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents: 15601
diff changeset
  1848
  }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1849
} // end rewrite_cp_refs_in_method()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1850
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1851
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1852
// Rewrite constant pool references in the class_annotations field.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1853
bool VM_RedefineClasses::rewrite_cp_refs_in_class_annotations(
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  1854
       InstanceKlass* scratch_class, TRAPS) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1855
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1856
  AnnotationArray* class_annotations = scratch_class->class_annotations();
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1857
  if (class_annotations == NULL || class_annotations->length() == 0) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1858
    // no class_annotations so nothing to do
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1859
    return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1860
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1861
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1862
  log_debug(redefine, class, annotation)("class_annotations length=%d", class_annotations->length());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1863
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1864
  int byte_i = 0;  // byte index into class_annotations
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1865
  return rewrite_cp_refs_in_annotations_typeArray(class_annotations, byte_i,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1866
           THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1867
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1868
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1869
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1870
// Rewrite constant pool references in an annotations typeArray. This
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1871
// "structure" is adapted from the RuntimeVisibleAnnotations_attribute
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1872
// that is described in section 4.8.15 of the 2nd-edition of the VM spec:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1873
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1874
// annotations_typeArray {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1875
//   u2 num_annotations;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1876
//   annotation annotations[num_annotations];
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1877
// }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1878
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1879
bool VM_RedefineClasses::rewrite_cp_refs_in_annotations_typeArray(
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1880
       AnnotationArray* annotations_typeArray, int &byte_i_ref, TRAPS) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1881
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1882
  if ((byte_i_ref + 2) > annotations_typeArray->length()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1883
    // not enough room for num_annotations field
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1884
    log_debug(redefine, class, annotation)("length() is too small for num_annotations field");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1885
    return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1886
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1887
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1888
  u2 num_annotations = Bytes::get_Java_u2((address)
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1889
                         annotations_typeArray->adr_at(byte_i_ref));
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1890
  byte_i_ref += 2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1891
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1892
  log_debug(redefine, class, annotation)("num_annotations=%d", num_annotations);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1893
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1894
  int calc_num_annotations = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1895
  for (; calc_num_annotations < num_annotations; calc_num_annotations++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1896
    if (!rewrite_cp_refs_in_annotation_struct(annotations_typeArray,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1897
           byte_i_ref, THREAD)) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1898
      log_debug(redefine, class, annotation)("bad annotation_struct at %d", calc_num_annotations);
2131
98f9cef66a34 6810672: Comment typos
twisti
parents: 1894
diff changeset
  1899
      // propagate failure back to caller
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1900
      return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1901
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1902
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1903
  assert(num_annotations == calc_num_annotations, "sanity check");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1904
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1905
  return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1906
} // end rewrite_cp_refs_in_annotations_typeArray()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1907
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1908
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1909
// Rewrite constant pool references in the annotation struct portion of
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1910
// an annotations_typeArray. This "structure" is from section 4.8.15 of
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1911
// the 2nd-edition of the VM spec:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1912
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1913
// struct annotation {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1914
//   u2 type_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1915
//   u2 num_element_value_pairs;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1916
//   {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1917
//     u2 element_name_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1918
//     element_value value;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1919
//   } element_value_pairs[num_element_value_pairs];
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1920
// }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1921
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1922
bool VM_RedefineClasses::rewrite_cp_refs_in_annotation_struct(
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1923
       AnnotationArray* annotations_typeArray, int &byte_i_ref, TRAPS) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1924
  if ((byte_i_ref + 2 + 2) > annotations_typeArray->length()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1925
    // not enough room for smallest annotation_struct
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1926
    log_debug(redefine, class, annotation)("length() is too small for annotation_struct");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1927
    return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1928
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1929
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1930
  u2 type_index = rewrite_cp_ref_in_annotation_data(annotations_typeArray,
33604
ad1cd9269bd4 8139116: Fixes for warning "format not a string literal"
goetz
parents: 33602
diff changeset
  1931
                    byte_i_ref, "type_index", THREAD);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1932
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1933
  u2 num_element_value_pairs = Bytes::get_Java_u2((address)
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1934
                                 annotations_typeArray->adr_at(byte_i_ref));
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1935
  byte_i_ref += 2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1936
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1937
  log_debug(redefine, class, annotation)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1938
    ("type_index=%d  num_element_value_pairs=%d", type_index, num_element_value_pairs);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1939
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1940
  int calc_num_element_value_pairs = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1941
  for (; calc_num_element_value_pairs < num_element_value_pairs;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1942
       calc_num_element_value_pairs++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1943
    if ((byte_i_ref + 2) > annotations_typeArray->length()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1944
      // not enough room for another element_name_index, let alone
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1945
      // the rest of another component
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1946
      log_debug(redefine, class, annotation)("length() is too small for element_name_index");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1947
      return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1948
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1949
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1950
    u2 element_name_index = rewrite_cp_ref_in_annotation_data(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1951
                              annotations_typeArray, byte_i_ref,
33604
ad1cd9269bd4 8139116: Fixes for warning "format not a string literal"
goetz
parents: 33602
diff changeset
  1952
                              "element_name_index", THREAD);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1953
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1954
    log_debug(redefine, class, annotation)("element_name_index=%d", element_name_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1955
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1956
    if (!rewrite_cp_refs_in_element_value(annotations_typeArray,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1957
           byte_i_ref, THREAD)) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1958
      log_debug(redefine, class, annotation)("bad element_value at %d", calc_num_element_value_pairs);
2131
98f9cef66a34 6810672: Comment typos
twisti
parents: 1894
diff changeset
  1959
      // propagate failure back to caller
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1960
      return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1961
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1962
  } // end for each component
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1963
  assert(num_element_value_pairs == calc_num_element_value_pairs,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1964
    "sanity check");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1965
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1966
  return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1967
} // end rewrite_cp_refs_in_annotation_struct()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1968
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1969
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1970
// Rewrite a constant pool reference at the current position in
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1971
// annotations_typeArray if needed. Returns the original constant
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1972
// pool reference if a rewrite was not needed or the new constant
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1973
// pool reference if a rewrite was needed.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1974
u2 VM_RedefineClasses::rewrite_cp_ref_in_annotation_data(
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1975
     AnnotationArray* annotations_typeArray, int &byte_i_ref,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1976
     const char * trace_mesg, TRAPS) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1977
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1978
  address cp_index_addr = (address)
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1979
    annotations_typeArray->adr_at(byte_i_ref);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1980
  u2 old_cp_index = Bytes::get_Java_u2(cp_index_addr);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1981
  u2 new_cp_index = find_new_index(old_cp_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1982
  if (new_cp_index != 0) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  1983
    log_debug(redefine, class, annotation)("mapped old %s=%d", trace_mesg, old_cp_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1984
    Bytes::put_Java_u2(cp_index_addr, new_cp_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1985
    old_cp_index = new_cp_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1986
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1987
  byte_i_ref += 2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1988
  return old_cp_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1989
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1990
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1991
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1992
// Rewrite constant pool references in the element_value portion of an
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1993
// annotations_typeArray. This "structure" is from section 4.8.15.1 of
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1994
// the 2nd-edition of the VM spec:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1995
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1996
// struct element_value {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1997
//   u1 tag;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1998
//   union {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1999
//     u2 const_value_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2000
//     {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2001
//       u2 type_name_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2002
//       u2 const_name_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2003
//     } enum_const_value;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2004
//     u2 class_info_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2005
//     annotation annotation_value;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2006
//     struct {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2007
//       u2 num_values;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2008
//       element_value values[num_values];
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2009
//     } array_value;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2010
//   } value;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2011
// }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2012
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2013
bool VM_RedefineClasses::rewrite_cp_refs_in_element_value(
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2014
       AnnotationArray* annotations_typeArray, int &byte_i_ref, TRAPS) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2015
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2016
  if ((byte_i_ref + 1) > annotations_typeArray->length()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2017
    // not enough room for a tag let alone the rest of an element_value
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2018
    log_debug(redefine, class, annotation)("length() is too small for a tag");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2019
    return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2020
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2021
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2022
  u1 tag = annotations_typeArray->at(byte_i_ref);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2023
  byte_i_ref++;
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2024
  log_debug(redefine, class, annotation)("tag='%c'", tag);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2025
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2026
  switch (tag) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2027
    // These BaseType tag values are from Table 4.2 in VM spec:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2028
    case 'B':  // byte
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2029
    case 'C':  // char
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2030
    case 'D':  // double
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2031
    case 'F':  // float
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2032
    case 'I':  // int
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2033
    case 'J':  // long
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2034
    case 'S':  // short
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2035
    case 'Z':  // boolean
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2036
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2037
    // The remaining tag values are from Table 4.8 in the 2nd-edition of
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2038
    // the VM spec:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2039
    case 's':
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2040
    {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2041
      // For the above tag values (including the BaseType values),
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2042
      // value.const_value_index is right union field.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2043
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2044
      if ((byte_i_ref + 2) > annotations_typeArray->length()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2045
        // not enough room for a const_value_index
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2046
        log_debug(redefine, class, annotation)("length() is too small for a const_value_index");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2047
        return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2048
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2049
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2050
      u2 const_value_index = rewrite_cp_ref_in_annotation_data(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2051
                               annotations_typeArray, byte_i_ref,
33604
ad1cd9269bd4 8139116: Fixes for warning "format not a string literal"
goetz
parents: 33602
diff changeset
  2052
                               "const_value_index", THREAD);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2053
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2054
      log_debug(redefine, class, annotation)("const_value_index=%d", const_value_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2055
    } break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2056
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2057
    case 'e':
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2058
    {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2059
      // for the above tag value, value.enum_const_value is right union field
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2060
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2061
      if ((byte_i_ref + 4) > annotations_typeArray->length()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2062
        // not enough room for a enum_const_value
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2063
        log_debug(redefine, class, annotation)("length() is too small for a enum_const_value");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2064
        return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2065
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2066
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2067
      u2 type_name_index = rewrite_cp_ref_in_annotation_data(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2068
                             annotations_typeArray, byte_i_ref,
33604
ad1cd9269bd4 8139116: Fixes for warning "format not a string literal"
goetz
parents: 33602
diff changeset
  2069
                             "type_name_index", THREAD);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2070
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2071
      u2 const_name_index = rewrite_cp_ref_in_annotation_data(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2072
                              annotations_typeArray, byte_i_ref,
33604
ad1cd9269bd4 8139116: Fixes for warning "format not a string literal"
goetz
parents: 33602
diff changeset
  2073
                              "const_name_index", THREAD);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2074
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2075
      log_debug(redefine, class, annotation)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2076
        ("type_name_index=%d  const_name_index=%d", type_name_index, const_name_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2077
    } break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2078
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2079
    case 'c':
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2080
    {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2081
      // for the above tag value, value.class_info_index is right union field
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2082
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2083
      if ((byte_i_ref + 2) > annotations_typeArray->length()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2084
        // not enough room for a class_info_index
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2085
        log_debug(redefine, class, annotation)("length() is too small for a class_info_index");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2086
        return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2087
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2088
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2089
      u2 class_info_index = rewrite_cp_ref_in_annotation_data(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2090
                              annotations_typeArray, byte_i_ref,
33604
ad1cd9269bd4 8139116: Fixes for warning "format not a string literal"
goetz
parents: 33602
diff changeset
  2091
                              "class_info_index", THREAD);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2092
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2093
      log_debug(redefine, class, annotation)("class_info_index=%d", class_info_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2094
    } break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2095
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2096
    case '@':
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2097
      // For the above tag value, value.attr_value is the right union
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2098
      // field. This is a nested annotation.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2099
      if (!rewrite_cp_refs_in_annotation_struct(annotations_typeArray,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2100
             byte_i_ref, THREAD)) {
2131
98f9cef66a34 6810672: Comment typos
twisti
parents: 1894
diff changeset
  2101
        // propagate failure back to caller
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2102
        return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2103
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2104
      break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2105
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2106
    case '[':
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2107
    {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2108
      if ((byte_i_ref + 2) > annotations_typeArray->length()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2109
        // not enough room for a num_values field
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2110
        log_debug(redefine, class, annotation)("length() is too small for a num_values field");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2111
        return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2112
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2113
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2114
      // For the above tag value, value.array_value is the right union
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2115
      // field. This is an array of nested element_value.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2116
      u2 num_values = Bytes::get_Java_u2((address)
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2117
                        annotations_typeArray->adr_at(byte_i_ref));
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2118
      byte_i_ref += 2;
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2119
      log_debug(redefine, class, annotation)("num_values=%d", num_values);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2120
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2121
      int calc_num_values = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2122
      for (; calc_num_values < num_values; calc_num_values++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2123
        if (!rewrite_cp_refs_in_element_value(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2124
               annotations_typeArray, byte_i_ref, THREAD)) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2125
          log_debug(redefine, class, annotation)("bad nested element_value at %d", calc_num_values);
2131
98f9cef66a34 6810672: Comment typos
twisti
parents: 1894
diff changeset
  2126
          // propagate failure back to caller
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2127
          return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2128
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2129
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2130
      assert(num_values == calc_num_values, "sanity check");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2131
    } break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2132
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2133
    default:
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2134
      log_debug(redefine, class, annotation)("bad tag=0x%x", tag);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2135
      return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2136
  } // end decode tag field
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2137
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2138
  return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2139
} // end rewrite_cp_refs_in_element_value()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2140
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2141
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2142
// Rewrite constant pool references in a fields_annotations field.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2143
bool VM_RedefineClasses::rewrite_cp_refs_in_fields_annotations(
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  2144
       InstanceKlass* scratch_class, TRAPS) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2145
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  2146
  Array<AnnotationArray*>* fields_annotations = scratch_class->fields_annotations();
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2147
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2148
  if (fields_annotations == NULL || fields_annotations->length() == 0) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2149
    // no fields_annotations so nothing to do
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2150
    return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2151
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2152
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2153
  log_debug(redefine, class, annotation)("fields_annotations length=%d", fields_annotations->length());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2154
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2155
  for (int i = 0; i < fields_annotations->length(); i++) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2156
    AnnotationArray* field_annotations = fields_annotations->at(i);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2157
    if (field_annotations == NULL || field_annotations->length() == 0) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2158
      // this field does not have any annotations so skip it
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2159
      continue;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2160
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2161
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2162
    int byte_i = 0;  // byte index into field_annotations
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2163
    if (!rewrite_cp_refs_in_annotations_typeArray(field_annotations, byte_i,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2164
           THREAD)) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2165
      log_debug(redefine, class, annotation)("bad field_annotations at %d", i);
2131
98f9cef66a34 6810672: Comment typos
twisti
parents: 1894
diff changeset
  2166
      // propagate failure back to caller
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2167
      return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2168
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2169
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2170
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2171
  return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2172
} // end rewrite_cp_refs_in_fields_annotations()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2173
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2174
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2175
// Rewrite constant pool references in a methods_annotations field.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2176
bool VM_RedefineClasses::rewrite_cp_refs_in_methods_annotations(
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  2177
       InstanceKlass* scratch_class, TRAPS) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2178
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  2179
  for (int i = 0; i < scratch_class->methods()->length(); i++) {
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  2180
    Method* m = scratch_class->methods()->at(i);
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  2181
    AnnotationArray* method_annotations = m->constMethod()->method_annotations();
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  2182
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2183
    if (method_annotations == NULL || method_annotations->length() == 0) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2184
      // this method does not have any annotations so skip it
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2185
      continue;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2186
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2187
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2188
    int byte_i = 0;  // byte index into method_annotations
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2189
    if (!rewrite_cp_refs_in_annotations_typeArray(method_annotations, byte_i,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2190
           THREAD)) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2191
      log_debug(redefine, class, annotation)("bad method_annotations at %d", i);
2131
98f9cef66a34 6810672: Comment typos
twisti
parents: 1894
diff changeset
  2192
      // propagate failure back to caller
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2193
      return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2194
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2195
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2196
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2197
  return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2198
} // end rewrite_cp_refs_in_methods_annotations()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2199
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2200
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2201
// Rewrite constant pool references in a methods_parameter_annotations
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2202
// field. This "structure" is adapted from the
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2203
// RuntimeVisibleParameterAnnotations_attribute described in section
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2204
// 4.8.17 of the 2nd-edition of the VM spec:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2205
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2206
// methods_parameter_annotations_typeArray {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2207
//   u1 num_parameters;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2208
//   {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2209
//     u2 num_annotations;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2210
//     annotation annotations[num_annotations];
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2211
//   } parameter_annotations[num_parameters];
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2212
// }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2213
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2214
bool VM_RedefineClasses::rewrite_cp_refs_in_methods_parameter_annotations(
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  2215
       InstanceKlass* scratch_class, TRAPS) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2216
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  2217
  for (int i = 0; i < scratch_class->methods()->length(); i++) {
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  2218
    Method* m = scratch_class->methods()->at(i);
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  2219
    AnnotationArray* method_parameter_annotations = m->constMethod()->parameter_annotations();
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2220
    if (method_parameter_annotations == NULL
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2221
        || method_parameter_annotations->length() == 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2222
      // this method does not have any parameter annotations so skip it
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2223
      continue;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2224
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2225
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2226
    if (method_parameter_annotations->length() < 1) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2227
      // not enough room for a num_parameters field
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2228
      log_debug(redefine, class, annotation)("length() is too small for a num_parameters field at %d", i);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2229
      return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2230
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2231
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2232
    int byte_i = 0;  // byte index into method_parameter_annotations
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2233
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2234
    u1 num_parameters = method_parameter_annotations->at(byte_i);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2235
    byte_i++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2236
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2237
    log_debug(redefine, class, annotation)("num_parameters=%d", num_parameters);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2238
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2239
    int calc_num_parameters = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2240
    for (; calc_num_parameters < num_parameters; calc_num_parameters++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2241
      if (!rewrite_cp_refs_in_annotations_typeArray(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2242
             method_parameter_annotations, byte_i, THREAD)) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2243
        log_debug(redefine, class, annotation)("bad method_parameter_annotations at %d", calc_num_parameters);
2131
98f9cef66a34 6810672: Comment typos
twisti
parents: 1894
diff changeset
  2244
        // propagate failure back to caller
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2245
        return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2246
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2247
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2248
    assert(num_parameters == calc_num_parameters, "sanity check");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2249
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2250
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2251
  return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2252
} // end rewrite_cp_refs_in_methods_parameter_annotations()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2253
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2254
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2255
// Rewrite constant pool references in a methods_default_annotations
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2256
// field. This "structure" is adapted from the AnnotationDefault_attribute
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2257
// that is described in section 4.8.19 of the 2nd-edition of the VM spec:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2258
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2259
// methods_default_annotations_typeArray {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2260
//   element_value default_value;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2261
// }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2262
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2263
bool VM_RedefineClasses::rewrite_cp_refs_in_methods_default_annotations(
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  2264
       InstanceKlass* scratch_class, TRAPS) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2265
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  2266
  for (int i = 0; i < scratch_class->methods()->length(); i++) {
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  2267
    Method* m = scratch_class->methods()->at(i);
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  2268
    AnnotationArray* method_default_annotations = m->constMethod()->default_annotations();
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2269
    if (method_default_annotations == NULL
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2270
        || method_default_annotations->length() == 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2271
      // this method does not have any default annotations so skip it
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2272
      continue;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2273
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2274
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2275
    int byte_i = 0;  // byte index into method_default_annotations
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2276
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2277
    if (!rewrite_cp_refs_in_element_value(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2278
           method_default_annotations, byte_i, THREAD)) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2279
      log_debug(redefine, class, annotation)("bad default element_value at %d", i);
2131
98f9cef66a34 6810672: Comment typos
twisti
parents: 1894
diff changeset
  2280
      // propagate failure back to caller
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2281
      return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2282
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2283
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2284
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2285
  return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2286
} // end rewrite_cp_refs_in_methods_default_annotations()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2287
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2288
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2289
// Rewrite constant pool references in a class_type_annotations field.
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2290
bool VM_RedefineClasses::rewrite_cp_refs_in_class_type_annotations(
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  2291
       InstanceKlass* scratch_class, TRAPS) {
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2292
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2293
  AnnotationArray* class_type_annotations = scratch_class->class_type_annotations();
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2294
  if (class_type_annotations == NULL || class_type_annotations->length() == 0) {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2295
    // no class_type_annotations so nothing to do
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2296
    return true;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2297
  }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2298
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2299
  log_debug(redefine, class, annotation)("class_type_annotations length=%d", class_type_annotations->length());
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2300
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2301
  int byte_i = 0;  // byte index into class_type_annotations
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2302
  return rewrite_cp_refs_in_type_annotations_typeArray(class_type_annotations,
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2303
      byte_i, "ClassFile", THREAD);
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2304
} // end rewrite_cp_refs_in_class_type_annotations()
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2305
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2306
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2307
// Rewrite constant pool references in a fields_type_annotations field.
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2308
bool VM_RedefineClasses::rewrite_cp_refs_in_fields_type_annotations(
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  2309
       InstanceKlass* scratch_class, TRAPS) {
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2310
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2311
  Array<AnnotationArray*>* fields_type_annotations = scratch_class->fields_type_annotations();
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2312
  if (fields_type_annotations == NULL || fields_type_annotations->length() == 0) {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2313
    // no fields_type_annotations so nothing to do
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2314
    return true;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2315
  }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2316
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2317
  log_debug(redefine, class, annotation)("fields_type_annotations length=%d", fields_type_annotations->length());
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2318
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2319
  for (int i = 0; i < fields_type_annotations->length(); i++) {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2320
    AnnotationArray* field_type_annotations = fields_type_annotations->at(i);
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2321
    if (field_type_annotations == NULL || field_type_annotations->length() == 0) {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2322
      // this field does not have any annotations so skip it
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2323
      continue;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2324
    }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2325
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2326
    int byte_i = 0;  // byte index into field_type_annotations
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2327
    if (!rewrite_cp_refs_in_type_annotations_typeArray(field_type_annotations,
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2328
           byte_i, "field_info", THREAD)) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2329
      log_debug(redefine, class, annotation)("bad field_type_annotations at %d", i);
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2330
      // propagate failure back to caller
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2331
      return false;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2332
    }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2333
  }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2334
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2335
  return true;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2336
} // end rewrite_cp_refs_in_fields_type_annotations()
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2337
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2338
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2339
// Rewrite constant pool references in a methods_type_annotations field.
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2340
bool VM_RedefineClasses::rewrite_cp_refs_in_methods_type_annotations(
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  2341
       InstanceKlass* scratch_class, TRAPS) {
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2342
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2343
  for (int i = 0; i < scratch_class->methods()->length(); i++) {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2344
    Method* m = scratch_class->methods()->at(i);
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2345
    AnnotationArray* method_type_annotations = m->constMethod()->type_annotations();
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2346
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2347
    if (method_type_annotations == NULL || method_type_annotations->length() == 0) {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2348
      // this method does not have any annotations so skip it
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2349
      continue;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2350
    }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2351
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2352
    log_debug(redefine, class, annotation)("methods type_annotations length=%d", method_type_annotations->length());
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2353
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2354
    int byte_i = 0;  // byte index into method_type_annotations
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2355
    if (!rewrite_cp_refs_in_type_annotations_typeArray(method_type_annotations,
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2356
           byte_i, "method_info", THREAD)) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2357
      log_debug(redefine, class, annotation)("bad method_type_annotations at %d", i);
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2358
      // propagate failure back to caller
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2359
      return false;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2360
    }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2361
  }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2362
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2363
  return true;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2364
} // end rewrite_cp_refs_in_methods_type_annotations()
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2365
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2366
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2367
// Rewrite constant pool references in a type_annotations
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2368
// field. This "structure" is adapted from the
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2369
// RuntimeVisibleTypeAnnotations_attribute described in
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2370
// section 4.7.20 of the Java SE 8 Edition of the VM spec:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2371
//
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2372
// type_annotations_typeArray {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2373
//   u2              num_annotations;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2374
//   type_annotation annotations[num_annotations];
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2375
// }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2376
//
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2377
bool VM_RedefineClasses::rewrite_cp_refs_in_type_annotations_typeArray(
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2378
       AnnotationArray* type_annotations_typeArray, int &byte_i_ref,
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2379
       const char * location_mesg, TRAPS) {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2380
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2381
  if ((byte_i_ref + 2) > type_annotations_typeArray->length()) {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2382
    // not enough room for num_annotations field
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2383
    log_debug(redefine, class, annotation)("length() is too small for num_annotations field");
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2384
    return false;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2385
  }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2386
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2387
  u2 num_annotations = Bytes::get_Java_u2((address)
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2388
                         type_annotations_typeArray->adr_at(byte_i_ref));
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2389
  byte_i_ref += 2;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2390
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2391
  log_debug(redefine, class, annotation)("num_type_annotations=%d", num_annotations);
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2392
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2393
  int calc_num_annotations = 0;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2394
  for (; calc_num_annotations < num_annotations; calc_num_annotations++) {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2395
    if (!rewrite_cp_refs_in_type_annotation_struct(type_annotations_typeArray,
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2396
           byte_i_ref, location_mesg, THREAD)) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2397
      log_debug(redefine, class, annotation)("bad type_annotation_struct at %d", calc_num_annotations);
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2398
      // propagate failure back to caller
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2399
      return false;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2400
    }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2401
  }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2402
  assert(num_annotations == calc_num_annotations, "sanity check");
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2403
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2404
  if (byte_i_ref != type_annotations_typeArray->length()) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2405
    log_debug(redefine, class, annotation)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2406
      ("read wrong amount of bytes at end of processing type_annotations_typeArray (%d of %d bytes were read)",
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2407
       byte_i_ref, type_annotations_typeArray->length());
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2408
    return false;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2409
  }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2410
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2411
  return true;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2412
} // end rewrite_cp_refs_in_type_annotations_typeArray()
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2413
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2414
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2415
// Rewrite constant pool references in a type_annotation
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2416
// field. This "structure" is adapted from the
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2417
// RuntimeVisibleTypeAnnotations_attribute described in
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2418
// section 4.7.20 of the Java SE 8 Edition of the VM spec:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2419
//
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2420
// type_annotation {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2421
//   u1 target_type;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2422
//   union {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2423
//     type_parameter_target;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2424
//     supertype_target;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2425
//     type_parameter_bound_target;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2426
//     empty_target;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2427
//     method_formal_parameter_target;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2428
//     throws_target;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2429
//     localvar_target;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2430
//     catch_target;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2431
//     offset_target;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2432
//     type_argument_target;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2433
//   } target_info;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2434
//   type_path target_path;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2435
//   annotation anno;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2436
// }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2437
//
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2438
bool VM_RedefineClasses::rewrite_cp_refs_in_type_annotation_struct(
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2439
       AnnotationArray* type_annotations_typeArray, int &byte_i_ref,
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2440
       const char * location_mesg, TRAPS) {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2441
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2442
  if (!skip_type_annotation_target(type_annotations_typeArray,
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2443
         byte_i_ref, location_mesg, THREAD)) {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2444
    return false;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2445
  }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2446
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2447
  if (!skip_type_annotation_type_path(type_annotations_typeArray,
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2448
         byte_i_ref, THREAD)) {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2449
    return false;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2450
  }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2451
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2452
  if (!rewrite_cp_refs_in_annotation_struct(type_annotations_typeArray,
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2453
         byte_i_ref, THREAD)) {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2454
    return false;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2455
  }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2456
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2457
  return true;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2458
} // end rewrite_cp_refs_in_type_annotation_struct()
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2459
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2460
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2461
// Read, verify and skip over the target_type and target_info part
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2462
// so that rewriting can continue in the later parts of the struct.
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2463
//
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2464
// u1 target_type;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2465
// union {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2466
//   type_parameter_target;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2467
//   supertype_target;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2468
//   type_parameter_bound_target;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2469
//   empty_target;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2470
//   method_formal_parameter_target;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2471
//   throws_target;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2472
//   localvar_target;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2473
//   catch_target;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2474
//   offset_target;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2475
//   type_argument_target;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2476
// } target_info;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2477
//
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2478
bool VM_RedefineClasses::skip_type_annotation_target(
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2479
       AnnotationArray* type_annotations_typeArray, int &byte_i_ref,
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2480
       const char * location_mesg, TRAPS) {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2481
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2482
  if ((byte_i_ref + 1) > type_annotations_typeArray->length()) {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2483
    // not enough room for a target_type let alone the rest of a type_annotation
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2484
    log_debug(redefine, class, annotation)("length() is too small for a target_type");
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2485
    return false;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2486
  }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2487
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2488
  u1 target_type = type_annotations_typeArray->at(byte_i_ref);
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2489
  byte_i_ref += 1;
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2490
  log_debug(redefine, class, annotation)("target_type=0x%.2x", target_type);
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2491
  log_debug(redefine, class, annotation)("location=%s", location_mesg);
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2492
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2493
  // Skip over target_info
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2494
  switch (target_type) {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2495
    case 0x00:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2496
    // kind: type parameter declaration of generic class or interface
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2497
    // location: ClassFile
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2498
    case 0x01:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2499
    // kind: type parameter declaration of generic method or constructor
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2500
    // location: method_info
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2501
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2502
    {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2503
      // struct:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2504
      // type_parameter_target {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2505
      //   u1 type_parameter_index;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2506
      // }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2507
      //
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2508
      if ((byte_i_ref + 1) > type_annotations_typeArray->length()) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2509
        log_debug(redefine, class, annotation)("length() is too small for a type_parameter_target");
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2510
        return false;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2511
      }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2512
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2513
      u1 type_parameter_index = type_annotations_typeArray->at(byte_i_ref);
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2514
      byte_i_ref += 1;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2515
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2516
      log_debug(redefine, class, annotation)("type_parameter_target: type_parameter_index=%d", type_parameter_index);
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2517
    } break;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2518
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2519
    case 0x10:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2520
    // kind: type in extends clause of class or interface declaration
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2521
    //       (including the direct superclass of an anonymous class declaration),
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2522
    //       or in implements clause of interface declaration
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2523
    // location: ClassFile
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2524
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2525
    {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2526
      // struct:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2527
      // supertype_target {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2528
      //   u2 supertype_index;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2529
      // }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2530
      //
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2531
      if ((byte_i_ref + 2) > type_annotations_typeArray->length()) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2532
        log_debug(redefine, class, annotation)("length() is too small for a supertype_target");
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2533
        return false;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2534
      }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2535
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2536
      u2 supertype_index = Bytes::get_Java_u2((address)
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2537
                             type_annotations_typeArray->adr_at(byte_i_ref));
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2538
      byte_i_ref += 2;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2539
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2540
      log_debug(redefine, class, annotation)("supertype_target: supertype_index=%d", supertype_index);
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2541
    } break;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2542
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2543
    case 0x11:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2544
    // kind: type in bound of type parameter declaration of generic class or interface
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2545
    // location: ClassFile
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2546
    case 0x12:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2547
    // kind: type in bound of type parameter declaration of generic method or constructor
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2548
    // location: method_info
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2549
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2550
    {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2551
      // struct:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2552
      // type_parameter_bound_target {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2553
      //   u1 type_parameter_index;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2554
      //   u1 bound_index;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2555
      // }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2556
      //
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2557
      if ((byte_i_ref + 2) > type_annotations_typeArray->length()) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2558
        log_debug(redefine, class, annotation)("length() is too small for a type_parameter_bound_target");
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2559
        return false;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2560
      }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2561
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2562
      u1 type_parameter_index = type_annotations_typeArray->at(byte_i_ref);
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2563
      byte_i_ref += 1;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2564
      u1 bound_index = type_annotations_typeArray->at(byte_i_ref);
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2565
      byte_i_ref += 1;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2566
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2567
      log_debug(redefine, class, annotation)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2568
        ("type_parameter_bound_target: type_parameter_index=%d, bound_index=%d", type_parameter_index, bound_index);
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2569
    } break;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2570
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2571
    case 0x13:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2572
    // kind: type in field declaration
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2573
    // location: field_info
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2574
    case 0x14:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2575
    // kind: return type of method, or type of newly constructed object
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2576
    // location: method_info
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2577
    case 0x15:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2578
    // kind: receiver type of method or constructor
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2579
    // location: method_info
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2580
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2581
    {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2582
      // struct:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2583
      // empty_target {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2584
      // }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2585
      //
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2586
      log_debug(redefine, class, annotation)("empty_target");
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2587
    } break;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2588
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2589
    case 0x16:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2590
    // kind: type in formal parameter declaration of method, constructor, or lambda expression
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2591
    // location: method_info
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2592
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2593
    {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2594
      // struct:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2595
      // formal_parameter_target {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2596
      //   u1 formal_parameter_index;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2597
      // }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2598
      //
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2599
      if ((byte_i_ref + 1) > type_annotations_typeArray->length()) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2600
        log_debug(redefine, class, annotation)("length() is too small for a formal_parameter_target");
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2601
        return false;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2602
      }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2603
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2604
      u1 formal_parameter_index = type_annotations_typeArray->at(byte_i_ref);
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2605
      byte_i_ref += 1;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2606
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2607
      log_debug(redefine, class, annotation)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2608
        ("formal_parameter_target: formal_parameter_index=%d", formal_parameter_index);
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2609
    } break;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2610
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2611
    case 0x17:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2612
    // kind: type in throws clause of method or constructor
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2613
    // location: method_info
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2614
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2615
    {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2616
      // struct:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2617
      // throws_target {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2618
      //   u2 throws_type_index
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2619
      // }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2620
      //
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2621
      if ((byte_i_ref + 2) > type_annotations_typeArray->length()) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2622
        log_debug(redefine, class, annotation)("length() is too small for a throws_target");
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2623
        return false;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2624
      }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2625
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2626
      u2 throws_type_index = Bytes::get_Java_u2((address)
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2627
                               type_annotations_typeArray->adr_at(byte_i_ref));
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2628
      byte_i_ref += 2;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2629
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2630
      log_debug(redefine, class, annotation)("throws_target: throws_type_index=%d", throws_type_index);
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2631
    } break;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2632
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2633
    case 0x40:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2634
    // kind: type in local variable declaration
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2635
    // location: Code
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2636
    case 0x41:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2637
    // kind: type in resource variable declaration
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2638
    // location: Code
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2639
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2640
    {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2641
      // struct:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2642
      // localvar_target {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2643
      //   u2 table_length;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2644
      //   struct {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2645
      //     u2 start_pc;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2646
      //     u2 length;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2647
      //     u2 index;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2648
      //   } table[table_length];
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2649
      // }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2650
      //
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2651
      if ((byte_i_ref + 2) > type_annotations_typeArray->length()) {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2652
        // not enough room for a table_length let alone the rest of a localvar_target
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2653
        log_debug(redefine, class, annotation)("length() is too small for a localvar_target table_length");
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2654
        return false;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2655
      }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2656
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2657
      u2 table_length = Bytes::get_Java_u2((address)
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2658
                          type_annotations_typeArray->adr_at(byte_i_ref));
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2659
      byte_i_ref += 2;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2660
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2661
      log_debug(redefine, class, annotation)("localvar_target: table_length=%d", table_length);
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2662
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2663
      int table_struct_size = 2 + 2 + 2; // 3 u2 variables per table entry
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2664
      int table_size = table_length * table_struct_size;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2665
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2666
      if ((byte_i_ref + table_size) > type_annotations_typeArray->length()) {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2667
        // not enough room for a table
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2668
        log_debug(redefine, class, annotation)("length() is too small for a table array of length %d", table_length);
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2669
        return false;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2670
      }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2671
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2672
      // Skip over table
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2673
      byte_i_ref += table_size;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2674
    } break;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2675
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2676
    case 0x42:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2677
    // kind: type in exception parameter declaration
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2678
    // location: Code
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2679
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2680
    {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2681
      // struct:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2682
      // catch_target {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2683
      //   u2 exception_table_index;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2684
      // }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2685
      //
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2686
      if ((byte_i_ref + 2) > type_annotations_typeArray->length()) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2687
        log_debug(redefine, class, annotation)("length() is too small for a catch_target");
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2688
        return false;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2689
      }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2690
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2691
      u2 exception_table_index = Bytes::get_Java_u2((address)
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2692
                                   type_annotations_typeArray->adr_at(byte_i_ref));
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2693
      byte_i_ref += 2;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2694
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2695
      log_debug(redefine, class, annotation)("catch_target: exception_table_index=%d", exception_table_index);
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2696
    } break;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2697
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2698
    case 0x43:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2699
    // kind: type in instanceof expression
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2700
    // location: Code
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2701
    case 0x44:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2702
    // kind: type in new expression
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2703
    // location: Code
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2704
    case 0x45:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2705
    // kind: type in method reference expression using ::new
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2706
    // location: Code
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2707
    case 0x46:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2708
    // kind: type in method reference expression using ::Identifier
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2709
    // location: Code
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2710
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2711
    {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2712
      // struct:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2713
      // offset_target {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2714
      //   u2 offset;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2715
      // }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2716
      //
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2717
      if ((byte_i_ref + 2) > type_annotations_typeArray->length()) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2718
        log_debug(redefine, class, annotation)("length() is too small for a offset_target");
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2719
        return false;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2720
      }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2721
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2722
      u2 offset = Bytes::get_Java_u2((address)
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2723
                    type_annotations_typeArray->adr_at(byte_i_ref));
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2724
      byte_i_ref += 2;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2725
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2726
      log_debug(redefine, class, annotation)("offset_target: offset=%d", offset);
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2727
    } break;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2728
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2729
    case 0x47:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2730
    // kind: type in cast expression
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2731
    // location: Code
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2732
    case 0x48:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2733
    // kind: type argument for generic constructor in new expression or
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2734
    //       explicit constructor invocation statement
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2735
    // location: Code
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2736
    case 0x49:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2737
    // kind: type argument for generic method in method invocation expression
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2738
    // location: Code
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2739
    case 0x4A:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2740
    // kind: type argument for generic constructor in method reference expression using ::new
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2741
    // location: Code
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2742
    case 0x4B:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2743
    // kind: type argument for generic method in method reference expression using ::Identifier
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2744
    // location: Code
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2745
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2746
    {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2747
      // struct:
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2748
      // type_argument_target {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2749
      //   u2 offset;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2750
      //   u1 type_argument_index;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2751
      // }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2752
      //
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2753
      if ((byte_i_ref + 3) > type_annotations_typeArray->length()) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2754
        log_debug(redefine, class, annotation)("length() is too small for a type_argument_target");
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2755
        return false;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2756
      }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2757
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2758
      u2 offset = Bytes::get_Java_u2((address)
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2759
                    type_annotations_typeArray->adr_at(byte_i_ref));
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2760
      byte_i_ref += 2;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2761
      u1 type_argument_index = type_annotations_typeArray->at(byte_i_ref);
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2762
      byte_i_ref += 1;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2763
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2764
      log_debug(redefine, class, annotation)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2765
        ("type_argument_target: offset=%d, type_argument_index=%d", offset, type_argument_index);
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2766
    } break;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2767
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2768
    default:
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2769
      log_debug(redefine, class, annotation)("unknown target_type");
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2770
#ifdef ASSERT
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2771
      ShouldNotReachHere();
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2772
#endif
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2773
      return false;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2774
  }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2775
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2776
  return true;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2777
} // end skip_type_annotation_target()
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2778
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2779
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2780
// Read, verify and skip over the type_path part so that rewriting
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2781
// can continue in the later parts of the struct.
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2782
//
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2783
// type_path {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2784
//   u1 path_length;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2785
//   {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2786
//     u1 type_path_kind;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2787
//     u1 type_argument_index;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2788
//   } path[path_length];
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2789
// }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2790
//
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2791
bool VM_RedefineClasses::skip_type_annotation_type_path(
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2792
       AnnotationArray* type_annotations_typeArray, int &byte_i_ref, TRAPS) {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2793
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2794
  if ((byte_i_ref + 1) > type_annotations_typeArray->length()) {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2795
    // not enough room for a path_length let alone the rest of the type_path
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2796
    log_debug(redefine, class, annotation)("length() is too small for a type_path");
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2797
    return false;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2798
  }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2799
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2800
  u1 path_length = type_annotations_typeArray->at(byte_i_ref);
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2801
  byte_i_ref += 1;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2802
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2803
  log_debug(redefine, class, annotation)("type_path: path_length=%d", path_length);
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2804
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2805
  int calc_path_length = 0;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2806
  for (; calc_path_length < path_length; calc_path_length++) {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2807
    if ((byte_i_ref + 1 + 1) > type_annotations_typeArray->length()) {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2808
      // not enough room for a path
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2809
      log_debug(redefine, class, annotation)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2810
        ("length() is too small for path entry %d of %d", calc_path_length, path_length);
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2811
      return false;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2812
    }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2813
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2814
    u1 type_path_kind = type_annotations_typeArray->at(byte_i_ref);
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2815
    byte_i_ref += 1;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2816
    u1 type_argument_index = type_annotations_typeArray->at(byte_i_ref);
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2817
    byte_i_ref += 1;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2818
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2819
    log_debug(redefine, class, annotation)
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2820
      ("type_path: path[%d]: type_path_kind=%d, type_argument_index=%d",
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2821
       calc_path_length, type_path_kind, type_argument_index);
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2822
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2823
    if (type_path_kind > 3 || (type_path_kind != 3 && type_argument_index != 0)) {
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2824
      // not enough room for a path
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2825
      log_debug(redefine, class, annotation)("inconsistent type_path values");
27401
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2826
      return false;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2827
    }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2828
  }
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2829
  assert(path_length == calc_path_length, "sanity check");
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2830
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2831
  return true;
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2832
} // end skip_type_annotation_type_path()
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2833
a4697c9502cb 8057043: Type annotations not retained during class redefine / retransform
aeriksso
parents: 26558
diff changeset
  2834
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2835
// Rewrite constant pool references in the method's stackmap table.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2836
// These "structures" are adapted from the StackMapTable_attribute that
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2837
// is described in section 4.8.4 of the 6.0 version of the VM spec
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2838
// (dated 2005.10.26):
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2839
// file:///net/quincunx.sfbay/export/gbracha/ClassFile-Java6.pdf
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2840
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2841
// stack_map {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2842
//   u2 number_of_entries;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2843
//   stack_map_frame entries[number_of_entries];
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2844
// }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2845
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2846
void VM_RedefineClasses::rewrite_cp_refs_in_stack_map_table(
33593
60764a78fa5c 8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents: 33148
diff changeset
  2847
       const methodHandle& method, TRAPS) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2848
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2849
  if (!method->has_stackmap_table()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2850
    return;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2851
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2852
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2853
  AnnotationArray* stackmap_data = method->stackmap_data();
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2854
  address stackmap_p = (address)stackmap_data->adr_at(0);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2855
  address stackmap_end = stackmap_p + stackmap_data->length();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2856
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2857
  assert(stackmap_p + 2 <= stackmap_end, "no room for number_of_entries");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2858
  u2 number_of_entries = Bytes::get_Java_u2(stackmap_p);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2859
  stackmap_p += 2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2860
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  2861
  log_debug(redefine, class, stackmap)("number_of_entries=%u", number_of_entries);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2862
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2863
  // walk through each stack_map_frame
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2864
  u2 calc_number_of_entries = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2865
  for (; calc_number_of_entries < number_of_entries; calc_number_of_entries++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2866
    // The stack_map_frame structure is a u1 frame_type followed by
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2867
    // 0 or more bytes of data:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2868
    //
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2869
    // union stack_map_frame {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2870
    //   same_frame;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2871
    //   same_locals_1_stack_item_frame;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2872
    //   same_locals_1_stack_item_frame_extended;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2873
    //   chop_frame;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2874
    //   same_frame_extended;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2875
    //   append_frame;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2876
    //   full_frame;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2877
    // }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2878
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2879
    assert(stackmap_p + 1 <= stackmap_end, "no room for frame_type");
29580
a67a581cfe11 8073315: Enable gcc -Wtype-limits and fix upcoming issues.
goetz
parents: 29316
diff changeset
  2880
    u1 frame_type = *stackmap_p;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2881
    stackmap_p++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2882
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2883
    // same_frame {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2884
    //   u1 frame_type = SAME; /* 0-63 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2885
    // }
29580
a67a581cfe11 8073315: Enable gcc -Wtype-limits and fix upcoming issues.
goetz
parents: 29316
diff changeset
  2886
    if (frame_type <= 63) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2887
      // nothing more to do for same_frame
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2888
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2889
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2890
    // same_locals_1_stack_item_frame {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2891
    //   u1 frame_type = SAME_LOCALS_1_STACK_ITEM; /* 64-127 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2892
    //   verification_type_info stack[1];
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2893
    // }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2894
    else if (frame_type >= 64 && frame_type <= 127) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2895
      rewrite_cp_refs_in_verification_type_info(stackmap_p, stackmap_end,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2896
        calc_number_of_entries, frame_type, THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2897
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2898
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2899
    // reserved for future use
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2900
    else if (frame_type >= 128 && frame_type <= 246) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2901
      // nothing more to do for reserved frame_types
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2902
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2903
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2904
    // same_locals_1_stack_item_frame_extended {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2905
    //   u1 frame_type = SAME_LOCALS_1_STACK_ITEM_EXTENDED; /* 247 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2906
    //   u2 offset_delta;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2907
    //   verification_type_info stack[1];
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2908
    // }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2909
    else if (frame_type == 247) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2910
      stackmap_p += 2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2911
      rewrite_cp_refs_in_verification_type_info(stackmap_p, stackmap_end,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2912
        calc_number_of_entries, frame_type, THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2913
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2914
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2915
    // chop_frame {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2916
    //   u1 frame_type = CHOP; /* 248-250 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2917
    //   u2 offset_delta;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2918
    // }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2919
    else if (frame_type >= 248 && frame_type <= 250) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2920
      stackmap_p += 2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2921
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2922
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2923
    // same_frame_extended {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2924
    //   u1 frame_type = SAME_FRAME_EXTENDED; /* 251*/
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2925
    //   u2 offset_delta;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2926
    // }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2927
    else if (frame_type == 251) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2928
      stackmap_p += 2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2929
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2930
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2931
    // append_frame {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2932
    //   u1 frame_type = APPEND; /* 252-254 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2933
    //   u2 offset_delta;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2934
    //   verification_type_info locals[frame_type - 251];
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2935
    // }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2936
    else if (frame_type >= 252 && frame_type <= 254) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2937
      assert(stackmap_p + 2 <= stackmap_end,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2938
        "no room for offset_delta");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2939
      stackmap_p += 2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2940
      u1 len = frame_type - 251;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2941
      for (u1 i = 0; i < len; i++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2942
        rewrite_cp_refs_in_verification_type_info(stackmap_p, stackmap_end,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2943
          calc_number_of_entries, frame_type, THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2944
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2945
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2946
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2947
    // full_frame {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2948
    //   u1 frame_type = FULL_FRAME; /* 255 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2949
    //   u2 offset_delta;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2950
    //   u2 number_of_locals;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2951
    //   verification_type_info locals[number_of_locals];
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2952
    //   u2 number_of_stack_items;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2953
    //   verification_type_info stack[number_of_stack_items];
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2954
    // }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2955
    else if (frame_type == 255) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2956
      assert(stackmap_p + 2 + 2 <= stackmap_end,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2957
        "no room for smallest full_frame");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2958
      stackmap_p += 2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2959
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2960
      u2 number_of_locals = Bytes::get_Java_u2(stackmap_p);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2961
      stackmap_p += 2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2962
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2963
      for (u2 locals_i = 0; locals_i < number_of_locals; locals_i++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2964
        rewrite_cp_refs_in_verification_type_info(stackmap_p, stackmap_end,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2965
          calc_number_of_entries, frame_type, THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2966
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2967
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2968
      // Use the largest size for the number_of_stack_items, but only get
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2969
      // the right number of bytes.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2970
      u2 number_of_stack_items = Bytes::get_Java_u2(stackmap_p);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2971
      stackmap_p += 2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2972
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2973
      for (u2 stack_i = 0; stack_i < number_of_stack_items; stack_i++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2974
        rewrite_cp_refs_in_verification_type_info(stackmap_p, stackmap_end,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2975
          calc_number_of_entries, frame_type, THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2976
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2977
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2978
  } // end while there is a stack_map_frame
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2979
  assert(number_of_entries == calc_number_of_entries, "sanity check");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2980
} // end rewrite_cp_refs_in_stack_map_table()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2981
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2982
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2983
// Rewrite constant pool references in the verification type info
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2984
// portion of the method's stackmap table. These "structures" are
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2985
// adapted from the StackMapTable_attribute that is described in
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2986
// section 4.8.4 of the 6.0 version of the VM spec (dated 2005.10.26):
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2987
// file:///net/quincunx.sfbay/export/gbracha/ClassFile-Java6.pdf
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2988
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2989
// The verification_type_info structure is a u1 tag followed by 0 or
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2990
// more bytes of data:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2991
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2992
// union verification_type_info {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2993
//   Top_variable_info;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2994
//   Integer_variable_info;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2995
//   Float_variable_info;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2996
//   Long_variable_info;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2997
//   Double_variable_info;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2998
//   Null_variable_info;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2999
//   UninitializedThis_variable_info;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3000
//   Object_variable_info;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3001
//   Uninitialized_variable_info;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3002
// }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3003
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3004
void VM_RedefineClasses::rewrite_cp_refs_in_verification_type_info(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3005
       address& stackmap_p_ref, address stackmap_end, u2 frame_i,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3006
       u1 frame_type, TRAPS) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3007
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3008
  assert(stackmap_p_ref + 1 <= stackmap_end, "no room for tag");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3009
  u1 tag = *stackmap_p_ref;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3010
  stackmap_p_ref++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3011
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3012
  switch (tag) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3013
  // Top_variable_info {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3014
  //   u1 tag = ITEM_Top; /* 0 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3015
  // }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3016
  // verificationType.hpp has zero as ITEM_Bogus instead of ITEM_Top
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3017
  case 0:  // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3018
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3019
  // Integer_variable_info {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3020
  //   u1 tag = ITEM_Integer; /* 1 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3021
  // }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3022
  case ITEM_Integer:  // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3023
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3024
  // Float_variable_info {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3025
  //   u1 tag = ITEM_Float; /* 2 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3026
  // }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3027
  case ITEM_Float:  // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3028
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3029
  // Double_variable_info {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3030
  //   u1 tag = ITEM_Double; /* 3 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3031
  // }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3032
  case ITEM_Double:  // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3033
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3034
  // Long_variable_info {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3035
  //   u1 tag = ITEM_Long; /* 4 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3036
  // }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3037
  case ITEM_Long:  // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3038
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3039
  // Null_variable_info {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3040
  //   u1 tag = ITEM_Null; /* 5 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3041
  // }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3042
  case ITEM_Null:  // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3043
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3044
  // UninitializedThis_variable_info {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3045
  //   u1 tag = ITEM_UninitializedThis; /* 6 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3046
  // }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3047
  case ITEM_UninitializedThis:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3048
    // nothing more to do for the above tag types
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3049
    break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3050
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3051
  // Object_variable_info {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3052
  //   u1 tag = ITEM_Object; /* 7 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3053
  //   u2 cpool_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3054
  // }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3055
  case ITEM_Object:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3056
  {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3057
    assert(stackmap_p_ref + 2 <= stackmap_end, "no room for cpool_index");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3058
    u2 cpool_index = Bytes::get_Java_u2(stackmap_p_ref);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3059
    u2 new_cp_index = find_new_index(cpool_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3060
    if (new_cp_index != 0) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3061
      log_debug(redefine, class, stackmap)("mapped old cpool_index=%d", cpool_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3062
      Bytes::put_Java_u2(stackmap_p_ref, new_cp_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3063
      cpool_index = new_cp_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3064
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3065
    stackmap_p_ref += 2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3066
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3067
    log_debug(redefine, class, stackmap)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3068
      ("frame_i=%u, frame_type=%u, cpool_index=%d", frame_i, frame_type, cpool_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3069
  } break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3070
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3071
  // Uninitialized_variable_info {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3072
  //   u1 tag = ITEM_Uninitialized; /* 8 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3073
  //   u2 offset;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3074
  // }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3075
  case ITEM_Uninitialized:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3076
    assert(stackmap_p_ref + 2 <= stackmap_end, "no room for offset");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3077
    stackmap_p_ref += 2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3078
    break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3079
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3080
  default:
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3081
    log_debug(redefine, class, stackmap)("frame_i=%u, frame_type=%u, bad tag=0x%x", frame_i, frame_type, tag);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3082
    ShouldNotReachHere();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3083
    break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3084
  } // end switch (tag)
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3085
} // end rewrite_cp_refs_in_verification_type_info()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3086
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3087
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3088
// Change the constant pool associated with klass scratch_class to
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3089
// scratch_cp. If shrink is true, then scratch_cp_length elements
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3090
// are copied from scratch_cp to a smaller constant pool and the
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3091
// smaller constant pool is associated with scratch_class.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3092
void VM_RedefineClasses::set_new_constant_pool(
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3093
       ClassLoaderData* loader_data,
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  3094
       InstanceKlass* scratch_class, constantPoolHandle scratch_cp,
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3095
       int scratch_cp_length, TRAPS) {
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3096
  assert(scratch_cp->length() >= scratch_cp_length, "sanity check");
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3097
15229
5341188db763 7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents: 15099
diff changeset
  3098
  // scratch_cp is a merged constant pool and has enough space for a
5341188db763 7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents: 15099
diff changeset
  3099
  // worst case merge situation. We want to associate the minimum
5341188db763 7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents: 15099
diff changeset
  3100
  // sized constant pool with the klass to save space.
19961
04405a08613f 8024345: 'assert(_value != NULL) failed: resolving NULL _value' from VM_RedefineClasses::set_new_constant_pool
sspitsyn
parents: 19960
diff changeset
  3101
  ConstantPool* cp = ConstantPool::allocate(loader_data, scratch_cp_length, CHECK);
04405a08613f 8024345: 'assert(_value != NULL) failed: resolving NULL _value' from VM_RedefineClasses::set_new_constant_pool
sspitsyn
parents: 19960
diff changeset
  3102
  constantPoolHandle smaller_cp(THREAD, cp);
15229
5341188db763 7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents: 15099
diff changeset
  3103
5341188db763 7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents: 15099
diff changeset
  3104
  // preserve version() value in the smaller copy
5341188db763 7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents: 15099
diff changeset
  3105
  int version = scratch_cp->version();
5341188db763 7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents: 15099
diff changeset
  3106
  assert(version != 0, "sanity check");
5341188db763 7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents: 15099
diff changeset
  3107
  smaller_cp->set_version(version);
5341188db763 7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents: 15099
diff changeset
  3108
15433
0f53fd973576 8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents: 15430
diff changeset
  3109
  // attach klass to new constant pool
0f53fd973576 8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents: 15430
diff changeset
  3110
  // reference to the cp holder is needed for copy_operands()
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  3111
  smaller_cp->set_pool_holder(scratch_class);
15433
0f53fd973576 8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents: 15430
diff changeset
  3112
15229
5341188db763 7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents: 15099
diff changeset
  3113
  scratch_cp->copy_cp_to(1, scratch_cp_length - 1, smaller_cp, 1, THREAD);
19961
04405a08613f 8024345: 'assert(_value != NULL) failed: resolving NULL _value' from VM_RedefineClasses::set_new_constant_pool
sspitsyn
parents: 19960
diff changeset
  3114
  if (HAS_PENDING_EXCEPTION) {
04405a08613f 8024345: 'assert(_value != NULL) failed: resolving NULL _value' from VM_RedefineClasses::set_new_constant_pool
sspitsyn
parents: 19960
diff changeset
  3115
    // Exception is handled in the caller
04405a08613f 8024345: 'assert(_value != NULL) failed: resolving NULL _value' from VM_RedefineClasses::set_new_constant_pool
sspitsyn
parents: 19960
diff changeset
  3116
    loader_data->add_to_deallocate_list(smaller_cp());
04405a08613f 8024345: 'assert(_value != NULL) failed: resolving NULL _value' from VM_RedefineClasses::set_new_constant_pool
sspitsyn
parents: 19960
diff changeset
  3117
    return;
04405a08613f 8024345: 'assert(_value != NULL) failed: resolving NULL _value' from VM_RedefineClasses::set_new_constant_pool
sspitsyn
parents: 19960
diff changeset
  3118
  }
15229
5341188db763 7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents: 15099
diff changeset
  3119
  scratch_cp = smaller_cp;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3120
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3121
  // attach new constant pool to klass
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3122
  scratch_class->set_constants(scratch_cp());
46427
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46408
diff changeset
  3123
  scratch_cp->initialize_unresolved_klasses(loader_data, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3124
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3125
  int i;  // for portability
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3126
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3127
  // update each field in klass to use new constant pool indices as needed
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
  3128
  for (JavaFieldStream fs(scratch_class); !fs.done(); fs.next()) {
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
  3129
    jshort cur_index = fs.name_index();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3130
    jshort new_index = find_new_index(cur_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3131
    if (new_index != 0) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3132
      log_trace(redefine, class, constantpool)("field-name_index change: %d to %d", cur_index, new_index);
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
  3133
      fs.set_name_index(new_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3134
    }
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
  3135
    cur_index = fs.signature_index();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3136
    new_index = find_new_index(cur_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3137
    if (new_index != 0) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3138
      log_trace(redefine, class, constantpool)("field-signature_index change: %d to %d", cur_index, new_index);
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
  3139
      fs.set_signature_index(new_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3140
    }
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
  3141
    cur_index = fs.initval_index();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3142
    new_index = find_new_index(cur_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3143
    if (new_index != 0) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3144
      log_trace(redefine, class, constantpool)("field-initval_index change: %d to %d", cur_index, new_index);
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
  3145
      fs.set_initval_index(new_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3146
    }
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
  3147
    cur_index = fs.generic_signature_index();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3148
    new_index = find_new_index(cur_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3149
    if (new_index != 0) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3150
      log_trace(redefine, class, constantpool)("field-generic_signature change: %d to %d", cur_index, new_index);
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
  3151
      fs.set_generic_signature_index(new_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3152
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3153
  } // end for each field
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3154
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3155
  // Update constant pool indices in the inner classes info to use
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3156
  // new constant indices as needed. The inner classes info is a
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3157
  // quadruple:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3158
  // (inner_class_info, outer_class_info, inner_name, inner_access_flags)
12231
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  3159
  InnerClassesIterator iter(scratch_class);
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  3160
  for (; !iter.done(); iter.next()) {
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  3161
    int cur_index = iter.inner_class_info_index();
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  3162
    if (cur_index == 0) {
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  3163
      continue;  // JVM spec. allows null inner class refs so skip it
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  3164
    }
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  3165
    int new_index = find_new_index(cur_index);
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  3166
    if (new_index != 0) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3167
      log_trace(redefine, class, constantpool)("inner_class_info change: %d to %d", cur_index, new_index);
12231
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  3168
      iter.set_inner_class_info_index(new_index);
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  3169
    }
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  3170
    cur_index = iter.outer_class_info_index();
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  3171
    new_index = find_new_index(cur_index);
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  3172
    if (new_index != 0) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3173
      log_trace(redefine, class, constantpool)("outer_class_info change: %d to %d", cur_index, new_index);
12231
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  3174
      iter.set_outer_class_info_index(new_index);
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  3175
    }
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  3176
    cur_index = iter.inner_name_index();
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  3177
    new_index = find_new_index(cur_index);
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  3178
    if (new_index != 0) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3179
      log_trace(redefine, class, constantpool)("inner_name change: %d to %d", cur_index, new_index);
12231
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  3180
      iter.set_inner_name_index(new_index);
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  3181
    }
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  3182
  } // end for each inner class
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3183
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3184
  // Attach each method in klass to the new constant pool and update
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3185
  // to use new constant pool indices as needed:
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3186
  Array<Method*>* methods = scratch_class->methods();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3187
  for (i = methods->length() - 1; i >= 0; i--) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3188
    methodHandle method(THREAD, methods->at(i));
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3189
    method->set_constants(scratch_cp());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3190
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3191
    int new_index = find_new_index(method->name_index());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3192
    if (new_index != 0) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3193
      log_trace(redefine, class, constantpool)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3194
        ("method-name_index change: %d to %d", method->name_index(), new_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3195
      method->set_name_index(new_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3196
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3197
    new_index = find_new_index(method->signature_index());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3198
    if (new_index != 0) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3199
      log_trace(redefine, class, constantpool)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3200
        ("method-signature_index change: %d to %d", method->signature_index(), new_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3201
      method->set_signature_index(new_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3202
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3203
    new_index = find_new_index(method->generic_signature_index());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3204
    if (new_index != 0) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3205
      log_trace(redefine, class, constantpool)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3206
        ("method-generic_signature_index change: %d to %d", method->generic_signature_index(), new_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3207
      method->set_generic_signature_index(new_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3208
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3209
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3210
    // Update constant pool indices in the method's checked exception
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3211
    // table to use new constant indices as needed.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3212
    int cext_length = method->checked_exceptions_length();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3213
    if (cext_length > 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3214
      CheckedExceptionElement * cext_table =
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3215
        method->checked_exceptions_start();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3216
      for (int j = 0; j < cext_length; j++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3217
        int cur_index = cext_table[j].class_cp_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3218
        int new_index = find_new_index(cur_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3219
        if (new_index != 0) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3220
          log_trace(redefine, class, constantpool)("cext-class_cp_index change: %d to %d", cur_index, new_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3221
          cext_table[j].class_cp_index = (u2)new_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3222
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3223
      } // end for each checked exception table entry
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3224
    } // end if there are checked exception table entries
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3225
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3226
    // Update each catch type index in the method's exception table
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3227
    // to use new constant pool indices as needed. The exception table
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3228
    // holds quadruple entries of the form:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3229
    //   (beg_bci, end_bci, handler_bci, klass_index)
13282
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12231
diff changeset
  3230
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12231
diff changeset
  3231
    ExceptionTable ex_table(method());
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12231
diff changeset
  3232
    int ext_length = ex_table.length();
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12231
diff changeset
  3233
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12231
diff changeset
  3234
    for (int j = 0; j < ext_length; j ++) {
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12231
diff changeset
  3235
      int cur_index = ex_table.catch_type_index(j);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3236
      int new_index = find_new_index(cur_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3237
      if (new_index != 0) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3238
        log_trace(redefine, class, constantpool)("ext-klass_index change: %d to %d", cur_index, new_index);
13282
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12231
diff changeset
  3239
        ex_table.set_catch_type_index(j, new_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3240
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3241
    } // end for each exception table entry
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3242
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3243
    // Update constant pool indices in the method's local variable
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3244
    // table to use new constant indices as needed. The local variable
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3245
    // table hold sextuple entries of the form:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3246
    // (start_pc, length, name_index, descriptor_index, signature_index, slot)
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3247
    int lvt_length = method->localvariable_table_length();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3248
    if (lvt_length > 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3249
      LocalVariableTableElement * lv_table =
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3250
        method->localvariable_table_start();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3251
      for (int j = 0; j < lvt_length; j++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3252
        int cur_index = lv_table[j].name_cp_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3253
        int new_index = find_new_index(cur_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3254
        if (new_index != 0) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3255
          log_trace(redefine, class, constantpool)("lvt-name_cp_index change: %d to %d", cur_index, new_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3256
          lv_table[j].name_cp_index = (u2)new_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3257
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3258
        cur_index = lv_table[j].descriptor_cp_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3259
        new_index = find_new_index(cur_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3260
        if (new_index != 0) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3261
          log_trace(redefine, class, constantpool)("lvt-descriptor_cp_index change: %d to %d", cur_index, new_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3262
          lv_table[j].descriptor_cp_index = (u2)new_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3263
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3264
        cur_index = lv_table[j].signature_cp_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3265
        new_index = find_new_index(cur_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3266
        if (new_index != 0) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3267
          log_trace(redefine, class, constantpool)("lvt-signature_cp_index change: %d to %d", cur_index, new_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3268
          lv_table[j].signature_cp_index = (u2)new_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3269
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3270
      } // end for each local variable table entry
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3271
    } // end if there are local variable table entries
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3272
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3273
    rewrite_cp_refs_in_stack_map_table(method, THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3274
  } // end for each method
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3275
} // end set_new_constant_pool()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3276
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3277
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3278
// Unevolving classes may point to methods of the_class directly
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3279
// from their constant pool caches, itables, and/or vtables. We
17373
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3280
// use the ClassLoaderDataGraph::classes_do() facility and this helper
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3281
// to fix up these pointers.
17373
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3282
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3283
// Adjust cpools and vtables closure
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3284
void VM_RedefineClasses::AdjustCpoolCacheAndVtable::do_klass(Klass* k) {
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3285
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3286
  // This is a very busy routine. We don't want too much tracing
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3287
  // printed out.
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3288
  bool trace_name_printed = false;
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  3289
  InstanceKlass *the_class = InstanceKlass::cast(_the_class);
17373
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3290
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3291
  // If the class being redefined is java.lang.Object, we need to fix all
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3292
  // array class vtables also
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  3293
  if (k->is_array_klass() && _the_class == SystemDictionary::Object_klass()) {
46408
70aab0c2ea8b 8178350: klassVtable and klassItable should be ValueObj
iklam
parents: 46329
diff changeset
  3294
    k->vtable().adjust_method_entries(the_class, &trace_name_printed);
29316
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 29081
diff changeset
  3295
33611
9abd65805e19 8139203: Consistent naming for klass type predicates
coleenp
parents: 33602
diff changeset
  3296
  } else if (k->is_instance_klass()) {
17373
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3297
    HandleMark hm(_thread);
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3298
    InstanceKlass *ik = InstanceKlass::cast(k);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3299
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3300
    // HotSpot specific optimization! HotSpot does not currently
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3301
    // support delegation from the bootstrap class loader to a
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3302
    // user-defined class loader. This means that if the bootstrap
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3303
    // class loader is the initiating class loader, then it will also
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3304
    // be the defining class loader. This also means that classes
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3305
    // loaded by the bootstrap class loader cannot refer to classes
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3306
    // loaded by a user-defined class loader. Note: a user-defined
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3307
    // class loader can delegate to the bootstrap class loader.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3308
    //
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3309
    // If the current class being redefined has a user-defined class
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3310
    // loader as its defining class loader, then we can skip all
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3311
    // classes loaded by the bootstrap class loader.
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  3312
    bool is_user_defined = (_the_class->class_loader() != NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3313
    if (is_user_defined && ik->class_loader() == NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3314
      return;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3315
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3316
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3317
    // Fix the vtable embedded in the_class and subclasses of the_class,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3318
    // if one exists. We discard scratch_class and we don't keep an
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3319
    // InstanceKlass around to hold obsolete methods so we don't have
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3320
    // any other InstanceKlass embedded vtables to update. The vtable
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3321
    // holds the Method*s for virtual (but not final) methods.
20391
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20378
diff changeset
  3322
    // Default methods, or concrete methods in interfaces are stored
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20378
diff changeset
  3323
    // in the vtable, so if an interface changes we need to check
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20378
diff changeset
  3324
    // adjust_method_entries() for every InstanceKlass, which will also
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20378
diff changeset
  3325
    // adjust the default method vtable indices.
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20378
diff changeset
  3326
    // We also need to adjust any default method entries that are
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20378
diff changeset
  3327
    // not yet in the vtable, because the vtable setup is in progress.
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20378
diff changeset
  3328
    // This must be done after we adjust the default_methods and
7b146c5ebb18 8009130: Lambda: Fix access controls, loader constraints.
acorn
parents: 20378
diff changeset
  3329
    // default_vtable_indices for methods already in the vtable.
28734
a7ef74a8eca2 8068162: jvmtiRedefineClasses.cpp: guarantee(false) failed: OLD and/or OBSOLETE method(s) found
sspitsyn
parents: 28374
diff changeset
  3330
    // If redefining Unsafe, walk all the vtables looking for entries.
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  3331
    if (ik->vtable_length() > 0 && (_the_class->is_interface()
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  3332
        || _the_class == SystemDictionary::internal_Unsafe_klass()
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  3333
        || ik->is_subtype_of(_the_class))) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3334
      // ik->vtable() creates a wrapper object; rm cleans it up
17373
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3335
      ResourceMark rm(_thread);
29316
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 29081
diff changeset
  3336
46408
70aab0c2ea8b 8178350: klassVtable and klassItable should be ValueObj
iklam
parents: 46329
diff changeset
  3337
      ik->vtable().adjust_method_entries(the_class, &trace_name_printed);
29316
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 29081
diff changeset
  3338
      ik->adjust_default_methods(the_class, &trace_name_printed);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3339
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3340
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3341
    // If the current class has an itable and we are either redefining an
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3342
    // interface or if the current class is a subclass of the_class, then
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3343
    // we potentially have to fix the itable. If we are redefining an
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3344
    // interface, then we have to call adjust_method_entries() for
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3345
    // every InstanceKlass that has an itable since there isn't a
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3346
    // subclass relationship between an interface and an InstanceKlass.
28734
a7ef74a8eca2 8068162: jvmtiRedefineClasses.cpp: guarantee(false) failed: OLD and/or OBSOLETE method(s) found
sspitsyn
parents: 28374
diff changeset
  3347
    // If redefining Unsafe, walk all the itables looking for entries.
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  3348
    if (ik->itable_length() > 0 && (_the_class->is_interface()
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  3349
        || _the_class == SystemDictionary::internal_Unsafe_klass()
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  3350
        || ik->is_subclass_of(_the_class))) {
17373
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3351
      ResourceMark rm(_thread);
46408
70aab0c2ea8b 8178350: klassVtable and klassItable should be ValueObj
iklam
parents: 46329
diff changeset
  3352
      ik->itable().adjust_method_entries(the_class, &trace_name_printed);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3353
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3354
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3355
    // The constant pools in other classes (other_cp) can refer to
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3356
    // methods in the_class. We have to update method information in
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3357
    // other_cp's cache. If other_cp has a previous version, then we
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3358
    // have to repeat the process for each previous version. The
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3359
    // constant pool cache holds the Method*s for non-virtual
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3360
    // methods and for virtual, final methods.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3361
    //
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3362
    // Special case: if the current class is the_class, then new_cp
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3363
    // has already been attached to the_class and old_cp has already
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3364
    // been added as a previous version. The new_cp doesn't have any
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3365
    // cached references to old methods so it doesn't need to be
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3366
    // updated. We can simply start with the previous version(s) in
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3367
    // that case.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3368
    constantPoolHandle other_cp;
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3369
    ConstantPoolCache* cp_cache;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3370
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  3371
    if (ik != _the_class) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3372
      // this klass' constant pool cache may need adjustment
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3373
      other_cp = constantPoolHandle(ik->constants());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3374
      cp_cache = other_cp->cache();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3375
      if (cp_cache != NULL) {
29316
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 29081
diff changeset
  3376
        cp_cache->adjust_method_entries(the_class, &trace_name_printed);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3377
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3378
    }
20059
c26474fd5ac0 8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents: 19962
diff changeset
  3379
c26474fd5ac0 8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents: 19962
diff changeset
  3380
    // the previous versions' constant pool caches may need adjustment
26558
b7df27df6384 8055008: Clean up code that saves the previous versions of redefined classes
coleenp
parents: 24459
diff changeset
  3381
    for (InstanceKlass* pv_node = ik->previous_versions();
b7df27df6384 8055008: Clean up code that saves the previous versions of redefined classes
coleenp
parents: 24459
diff changeset
  3382
         pv_node != NULL;
b7df27df6384 8055008: Clean up code that saves the previous versions of redefined classes
coleenp
parents: 24459
diff changeset
  3383
         pv_node = pv_node->previous_versions()) {
b7df27df6384 8055008: Clean up code that saves the previous versions of redefined classes
coleenp
parents: 24459
diff changeset
  3384
      cp_cache = pv_node->constants()->cache();
20059
c26474fd5ac0 8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents: 19962
diff changeset
  3385
      if (cp_cache != NULL) {
30289
10b7b61d759a 8073705: more performance issues in class redefinition
sspitsyn
parents: 30229
diff changeset
  3386
        cp_cache->adjust_method_entries(pv_node, &trace_name_printed);
20059
c26474fd5ac0 8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents: 19962
diff changeset
  3387
      }
c26474fd5ac0 8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents: 19962
diff changeset
  3388
    }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3389
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3390
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3391
28365
ccf31849c7a4 8067713: Move clean_weak_method_links for redefinition out of class unloading
coleenp
parents: 27401
diff changeset
  3392
// Clean method data for this class
ccf31849c7a4 8067713: Move clean_weak_method_links for redefinition out of class unloading
coleenp
parents: 27401
diff changeset
  3393
void VM_RedefineClasses::MethodDataCleaner::do_klass(Klass* k) {
33611
9abd65805e19 8139203: Consistent naming for klass type predicates
coleenp
parents: 33602
diff changeset
  3394
  if (k->is_instance_klass()) {
28365
ccf31849c7a4 8067713: Move clean_weak_method_links for redefinition out of class unloading
coleenp
parents: 27401
diff changeset
  3395
    InstanceKlass *ik = InstanceKlass::cast(k);
ccf31849c7a4 8067713: Move clean_weak_method_links for redefinition out of class unloading
coleenp
parents: 27401
diff changeset
  3396
    // Clean MethodData of this class's methods so they don't refer to
ccf31849c7a4 8067713: Move clean_weak_method_links for redefinition out of class unloading
coleenp
parents: 27401
diff changeset
  3397
    // old methods that are no longer running.
ccf31849c7a4 8067713: Move clean_weak_method_links for redefinition out of class unloading
coleenp
parents: 27401
diff changeset
  3398
    Array<Method*>* methods = ik->methods();
ccf31849c7a4 8067713: Move clean_weak_method_links for redefinition out of class unloading
coleenp
parents: 27401
diff changeset
  3399
    int num_methods = methods->length();
ccf31849c7a4 8067713: Move clean_weak_method_links for redefinition out of class unloading
coleenp
parents: 27401
diff changeset
  3400
    for (int index = 0; index < num_methods; ++index) {
ccf31849c7a4 8067713: Move clean_weak_method_links for redefinition out of class unloading
coleenp
parents: 27401
diff changeset
  3401
      if (methods->at(index)->method_data() != NULL) {
ccf31849c7a4 8067713: Move clean_weak_method_links for redefinition out of class unloading
coleenp
parents: 27401
diff changeset
  3402
        methods->at(index)->method_data()->clean_weak_method_links();
ccf31849c7a4 8067713: Move clean_weak_method_links for redefinition out of class unloading
coleenp
parents: 27401
diff changeset
  3403
      }
ccf31849c7a4 8067713: Move clean_weak_method_links for redefinition out of class unloading
coleenp
parents: 27401
diff changeset
  3404
    }
ccf31849c7a4 8067713: Move clean_weak_method_links for redefinition out of class unloading
coleenp
parents: 27401
diff changeset
  3405
  }
ccf31849c7a4 8067713: Move clean_weak_method_links for redefinition out of class unloading
coleenp
parents: 27401
diff changeset
  3406
}
ccf31849c7a4 8067713: Move clean_weak_method_links for redefinition out of class unloading
coleenp
parents: 27401
diff changeset
  3407
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3408
void VM_RedefineClasses::update_jmethod_ids() {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3409
  for (int j = 0; j < _matching_methods_length; ++j) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3410
    Method* old_method = _matching_old_methods[j];
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3411
    jmethodID jmid = old_method->find_jmethod_id_or_null();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3412
    if (jmid != NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3413
      // There is a jmethodID, change it to point to the new method
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3414
      methodHandle new_method_h(_matching_new_methods[j]);
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3415
      Method::change_method_associated_with_jmethod_id(jmid, new_method_h());
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3416
      assert(Method::resolve_jmethod_id(jmid) == _matching_new_methods[j],
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3417
             "should be replaced");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3418
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3419
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3420
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3421
26558
b7df27df6384 8055008: Clean up code that saves the previous versions of redefined classes
coleenp
parents: 24459
diff changeset
  3422
int VM_RedefineClasses::check_methods_and_mark_as_obsolete() {
b7df27df6384 8055008: Clean up code that saves the previous versions of redefined classes
coleenp
parents: 24459
diff changeset
  3423
  int emcp_method_count = 0;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3424
  int obsolete_count = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3425
  int old_index = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3426
  for (int j = 0; j < _matching_methods_length; ++j, ++old_index) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3427
    Method* old_method = _matching_old_methods[j];
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3428
    Method* new_method = _matching_new_methods[j];
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3429
    Method* old_array_method;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3430
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3431
    // Maintain an old_index into the _old_methods array by skipping
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3432
    // deleted methods
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3433
    while ((old_array_method = _old_methods->at(old_index)) != old_method) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3434
      ++old_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3435
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3436
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3437
    if (MethodComparator::methods_EMCP(old_method, new_method)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3438
      // The EMCP definition from JSR-163 requires the bytecodes to be
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3439
      // the same with the exception of constant pool indices which may
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3440
      // differ. However, the constants referred to by those indices
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3441
      // must be the same.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3442
      //
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3443
      // We use methods_EMCP() for comparison since constant pool
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3444
      // merging can remove duplicate constant pool entries that were
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3445
      // present in the old method and removed from the rewritten new
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3446
      // method. A faster binary comparison function would consider the
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3447
      // old and new methods to be different when they are actually
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3448
      // EMCP.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3449
      //
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3450
      // The old and new methods are EMCP and you would think that we
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3451
      // could get rid of one of them here and now and save some space.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3452
      // However, the concept of EMCP only considers the bytecodes and
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3453
      // the constant pool entries in the comparison. Other things,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3454
      // e.g., the line number table (LNT) or the local variable table
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3455
      // (LVT) don't count in the comparison. So the new (and EMCP)
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3456
      // method can have a new LNT that we need so we can't just
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3457
      // overwrite the new method with the old method.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3458
      //
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3459
      // When this routine is called, we have already attached the new
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3460
      // methods to the_class so the old methods are effectively
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3461
      // overwritten. However, if an old method is still executing,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3462
      // then the old method cannot be collected until sometime after
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3463
      // the old method call has returned. So the overwriting of old
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3464
      // methods by new methods will save us space except for those
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3465
      // (hopefully few) old methods that are still executing.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3466
      //
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3467
      // A method refers to a ConstMethod* and this presents another
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3468
      // possible avenue to space savings. The ConstMethod* in the
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3469
      // new method contains possibly new attributes (LNT, LVT, etc).
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3470
      // At first glance, it seems possible to save space by replacing
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3471
      // the ConstMethod* in the old method with the ConstMethod*
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3472
      // from the new method. The old and new methods would share the
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3473
      // same ConstMethod* and we would save the space occupied by
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3474
      // the old ConstMethod*. However, the ConstMethod* contains
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3475
      // a back reference to the containing method. Sharing the
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3476
      // ConstMethod* between two methods could lead to confusion in
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3477
      // the code that uses the back reference. This would lead to
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3478
      // brittle code that could be broken in non-obvious ways now or
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3479
      // in the future.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3480
      //
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3481
      // Another possibility is to copy the ConstMethod* from the new
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3482
      // method to the old method and then overwrite the new method with
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3483
      // the old method. Since the ConstMethod* contains the bytecodes
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3484
      // for the method embedded in the oop, this option would change
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3485
      // the bytecodes out from under any threads executing the old
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3486
      // method and make the thread's bcp invalid. Since EMCP requires
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3487
      // that the bytecodes be the same modulo constant pool indices, it
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3488
      // is straight forward to compute the correct new bcp in the new
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3489
      // ConstMethod* from the old bcp in the old ConstMethod*. The
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3490
      // time consuming part would be searching all the frames in all
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3491
      // of the threads to find all of the calls to the old method.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3492
      //
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3493
      // It looks like we will have to live with the limited savings
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3494
      // that we get from effectively overwriting the old methods
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3495
      // when the new methods are attached to the_class.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3496
26558
b7df27df6384 8055008: Clean up code that saves the previous versions of redefined classes
coleenp
parents: 24459
diff changeset
  3497
      // Count number of methods that are EMCP.  The method will be marked
b7df27df6384 8055008: Clean up code that saves the previous versions of redefined classes
coleenp
parents: 24459
diff changeset
  3498
      // old but not obsolete if it is EMCP.
b7df27df6384 8055008: Clean up code that saves the previous versions of redefined classes
coleenp
parents: 24459
diff changeset
  3499
      emcp_method_count++;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3500
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3501
      // An EMCP method is _not_ obsolete. An obsolete method has a
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3502
      // different jmethodID than the current method. An EMCP method
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3503
      // has the same jmethodID as the current method. Having the
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3504
      // same jmethodID for all EMCP versions of a method allows for
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3505
      // a consistent view of the EMCP methods regardless of which
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3506
      // EMCP method you happen to have in hand. For example, a
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3507
      // breakpoint set in one EMCP method will work for all EMCP
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3508
      // versions of the method including the current one.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3509
    } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3510
      // mark obsolete methods as such
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3511
      old_method->set_is_obsolete();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3512
      obsolete_count++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3513
20378
a296c8e1c5d2 8025238: nsk/jvmti/scenarios/bcinstr/BI04/bi04t002 crashed with SIGSEGV
coleenp
parents: 20065
diff changeset
  3514
      // obsolete methods need a unique idnum so they become new entries in
a296c8e1c5d2 8025238: nsk/jvmti/scenarios/bcinstr/BI04/bi04t002 crashed with SIGSEGV
coleenp
parents: 20065
diff changeset
  3515
      // the jmethodID cache in InstanceKlass
29316
5287df8a8972 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents: 29081
diff changeset
  3516
      assert(old_method->method_idnum() == new_method->method_idnum(), "must match");
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  3517
      u2 num = InstanceKlass::cast(_the_class)->next_method_idnum();
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3518
      if (num != ConstMethod::UNSET_IDNUM) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3519
        old_method->set_method_idnum(num);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3520
      }
20059
c26474fd5ac0 8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents: 19962
diff changeset
  3521
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3522
      // With tracing we try not to "yack" too much. The position of
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3523
      // this trace assumes there are fewer obsolete methods than
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3524
      // EMCP methods.
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3525
      if (log_is_enabled(Trace, redefine, class, obsolete, mark)) {
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3526
        ResourceMark rm;
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3527
        log_trace(redefine, class, obsolete, mark)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3528
          ("mark %s(%s) as obsolete", old_method->name()->as_C_string(), old_method->signature()->as_C_string());
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3529
      }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3530
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3531
    old_method->set_is_old();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3532
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3533
  for (int i = 0; i < _deleted_methods_length; ++i) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3534
    Method* old_method = _deleted_methods[i];
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3535
20017
81eba62e9048 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 19537
diff changeset
  3536
    assert(!old_method->has_vtable_index(),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3537
           "cannot delete methods with vtable entries");;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3538
24459
ebd373039673 8042796: jvmtiRedefineClasses.cpp: guarantee(false) failed: OLD and/or OBSOLETE method(s) found
sspitsyn
parents: 24424
diff changeset
  3539
    // Mark all deleted methods as old, obsolete and deleted
ebd373039673 8042796: jvmtiRedefineClasses.cpp: guarantee(false) failed: OLD and/or OBSOLETE method(s) found
sspitsyn
parents: 24424
diff changeset
  3540
    old_method->set_is_deleted();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3541
    old_method->set_is_old();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3542
    old_method->set_is_obsolete();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3543
    ++obsolete_count;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3544
    // With tracing we try not to "yack" too much. The position of
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3545
    // this trace assumes there are fewer obsolete methods than
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3546
    // EMCP methods.
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3547
    if (log_is_enabled(Trace, redefine, class, obsolete, mark)) {
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3548
      ResourceMark rm;
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3549
      log_trace(redefine, class, obsolete, mark)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3550
        ("mark deleted %s(%s) as obsolete", old_method->name()->as_C_string(), old_method->signature()->as_C_string());
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3551
    }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3552
  }
26558
b7df27df6384 8055008: Clean up code that saves the previous versions of redefined classes
coleenp
parents: 24459
diff changeset
  3553
  assert((emcp_method_count + obsolete_count) == _old_methods->length(),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3554
    "sanity check");
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3555
  log_trace(redefine, class, obsolete, mark)("EMCP_cnt=%d, obsolete_cnt=%d", emcp_method_count, obsolete_count);
26558
b7df27df6384 8055008: Clean up code that saves the previous versions of redefined classes
coleenp
parents: 24459
diff changeset
  3556
  return emcp_method_count;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3557
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3558
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3559
// This internal class transfers the native function registration from old methods
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3560
// to new methods.  It is designed to handle both the simple case of unchanged
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3561
// native methods and the complex cases of native method prefixes being added and/or
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3562
// removed.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3563
// It expects only to be used during the VM_RedefineClasses op (a safepoint).
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3564
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3565
// This class is used after the new methods have been installed in "the_class".
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3566
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3567
// So, for example, the following must be handled.  Where 'm' is a method and
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3568
// a number followed by an underscore is a prefix.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3569
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3570
//                                      Old Name    New Name
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3571
// Simple transfer to new method        m       ->  m
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3572
// Add prefix                           m       ->  1_m
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3573
// Remove prefix                        1_m     ->  m
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3574
// Simultaneous add of prefixes         m       ->  3_2_1_m
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3575
// Simultaneous removal of prefixes     3_2_1_m ->  m
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3576
// Simultaneous add and remove          1_m     ->  2_m
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3577
// Same, caused by prefix removal only  3_2_1_m ->  3_2_m
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3578
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3579
class TransferNativeFunctionRegistration {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3580
 private:
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  3581
  InstanceKlass* the_class;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3582
  int prefix_count;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3583
  char** prefixes;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3584
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3585
  // Recursively search the binary tree of possibly prefixed method names.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3586
  // Iteration could be used if all agents were well behaved. Full tree walk is
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3587
  // more resilent to agents not cleaning up intermediate methods.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3588
  // Branch at each depth in the binary tree is:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3589
  //    (1) without the prefix.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3590
  //    (2) with the prefix.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3591
  // where 'prefix' is the prefix at that 'depth' (first prefix, second prefix,...)
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3592
  Method* search_prefix_name_space(int depth, char* name_str, size_t name_len,
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7913
diff changeset
  3593
                                     Symbol* signature) {
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7913
diff changeset
  3594
    TempNewSymbol name_symbol = SymbolTable::probe(name_str, (int)name_len);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3595
    if (name_symbol != NULL) {
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  3596
      Method* method = the_class->lookup_method(name_symbol, signature);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3597
      if (method != NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3598
        // Even if prefixed, intermediate methods must exist.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3599
        if (method->is_native()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3600
          // Wahoo, we found a (possibly prefixed) version of the method, return it.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3601
          return method;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3602
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3603
        if (depth < prefix_count) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3604
          // Try applying further prefixes (other than this one).
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3605
          method = search_prefix_name_space(depth+1, name_str, name_len, signature);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3606
          if (method != NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3607
            return method; // found
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3608
          }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3609
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3610
          // Try adding this prefix to the method name and see if it matches
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3611
          // another method name.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3612
          char* prefix = prefixes[depth];
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3613
          size_t prefix_len = strlen(prefix);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3614
          size_t trial_len = name_len + prefix_len;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3615
          char* trial_name_str = NEW_RESOURCE_ARRAY(char, trial_len + 1);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3616
          strcpy(trial_name_str, prefix);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3617
          strcat(trial_name_str, name_str);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3618
          method = search_prefix_name_space(depth+1, trial_name_str, trial_len,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3619
                                            signature);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3620
          if (method != NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3621
            // If found along this branch, it was prefixed, mark as such
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3622
            method->set_is_prefixed_native();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3623
            return method; // found
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3624
          }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3625
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3626
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3627
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3628
    return NULL;  // This whole branch bore nothing
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3629
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3630
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3631
  // Return the method name with old prefixes stripped away.
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3632
  char* method_name_without_prefixes(Method* method) {
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7913
diff changeset
  3633
    Symbol* name = method->name();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3634
    char* name_str = name->as_utf8();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3635
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3636
    // Old prefixing may be defunct, strip prefixes, if any.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3637
    for (int i = prefix_count-1; i >= 0; i--) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3638
      char* prefix = prefixes[i];
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3639
      size_t prefix_len = strlen(prefix);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3640
      if (strncmp(prefix, name_str, prefix_len) == 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3641
        name_str += prefix_len;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3642
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3643
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3644
    return name_str;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3645
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3646
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3647
  // Strip any prefixes off the old native method, then try to find a
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3648
  // (possibly prefixed) new native that matches it.
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3649
  Method* strip_and_search_for_new_native(Method* method) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3650
    ResourceMark rm;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3651
    char* name_str = method_name_without_prefixes(method);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3652
    return search_prefix_name_space(0, name_str, strlen(name_str),
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3653
                                    method->signature());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3654
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3655
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3656
 public:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3657
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3658
  // Construct a native method transfer processor for this class.
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  3659
  TransferNativeFunctionRegistration(InstanceKlass* _the_class) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3660
    assert(SafepointSynchronize::is_at_safepoint(), "sanity check");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3661
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3662
    the_class = _the_class;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3663
    prefixes = JvmtiExport::get_all_native_method_prefixes(&prefix_count);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3664
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3665
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3666
  // Attempt to transfer any of the old or deleted methods that are native
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3667
  void transfer_registrations(Method** old_methods, int methods_length) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3668
    for (int j = 0; j < methods_length; j++) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3669
      Method* old_method = old_methods[j];
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3670
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3671
      if (old_method->is_native() && old_method->has_native_function()) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3672
        Method* new_method = strip_and_search_for_new_native(old_method);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3673
        if (new_method != NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3674
          // Actually set the native function in the new method.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3675
          // Redefine does not send events (except CFLH), certainly not this
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3676
          // behind the scenes re-registration.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3677
          new_method->set_native_function(old_method->native_function(),
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3678
                              !Method::native_bind_event_is_interesting);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3679
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3680
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3681
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3682
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3683
};
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3684
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3685
// Don't lose the association between a native method and its JNI function.
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  3686
void VM_RedefineClasses::transfer_old_native_function_registrations(InstanceKlass* the_class) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3687
  TransferNativeFunctionRegistration transfer(the_class);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3688
  transfer.transfer_registrations(_deleted_methods, _deleted_methods_length);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3689
  transfer.transfer_registrations(_matching_old_methods, _matching_methods_length);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3690
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3691
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3692
// Deoptimize all compiled code that depends on this class.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3693
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3694
// If the can_redefine_classes capability is obtained in the onload
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3695
// phase then the compiler has recorded all dependencies from startup.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3696
// In that case we need only deoptimize and throw away all compiled code
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3697
// that depends on the class.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3698
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3699
// If can_redefine_classes is obtained sometime after the onload
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3700
// phase then the dependency information may be incomplete. In that case
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3701
// the first call to RedefineClasses causes all compiled code to be
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3702
// thrown away. As can_redefine_classes has been obtained then
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3703
// all future compilations will record dependencies so second and
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3704
// subsequent calls to RedefineClasses need only throw away code
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3705
// that depends on the class.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3706
//
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  3707
void VM_RedefineClasses::flush_dependent_code(InstanceKlass* ik, TRAPS) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3708
  assert_locked_or_safepoint(Compile_lock);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3709
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3710
  // All dependencies have been recorded from startup or this is a second or
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3711
  // subsequent use of RedefineClasses
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3712
  if (JvmtiExport::all_dependencies_are_recorded()) {
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  3713
    CodeCache::flush_evol_dependents_on(ik);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3714
  } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3715
    CodeCache::mark_all_nmethods_for_deoptimization();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3716
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3717
    ResourceMark rm(THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3718
    DeoptimizationMarker dm;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3719
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3720
    // Deoptimize all activations depending on marked nmethods
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3721
    Deoptimization::deoptimize_dependents();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3722
32401
cc58aeaec340 8075805: Crash while trying to release CompiledICHolder
thartmann
parents: 31353
diff changeset
  3723
    // Make the dependent methods not entrant
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3724
    CodeCache::make_marked_nmethods_not_entrant();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3725
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3726
    // From now on we know that the dependency information is complete
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3727
    JvmtiExport::set_all_dependencies_are_recorded(true);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3728
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3729
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3730
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3731
void VM_RedefineClasses::compute_added_deleted_matching_methods() {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3732
  Method* old_method;
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3733
  Method* new_method;
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3734
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3735
  _matching_old_methods = NEW_RESOURCE_ARRAY(Method*, _old_methods->length());
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3736
  _matching_new_methods = NEW_RESOURCE_ARRAY(Method*, _old_methods->length());
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3737
  _added_methods        = NEW_RESOURCE_ARRAY(Method*, _new_methods->length());
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3738
  _deleted_methods      = NEW_RESOURCE_ARRAY(Method*, _old_methods->length());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3739
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3740
  _matching_methods_length = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3741
  _deleted_methods_length  = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3742
  _added_methods_length    = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3743
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3744
  int nj = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3745
  int oj = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3746
  while (true) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3747
    if (oj >= _old_methods->length()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3748
      if (nj >= _new_methods->length()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3749
        break; // we've looked at everything, done
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3750
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3751
      // New method at the end
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3752
      new_method = _new_methods->at(nj);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3753
      _added_methods[_added_methods_length++] = new_method;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3754
      ++nj;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3755
    } else if (nj >= _new_methods->length()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3756
      // Old method, at the end, is deleted
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3757
      old_method = _old_methods->at(oj);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3758
      _deleted_methods[_deleted_methods_length++] = old_method;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3759
      ++oj;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3760
    } else {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3761
      old_method = _old_methods->at(oj);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3762
      new_method = _new_methods->at(nj);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3763
      if (old_method->name() == new_method->name()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3764
        if (old_method->signature() == new_method->signature()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3765
          _matching_old_methods[_matching_methods_length  ] = old_method;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3766
          _matching_new_methods[_matching_methods_length++] = new_method;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3767
          ++nj;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3768
          ++oj;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3769
        } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3770
          // added overloaded have already been moved to the end,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3771
          // so this is a deleted overloaded method
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3772
          _deleted_methods[_deleted_methods_length++] = old_method;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3773
          ++oj;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3774
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3775
      } else { // names don't match
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3776
        if (old_method->name()->fast_compare(new_method->name()) > 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3777
          // new method
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3778
          _added_methods[_added_methods_length++] = new_method;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3779
          ++nj;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3780
        } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3781
          // deleted method
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3782
          _deleted_methods[_deleted_methods_length++] = old_method;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3783
          ++oj;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3784
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3785
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3786
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3787
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3788
  assert(_matching_methods_length + _deleted_methods_length == _old_methods->length(), "sanity");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3789
  assert(_matching_methods_length + _added_methods_length == _new_methods->length(), "sanity");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3790
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3791
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3792
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  3793
void VM_RedefineClasses::swap_annotations(InstanceKlass* the_class,
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  3794
                                          InstanceKlass* scratch_class) {
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  3795
  // Swap annotation fields values
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  3796
  Annotations* old_annotations = the_class->annotations();
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  3797
  the_class->set_annotations(scratch_class->annotations());
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  3798
  scratch_class->set_annotations(old_annotations);
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  3799
}
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  3800
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3801
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3802
// Install the redefinition of a class:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3803
//    - house keeping (flushing breakpoints and caches, deoptimizing
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3804
//      dependent compiled code)
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3805
//    - replacing parts in the_class with parts from scratch_class
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3806
//    - adding a weak reference to track the obsolete but interesting
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3807
//      parts of the_class
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3808
//    - adjusting constant pool caches and vtables in other classes
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3809
//      that refer to methods in the_class. These adjustments use the
17373
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3810
//      ClassLoaderDataGraph::classes_do() facility which only allows
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3811
//      a helper method to be specified. The interesting parameters
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3812
//      that we would like to pass to the helper method are saved in
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3813
//      static global fields in the VM operation.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3814
void VM_RedefineClasses::redefine_single_class(jclass the_jclass,
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  3815
       InstanceKlass* scratch_class, TRAPS) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3816
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3817
  HandleMark hm(THREAD);   // make sure handles from this call are freed
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3818
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3819
  if (log_is_enabled(Info, redefine, class, timer)) {
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3820
    _timer_rsc_phase1.start();
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  3821
  }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3822
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  3823
  InstanceKlass* the_class = get_ik(the_jclass);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3824
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3825
  // Remove all breakpoints in methods of this class
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3826
  JvmtiBreakpoints& jvmti_breakpoints = JvmtiCurrentBreakpoints::get_jvmti_breakpoints();
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  3827
  jvmti_breakpoints.clearall_in_class_at_safepoint(the_class);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3828
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3829
  // Deoptimize all compiled code that depends on this class
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3830
  flush_dependent_code(the_class, THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3831
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3832
  _old_methods = the_class->methods();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3833
  _new_methods = scratch_class->methods();
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  3834
  _the_class = the_class;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3835
  compute_added_deleted_matching_methods();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3836
  update_jmethod_ids();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3837
46505
fd4bc78630b1 8174749: Use hash table/oops for MemberName table
coleenp
parents: 46427
diff changeset
  3838
  _any_class_has_resolved_methods = the_class->has_resolved_methods() || _any_class_has_resolved_methods;
fd4bc78630b1 8174749: Use hash table/oops for MemberName table
coleenp
parents: 46427
diff changeset
  3839
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3840
  // Attach new constant pool to the original klass. The original
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3841
  // klass still refers to the old constant pool (for now).
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  3842
  scratch_class->constants()->set_pool_holder(the_class);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3843
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3844
#if 0
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3845
  // In theory, with constant pool merging in place we should be able
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3846
  // to save space by using the new, merged constant pool in place of
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3847
  // the old constant pool(s). By "pool(s)" I mean the constant pool in
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3848
  // the klass version we are replacing now and any constant pool(s) in
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3849
  // previous versions of klass. Nice theory, doesn't work in practice.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3850
  // When this code is enabled, even simple programs throw NullPointer
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3851
  // exceptions. I'm guessing that this is caused by some constant pool
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3852
  // cache difference between the new, merged constant pool and the
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3853
  // constant pool that was just being used by the klass. I'm keeping
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3854
  // this code around to archive the idea, but the code has to remain
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3855
  // disabled for now.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3856
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3857
  // Attach each old method to the new constant pool. This can be
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3858
  // done here since we are past the bytecode verification and
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3859
  // constant pool optimization phases.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3860
  for (int i = _old_methods->length() - 1; i >= 0; i--) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3861
    Method* method = _old_methods->at(i);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3862
    method->set_constants(scratch_class->constants());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3863
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3864
37475
0da78fa10d78 8148772: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 37248
diff changeset
  3865
  // NOTE: this doesn't work because you can redefine the same class in two
0da78fa10d78 8148772: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 37248
diff changeset
  3866
  // threads, each getting their own constant pool data appended to the
0da78fa10d78 8148772: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 37248
diff changeset
  3867
  // original constant pool.  In order for the new methods to work when they
0da78fa10d78 8148772: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 37248
diff changeset
  3868
  // become old methods, they need to keep their updated copy of the constant pool.
0da78fa10d78 8148772: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 37248
diff changeset
  3869
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3870
  {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3871
    // walk all previous versions of the klass
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  3872
    InstanceKlass *ik = the_class;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3873
    PreviousVersionWalker pvw(ik);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3874
    do {
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  3875
      ik = pvw.next_previous_version();
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  3876
      if (ik != NULL) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3877
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3878
        // attach previous version of klass to the new constant pool
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3879
        ik->set_constants(scratch_class->constants());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3880
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3881
        // Attach each method in the previous version of klass to the
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3882
        // new constant pool
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3883
        Array<Method*>* prev_methods = ik->methods();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3884
        for (int i = prev_methods->length() - 1; i >= 0; i--) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3885
          Method* method = prev_methods->at(i);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3886
          method->set_constants(scratch_class->constants());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3887
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3888
      }
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  3889
    } while (ik != NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3890
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3891
#endif
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3892
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3893
  // Replace methods and constantpool
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3894
  the_class->set_methods(_new_methods);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3895
  scratch_class->set_methods(_old_methods);     // To prevent potential GCing of the old methods,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3896
                                          // and to be able to undo operation easily.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3897
36353
28b633a6919d 8149743: JVM crash after debugger hotswap with lambdas
aeriksso
parents: 35492
diff changeset
  3898
  Array<int>* old_ordering = the_class->method_ordering();
28b633a6919d 8149743: JVM crash after debugger hotswap with lambdas
aeriksso
parents: 35492
diff changeset
  3899
  the_class->set_method_ordering(scratch_class->method_ordering());
28b633a6919d 8149743: JVM crash after debugger hotswap with lambdas
aeriksso
parents: 35492
diff changeset
  3900
  scratch_class->set_method_ordering(old_ordering);
28b633a6919d 8149743: JVM crash after debugger hotswap with lambdas
aeriksso
parents: 35492
diff changeset
  3901
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3902
  ConstantPool* old_constants = the_class->constants();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3903
  the_class->set_constants(scratch_class->constants());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3904
  scratch_class->set_constants(old_constants);  // See the previous comment.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3905
#if 0
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3906
  // We are swapping the guts of "the new class" with the guts of "the
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3907
  // class". Since the old constant pool has just been attached to "the
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3908
  // new class", it seems logical to set the pool holder in the old
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3909
  // constant pool also. However, doing this will change the observable
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3910
  // class hierarchy for any old methods that are still executing. A
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3911
  // method can query the identity of its "holder" and this query uses
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3912
  // the method's constant pool link to find the holder. The change in
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3913
  // holding class from "the class" to "the new class" can confuse
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3914
  // things.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3915
  //
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3916
  // Setting the old constant pool's holder will also cause
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3917
  // verification done during vtable initialization below to fail.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3918
  // During vtable initialization, the vtable's class is verified to be
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3919
  // a subtype of the method's holder. The vtable's class is "the
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3920
  // class" and the method's holder is gotten from the constant pool
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3921
  // link in the method itself. For "the class"'s directly implemented
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3922
  // methods, the method holder is "the class" itself (as gotten from
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3923
  // the new constant pool). The check works fine in this case. The
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3924
  // check also works fine for methods inherited from super classes.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3925
  //
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3926
  // Miranda methods are a little more complicated. A miranda method is
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3927
  // provided by an interface when the class implementing the interface
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3928
  // does not provide its own method.  These interfaces are implemented
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3929
  // internally as an InstanceKlass. These special instanceKlasses
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3930
  // share the constant pool of the class that "implements" the
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3931
  // interface. By sharing the constant pool, the method holder of a
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3932
  // miranda method is the class that "implements" the interface. In a
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3933
  // non-redefine situation, the subtype check works fine. However, if
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3934
  // the old constant pool's pool holder is modified, then the check
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3935
  // fails because there is no class hierarchy relationship between the
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3936
  // vtable's class and "the new class".
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3937
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3938
  old_constants->set_pool_holder(scratch_class());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3939
#endif
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3940
26558
b7df27df6384 8055008: Clean up code that saves the previous versions of redefined classes
coleenp
parents: 24459
diff changeset
  3941
  // track number of methods that are EMCP for add_previous_version() call below
b7df27df6384 8055008: Clean up code that saves the previous versions of redefined classes
coleenp
parents: 24459
diff changeset
  3942
  int emcp_method_count = check_methods_and_mark_as_obsolete();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3943
  transfer_old_native_function_registrations(the_class);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3944
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3945
  // The class file bytes from before any retransformable agents mucked
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3946
  // with them was cached on the scratch class, move to the_class.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3947
  // Note: we still want to do this if nothing needed caching since it
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3948
  // should get cleared in the_class too.
11399
5dd5c4dd4b7d 7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents: 10546
diff changeset
  3949
  if (the_class->get_cached_class_file_bytes() == 0) {
5dd5c4dd4b7d 7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents: 10546
diff changeset
  3950
    // the_class doesn't have a cache yet so copy it
18940
d39d4765e6cb 8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents: 17864
diff changeset
  3951
    the_class->set_cached_class_file(scratch_class->get_cached_class_file());
11399
5dd5c4dd4b7d 7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents: 10546
diff changeset
  3952
  }
30229
2d8a6a2ee279 8066679: jvmtiRedefineClasses.cpp assert cache ptrs must match
sspitsyn
parents: 29584
diff changeset
  3953
  else if (scratch_class->get_cached_class_file_bytes() !=
2d8a6a2ee279 8066679: jvmtiRedefineClasses.cpp assert cache ptrs must match
sspitsyn
parents: 29584
diff changeset
  3954
           the_class->get_cached_class_file_bytes()) {
2d8a6a2ee279 8066679: jvmtiRedefineClasses.cpp assert cache ptrs must match
sspitsyn
parents: 29584
diff changeset
  3955
    // The same class can be present twice in the scratch classes list or there
2d8a6a2ee279 8066679: jvmtiRedefineClasses.cpp assert cache ptrs must match
sspitsyn
parents: 29584
diff changeset
  3956
    // are multiple concurrent RetransformClasses calls on different threads.
30752
e8641f96a82b 8079644: memory stomping error with ResourceManagement and TestAgentStress.java
sspitsyn
parents: 30289
diff changeset
  3957
    // In such cases we have to deallocate scratch_class cached_class_file.
e8641f96a82b 8079644: memory stomping error with ResourceManagement and TestAgentStress.java
sspitsyn
parents: 30289
diff changeset
  3958
    os::free(scratch_class->get_cached_class_file());
11399
5dd5c4dd4b7d 7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents: 10546
diff changeset
  3959
  }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3960
17357
98206e5df09e 8013063: nsk/jvmti/RetransformClasses/retransform001 failed debug version on os::free
coleenp
parents: 17077
diff changeset
  3961
  // NULL out in scratch class to not delete twice.  The class to be redefined
98206e5df09e 8013063: nsk/jvmti/RetransformClasses/retransform001 failed debug version on os::free
coleenp
parents: 17077
diff changeset
  3962
  // always owns these bytes.
18940
d39d4765e6cb 8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents: 17864
diff changeset
  3963
  scratch_class->set_cached_class_file(NULL);
17357
98206e5df09e 8013063: nsk/jvmti/RetransformClasses/retransform001 failed debug version on os::free
coleenp
parents: 17077
diff changeset
  3964
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3965
  // Replace inner_classes
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3966
  Array<u2>* old_inner_classes = the_class->inner_classes();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3967
  the_class->set_inner_classes(scratch_class->inner_classes());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3968
  scratch_class->set_inner_classes(old_inner_classes);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3969
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3970
  // Initialize the vtable and interface table after
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3971
  // methods have been rewritten
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3972
  {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3973
    ResourceMark rm(THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3974
    // no exception should happen here since we explicitly
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3975
    // do not check loader constraints.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3976
    // compare_and_normalize_class_versions has already checked:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3977
    //  - classloaders unchanged, signatures unchanged
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3978
    //  - all instanceKlasses for redefined classes reused & contents updated
46408
70aab0c2ea8b 8178350: klassVtable and klassItable should be ValueObj
iklam
parents: 46329
diff changeset
  3979
    the_class->vtable().initialize_vtable(false, THREAD);
70aab0c2ea8b 8178350: klassVtable and klassItable should be ValueObj
iklam
parents: 46329
diff changeset
  3980
    the_class->itable().initialize_itable(false, THREAD);
4571
80b553bddc26 6914300: ciEnv should export all well known classes
never
parents: 3820
diff changeset
  3981
    assert(!HAS_PENDING_EXCEPTION || (THREAD->pending_exception()->is_a(SystemDictionary::ThreadDeath_klass())), "redefine exception");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3982
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3983
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3984
  // Leave arrays of jmethodIDs and itable index cache unchanged
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3985
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3986
  // Copy the "source file name" attribute from new class version
19326
14cb6cf26a96 8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents: 19278
diff changeset
  3987
  the_class->set_source_file_name_index(
14cb6cf26a96 8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents: 19278
diff changeset
  3988
    scratch_class->source_file_name_index());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3989
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3990
  // Copy the "source debug extension" attribute from new class version
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3991
  the_class->set_source_debug_extension(
13201
69f157caabcc 6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents: 13195
diff changeset
  3992
    scratch_class->source_debug_extension(),
69f157caabcc 6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents: 13195
diff changeset
  3993
    scratch_class->source_debug_extension() == NULL ? 0 :
69f157caabcc 6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents: 13195
diff changeset
  3994
    (int)strlen(scratch_class->source_debug_extension()));
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3995
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3996
  // Use of javac -g could be different in the old and the new
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3997
  if (scratch_class->access_flags().has_localvariable_table() !=
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3998
      the_class->access_flags().has_localvariable_table()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3999
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4000
    AccessFlags flags = the_class->access_flags();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4001
    if (scratch_class->access_flags().has_localvariable_table()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4002
      flags.set_has_localvariable_table();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4003
    } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4004
      flags.clear_has_localvariable_table();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4005
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4006
    the_class->set_access_flags(flags);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4007
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4008
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  4009
  swap_annotations(the_class, scratch_class);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4010
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4011
  // Replace minor version number of class file
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4012
  u2 old_minor_version = the_class->minor_version();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4013
  the_class->set_minor_version(scratch_class->minor_version());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4014
  scratch_class->set_minor_version(old_minor_version);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4015
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4016
  // Replace major version number of class file
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4017
  u2 old_major_version = the_class->major_version();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4018
  the_class->set_major_version(scratch_class->major_version());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4019
  scratch_class->set_major_version(old_major_version);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4020
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4021
  // Replace CP indexes for class and name+type of enclosing method
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4022
  u2 old_class_idx  = the_class->enclosing_method_class_index();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4023
  u2 old_method_idx = the_class->enclosing_method_method_index();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4024
  the_class->set_enclosing_method_indices(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4025
    scratch_class->enclosing_method_class_index(),
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4026
    scratch_class->enclosing_method_method_index());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4027
  scratch_class->set_enclosing_method_indices(old_class_idx, old_method_idx);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4028
42650
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 40635
diff changeset
  4029
  // Replace fingerprint data
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 40635
diff changeset
  4030
  the_class->set_has_passed_fingerprint_check(scratch_class->has_passed_fingerprint_check());
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 40635
diff changeset
  4031
  the_class->store_fingerprint(scratch_class->get_stored_fingerprint());
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 40635
diff changeset
  4032
26558
b7df27df6384 8055008: Clean up code that saves the previous versions of redefined classes
coleenp
parents: 24459
diff changeset
  4033
  the_class->set_has_been_redefined();
b7df27df6384 8055008: Clean up code that saves the previous versions of redefined classes
coleenp
parents: 24459
diff changeset
  4034
42650
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 40635
diff changeset
  4035
  if (!the_class->should_be_initialized()) {
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 40635
diff changeset
  4036
    // Class was already initialized, so AOT has only seen the original version.
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 40635
diff changeset
  4037
    // We need to let AOT look at it again.
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 40635
diff changeset
  4038
    AOTLoader::load_for_klass(the_class, THREAD);
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 40635
diff changeset
  4039
  }
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 40635
diff changeset
  4040
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4041
  // keep track of previous versions of this class
26558
b7df27df6384 8055008: Clean up code that saves the previous versions of redefined classes
coleenp
parents: 24459
diff changeset
  4042
  the_class->add_previous_version(scratch_class, emcp_method_count);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4043
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4044
  _timer_rsc_phase1.stop();
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4045
  if (log_is_enabled(Info, redefine, class, timer)) {
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4046
    _timer_rsc_phase2.start();
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4047
  }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4048
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4049
  // Adjust constantpool caches and vtables for all classes
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4050
  // that reference methods of the evolved class.
17373
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  4051
  AdjustCpoolCacheAndVtable adjust_cpool_cache_and_vtable(THREAD);
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  4052
  ClassLoaderDataGraph::classes_do(&adjust_cpool_cache_and_vtable);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4053
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4054
  if (the_class->oop_map_cache() != NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4055
    // Flush references to any obsolete methods from the oop map cache
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4056
    // so that obsolete methods are not pinned.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4057
    the_class->oop_map_cache()->flush_obsolete_entries();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4058
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4059
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  4060
  increment_class_counter((InstanceKlass *)the_class, THREAD);
31234
48000028382c 8081219: hs_err improvement: Add event logging for class redefinition to the hs_err file
coleenp
parents: 30773
diff changeset
  4061
  {
48000028382c 8081219: hs_err improvement: Add event logging for class redefinition to the hs_err file
coleenp
parents: 30773
diff changeset
  4062
    ResourceMark rm(THREAD);
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4063
    // increment the classRedefinedCount field in the_class and in any
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4064
    // direct and indirect subclasses of the_class
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4065
    log_info(redefine, class, load)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4066
      ("redefined name=%s, count=%d (avail_mem=" UINT64_FORMAT "K)",
38309
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
  4067
       the_class->external_name(), java_lang_Class::classRedefinedCount(the_class->java_mirror()), os::available_memory() >> 10);
31234
48000028382c 8081219: hs_err improvement: Add event logging for class redefinition to the hs_err file
coleenp
parents: 30773
diff changeset
  4068
    Events::log_redefinition(THREAD, "redefined class name=%s, count=%d",
48000028382c 8081219: hs_err improvement: Add event logging for class redefinition to the hs_err file
coleenp
parents: 30773
diff changeset
  4069
                             the_class->external_name(),
38309
9b8e9c373740 8155951: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool
coleenp
parents: 38259
diff changeset
  4070
                             java_lang_Class::classRedefinedCount(the_class->java_mirror()));
31234
48000028382c 8081219: hs_err improvement: Add event logging for class redefinition to the hs_err file
coleenp
parents: 30773
diff changeset
  4071
48000028382c 8081219: hs_err improvement: Add event logging for class redefinition to the hs_err file
coleenp
parents: 30773
diff changeset
  4072
  }
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4073
  _timer_rsc_phase2.stop();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4074
} // end redefine_single_class()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4075
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4076
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  4077
// Increment the classRedefinedCount field in the specific InstanceKlass
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4078
// and in all direct and indirect subclasses.
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  4079
void VM_RedefineClasses::increment_class_counter(InstanceKlass *ik, TRAPS) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4080
  oop class_mirror = ik->java_mirror();
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  4081
  Klass* class_oop = java_lang_Class::as_Klass(class_mirror);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4082
  int new_count = java_lang_Class::classRedefinedCount(class_mirror) + 1;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4083
  java_lang_Class::set_classRedefinedCount(class_mirror, new_count);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4084
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  4085
  if (class_oop != _the_class) {
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  4086
    // _the_class count is printed at end of redefine_single_class()
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4087
    log_debug(redefine, class, subclass)("updated count in subclass=%s to %d", ik->external_name(), new_count);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4088
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4089
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4090
  for (Klass *subk = ik->subklass(); subk != NULL;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4091
       subk = subk->next_sibling()) {
33611
9abd65805e19 8139203: Consistent naming for klass type predicates
coleenp
parents: 33602
diff changeset
  4092
    if (subk->is_instance_klass()) {
8726
7bafcf0e5bfb 7029509: nightly failures after static fields in Class
never
parents: 8651
diff changeset
  4093
      // Only update instanceKlasses
33602
16053580a684 8139163: InstanceKlass::cast passes through NULL
coleenp
parents: 33594
diff changeset
  4094
      InstanceKlass *subik = InstanceKlass::cast(subk);
8726
7bafcf0e5bfb 7029509: nightly failures after static fields in Class
never
parents: 8651
diff changeset
  4095
      // recursively do subclasses of the current subclass
7bafcf0e5bfb 7029509: nightly failures after static fields in Class
never
parents: 8651
diff changeset
  4096
      increment_class_counter(subik, THREAD);
7bafcf0e5bfb 7029509: nightly failures after static fields in Class
never
parents: 8651
diff changeset
  4097
    }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4098
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4099
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4100
17373
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  4101
void VM_RedefineClasses::CheckClass::do_klass(Klass* k) {
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  4102
  bool no_old_methods = true;  // be optimistic
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  4103
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  4104
  // Both array and instance classes have vtables.
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  4105
  // a vtable should never contain old or obsolete methods
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  4106
  ResourceMark rm(_thread);
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  4107
  if (k->vtable_length() > 0 &&
46408
70aab0c2ea8b 8178350: klassVtable and klassItable should be ValueObj
iklam
parents: 46329
diff changeset
  4108
      !k->vtable().check_no_old_or_obsolete_entries()) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4109
    if (log_is_enabled(Trace, redefine, class, obsolete, metadata)) {
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4110
      log_trace(redefine, class, obsolete, metadata)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4111
        ("klassVtable::check_no_old_or_obsolete_entries failure -- OLD or OBSOLETE method found -- class: %s",
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4112
         k->signature_name());
46408
70aab0c2ea8b 8178350: klassVtable and klassItable should be ValueObj
iklam
parents: 46329
diff changeset
  4113
      k->vtable().dump_vtable();
17373
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  4114
    }
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  4115
    no_old_methods = false;
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  4116
  }
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  4117
33611
9abd65805e19 8139203: Consistent naming for klass type predicates
coleenp
parents: 33602
diff changeset
  4118
  if (k->is_instance_klass()) {
17373
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  4119
    HandleMark hm(_thread);
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  4120
    InstanceKlass *ik = InstanceKlass::cast(k);
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  4121
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  4122
    // an itable should never contain old or obsolete methods
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  4123
    if (ik->itable_length() > 0 &&
46408
70aab0c2ea8b 8178350: klassVtable and klassItable should be ValueObj
iklam
parents: 46329
diff changeset
  4124
        !ik->itable().check_no_old_or_obsolete_entries()) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4125
      if (log_is_enabled(Trace, redefine, class, obsolete, metadata)) {
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4126
        log_trace(redefine, class, obsolete, metadata)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4127
          ("klassItable::check_no_old_or_obsolete_entries failure -- OLD or OBSOLETE method found -- class: %s",
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4128
           ik->signature_name());
46408
70aab0c2ea8b 8178350: klassVtable and klassItable should be ValueObj
iklam
parents: 46329
diff changeset
  4129
        ik->itable().dump_itable();
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  4130
      }
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  4131
      no_old_methods = false;
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  4132
    }
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  4133
24459
ebd373039673 8042796: jvmtiRedefineClasses.cpp: guarantee(false) failed: OLD and/or OBSOLETE method(s) found
sspitsyn
parents: 24424
diff changeset
  4134
    // the constant pool cache should never contain non-deleted old or obsolete methods
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  4135
    if (ik->constants() != NULL &&
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  4136
        ik->constants()->cache() != NULL &&
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  4137
        !ik->constants()->cache()->check_no_old_or_obsolete_entries()) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4138
      if (log_is_enabled(Trace, redefine, class, obsolete, metadata)) {
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4139
        log_trace(redefine, class, obsolete, metadata)
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4140
          ("cp-cache::check_no_old_or_obsolete_entries failure -- OLD or OBSOLETE method found -- class: %s",
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4141
           ik->signature_name());
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  4142
        ik->constants()->cache()->dump_cache();
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  4143
      }
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  4144
      no_old_methods = false;
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  4145
    }
17373
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  4146
  }
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  4147
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  4148
  // print and fail guarantee if old methods are found.
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  4149
  if (!no_old_methods) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4150
    if (log_is_enabled(Trace, redefine, class, obsolete, metadata)) {
17373
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  4151
      dump_methods();
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  4152
    } else {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4153
      log_trace(redefine, class)("Use the '-Xlog:redefine+class*:' option "
17373
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  4154
        "to see more info about the following guarantee() failure.");
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  4155
    }
17373
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  4156
    guarantee(false, "OLD and/or OBSOLETE method(s) found");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4157
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4158
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4159
17373
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  4160
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4161
void VM_RedefineClasses::dump_methods() {
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  4162
  int j;
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4163
  log_trace(redefine, class, dump)("_old_methods --");
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  4164
  for (j = 0; j < _old_methods->length(); ++j) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4165
    LogStreamHandle(Trace, redefine, class, dump) log_stream;
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  4166
    Method* m = _old_methods->at(j);
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4167
    log_stream.print("%4d  (%5d)  ", j, m->vtable_index());
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4168
    m->access_flags().print_on(&log_stream);
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4169
    log_stream.print(" --  ");
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4170
    m->print_name(&log_stream);
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4171
    log_stream.cr();
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  4172
  }
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4173
  log_trace(redefine, class, dump)("_new_methods --");
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  4174
  for (j = 0; j < _new_methods->length(); ++j) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4175
    LogStreamHandle(Trace, redefine, class, dump) log_stream;
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  4176
    Method* m = _new_methods->at(j);
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4177
    log_stream.print("%4d  (%5d)  ", j, m->vtable_index());
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4178
    m->access_flags().print_on(&log_stream);
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4179
    log_stream.print(" --  ");
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4180
    m->print_name(&log_stream);
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4181
    log_stream.cr();
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  4182
  }
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4183
  log_trace(redefine, class, dump)("_matching_methods --");
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  4184
  for (j = 0; j < _matching_methods_length; ++j) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4185
    LogStreamHandle(Trace, redefine, class, dump) log_stream;
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  4186
    Method* m = _matching_old_methods[j];
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4187
    log_stream.print("%4d  (%5d)  ", j, m->vtable_index());
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4188
    m->access_flags().print_on(&log_stream);
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4189
    log_stream.print(" --  ");
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4190
    m->print_name();
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4191
    log_stream.cr();
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4192
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  4193
    m = _matching_new_methods[j];
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4194
    log_stream.print("      (%5d)  ", m->vtable_index());
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4195
    m->access_flags().print_on(&log_stream);
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4196
    log_stream.cr();
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  4197
  }
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4198
  log_trace(redefine, class, dump)("_deleted_methods --");
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  4199
  for (j = 0; j < _deleted_methods_length; ++j) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4200
    LogStreamHandle(Trace, redefine, class, dump) log_stream;
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  4201
    Method* m = _deleted_methods[j];
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4202
    log_stream.print("%4d  (%5d)  ", j, m->vtable_index());
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4203
    m->access_flags().print_on(&log_stream);
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4204
    log_stream.print(" --  ");
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4205
    m->print_name(&log_stream);
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4206
    log_stream.cr();
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  4207
  }
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4208
  log_trace(redefine, class, dump)("_added_methods --");
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  4209
  for (j = 0; j < _added_methods_length; ++j) {
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4210
    LogStreamHandle(Trace, redefine, class, dump) log_stream;
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  4211
    Method* m = _added_methods[j];
38259
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4212
    log_stream.print("%4d  (%5d)  ", j, m->vtable_index());
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4213
    m->access_flags().print_on(&log_stream);
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4214
    log_stream.print(" --  ");
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4215
    m->print_name(&log_stream);
b495d1cfe673 8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents: 38051
diff changeset
  4216
    log_stream.cr();
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  4217
  }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4218
}
31234
48000028382c 8081219: hs_err improvement: Add event logging for class redefinition to the hs_err file
coleenp
parents: 30773
diff changeset
  4219
48000028382c 8081219: hs_err improvement: Add event logging for class redefinition to the hs_err file
coleenp
parents: 30773
diff changeset
  4220
void VM_RedefineClasses::print_on_error(outputStream* st) const {
48000028382c 8081219: hs_err improvement: Add event logging for class redefinition to the hs_err file
coleenp
parents: 30773
diff changeset
  4221
  VM_Operation::print_on_error(st);
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  4222
  if (_the_class != NULL) {
31234
48000028382c 8081219: hs_err improvement: Add event logging for class redefinition to the hs_err file
coleenp
parents: 30773
diff changeset
  4223
    ResourceMark rm;
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
  4224
    st->print_cr(", redefining class %s", _the_class->external_name());
31234
48000028382c 8081219: hs_err improvement: Add event logging for class redefinition to the hs_err file
coleenp
parents: 30773
diff changeset
  4225
  }
48000028382c 8081219: hs_err improvement: Add event logging for class redefinition to the hs_err file
coleenp
parents: 30773
diff changeset
  4226
}