truffle: src/share/vm/classfile/classFileParser.cpp comparison

comparison src/share/vm/classfile/classFileParser.cpp @ 1909:d2e35ffae982

6994630: java/lang/instrument/IsModifiableClassAgent.java fails with -XX:+EnableInvokeDynamic Summary: The logic of ClassFileParser::java_dyn_MethodHandle_fix_pre needs to take care of an already changed vmentry signature. Reviewed-by: never, jrose

author	twisti
date	Thu, 28 Oct 2010 00:48:18 -0700
parents	a932f331ef90
children	3b2dea75431e

comparison

equal deleted inserted replaced

-:f195c4737aca
+:d2e35ffae982
 /*
-* Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 //
 // Check the fields in java.lang.ref.Reference for the "discovered"
 // field.  If it is not present, artifically create a field for it.
 // This allows this VM to run on early JDK where the field is not
 // present.
-//
-// Increment fac.nonstatic_oop_count so that the start of the
-// next type of non-static oops leaves room for the fake oop.
-// Do not increment next_nonstatic_oop_offset so that the
-// fake oop is place after the java.lang.ref.Reference oop
-// fields.
-//
-// Check the fields in java.lang.ref.Reference for the "discovered"
-// field.  If it is not present, artifically create a field for it.
-// This allows this VM to run on early JDK where the field is not
-// present.
 int reference_sig_index = 0;
 int reference_name_index = 0;
 int reference_index = 0;
 int extra = java_lang_ref_Reference::number_of_fake_oop_fields;
 const int n = (*fields_ptr)()->length();
 // Force MethodHandle.vmentry to be an unmanaged pointer.
 // There is no way for a classfile to express this, so we must help it.
 void ClassFileParser::java_dyn_MethodHandle_fix_pre(constantPoolHandle cp,
-typeArrayHandle* fields_ptr,
+typeArrayHandle fields,
 FieldAllocationCount *fac_ptr,
 TRAPS) {
 // Add fake fields for java.dyn.MethodHandle instances
 //
 // This is not particularly nice, but since there is no way to express
 if (word_sig_index == 0)
 THROW_MSG(vmSymbols::java_lang_VirtualMachineError(),
 "missing I or J signature (for vmentry) in java.dyn.MethodHandle");
+// Find vmentry field and change the signature.
 bool found_vmentry = false;
+for (int i = 0; i < fields->length(); i += instanceKlass::next_offset) {
-const int n = (*fields_ptr)()->length();
+int name_index = fields->ushort_at(i + instanceKlass::name_index_offset);
-for (int i = 0; i < n; i += instanceKlass::next_offset) {
+int sig_index  = fields->ushort_at(i + instanceKlass::signature_index_offset);
-int name_index = (*fields_ptr)->ushort_at(i + instanceKlass::name_index_offset);
+int acc_flags  = fields->ushort_at(i + instanceKlass::access_flags_offset);
-int sig_index  = (*fields_ptr)->ushort_at(i + instanceKlass::signature_index_offset);
-int acc_flags  = (*fields_ptr)->ushort_at(i + instanceKlass::access_flags_offset);
 symbolOop f_name = cp->symbol_at(name_index);
 symbolOop f_sig  = cp->symbol_at(sig_index);
-if (f_sig == vmSymbols::byte_signature() &&
-f_name == vmSymbols::vmentry_name() &&
+if (f_name == vmSymbols::vmentry_name() && (acc_flags & JVM_ACC_STATIC) == 0) {
-(acc_flags & JVM_ACC_STATIC) == 0) {
+if (f_sig == vmSymbols::machine_word_signature()) {
-// Adjust the field type from byte to an unmanaged pointer.
+// If the signature of vmentry is already changed, we're done.
-assert(fac_ptr->nonstatic_byte_count > 0, "");
+found_vmentry = true;
-fac_ptr->nonstatic_byte_count -= 1;
+break;
+}
-(*fields_ptr)->ushort_at_put(i + instanceKlass::signature_index_offset, word_sig_index);
+else if (f_sig == vmSymbols::byte_signature()) {
-assert(wordSize == longSize || wordSize == jintSize, "ILP32 or LP64");
+// Adjust the field type from byte to an unmanaged pointer.
-if (wordSize == longSize)  fac_ptr->nonstatic_double_count += 1;
+assert(fac_ptr->nonstatic_byte_count > 0, "");
-else                       fac_ptr->nonstatic_word_count   += 1;
+fac_ptr->nonstatic_byte_count -= 1;
-FieldAllocationType atype = (FieldAllocationType) (*fields_ptr)->ushort_at(i + instanceKlass::low_offset);
+fields->ushort_at_put(i + instanceKlass::signature_index_offset, word_sig_index);
-assert(atype == NONSTATIC_BYTE, "");
+assert(wordSize == longSize || wordSize == jintSize, "ILP32 or LP64");
-FieldAllocationType new_atype = (wordSize == longSize) ? NONSTATIC_DOUBLE : NONSTATIC_WORD;
+if (wordSize == longSize)  fac_ptr->nonstatic_double_count += 1;
-(*fields_ptr)->ushort_at_put(i + instanceKlass::low_offset, new_atype);
+else                       fac_ptr->nonstatic_word_count   += 1;
-found_vmentry = true;
+FieldAllocationType atype = (FieldAllocationType) fields->ushort_at(i + instanceKlass::low_offset);
-break;
+assert(atype == NONSTATIC_BYTE, "");
+FieldAllocationType new_atype = (wordSize == longSize) ? NONSTATIC_DOUBLE : NONSTATIC_WORD;
+fields->ushort_at_put(i + instanceKlass::low_offset, new_atype);
+found_vmentry = true;
+break;
+}
 }
 }
 if (!found_vmentry)
 THROW_MSG(vmSymbols::java_lang_VirtualMachineError(),
 "missing vmentry byte field in java.dyn.MethodHandle");
 }
 instanceKlassHandle ClassFileParser::parseClassFile(symbolHandle name,
 Handle class_loader,
 java_lang_Class_fix_pre(&methods, &fac, CHECK_(nullHandle));
 }
 // adjust the vmentry field declaration in java.dyn.MethodHandle
 if (EnableMethodHandles && class_name() == vmSymbols::sun_dyn_MethodHandleImpl() && class_loader.is_null()) {
-java_dyn_MethodHandle_fix_pre(cp, &fields, &fac, CHECK_(nullHandle));
+java_dyn_MethodHandle_fix_pre(cp, fields, &fac, CHECK_(nullHandle));
 }
 // Add a fake "discovered" field if it is not present
 // for compatibility with earlier jdk's.
 if (class_name() == vmSymbols::java_lang_ref_Reference()

Mercurial > hg > truffle

comparison src/share/vm/classfile/classFileParser.cpp @ 1909:d2e35ffae982