stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8014956: nashorn/api/javaaccess/MethodAccessTest.java test fails on sparc-solaris 64

Browse Source 
Reference_map[] array had uninitialized junk that was causing a bogus bootstrap method to be found.

Reviewed-by: hseigel, dcubed, sspitsyn
This commit is contained in:
Coleen Phillimore 2013-09-20 18:34:00 -04:00
parent ffb0a9d569
commit 42589e0f11
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hotspot/src/share/vm/oops/constantPool.cpp
View File

@ -108,16 +108,16 @@ objArrayOop ConstantPool::resolved_references() const {
void ConstantPool::initialize_resolved_references(ClassLoaderData* loader_data, void ConstantPool::initialize_resolved_references(ClassLoaderData* loader_data,
intStack reference_map, intStack reference_map,
int constant_pool_map_length, int constant_pool_map_length,
TRAPS) { TRAPS) {
// Initialized the resolved object cache. // Initialized the resolved object cache.
int map_length = reference_map.length(); int map_length = reference_map.length();
if (map_length > 0) { if (map_length > 0) {
// Only need mapping back to constant pool entries. The map isn't used for // Only need mapping back to constant pool entries. The map isn't used for
// invokedynamic resolved_reference entries. The constant pool cache index // invokedynamic resolved_reference entries. For invokedynamic entries,
// has the mapping back to both the constant pool and to the resolved // the constant pool cache index has the mapping back to both the constant
// reference index. // pool and to the resolved reference index.
if (constant_pool_map_length > 0) { if (constant_pool_map_length > 0) {
Array<u2>* om = MetadataFactory::new_array<u2>(loader_data, map_length, CHECK); Array<u2>* om = MetadataFactory::new_array<u2>(loader_data, constant_pool_map_length, CHECK);
for (int i = 0; i < constant_pool_map_length; i++) { for (int i = 0; i < constant_pool_map_length; i++) {
int x = reference_map.at(i); int x = reference_map.at(i);
@ -182,16 +182,9 @@ oop ConstantPool::lock() {
int ConstantPool::cp_to_object_index(int cp_index) { int ConstantPool::cp_to_object_index(int cp_index) {
// this is harder don't do this so much. // this is harder don't do this so much.
for (int i = 0; i< reference_map()->length(); i++) { int i = reference_map()->find(cp_index);
if (reference_map()->at(i) == cp_index) return i; // We might not find the index for jsr292 call.
// Zero entry is divider between constant pool indices for strings, return (i < 0) ? _no_index_sentinel : i;
// method handles and method types. After that the index is a constant
// pool cache index for invokedynamic. Stop when zero (which can never
// be a constant pool index)
if (reference_map()->at(i) == 0) break;
}
// We might not find the index.
return _no_index_sentinel;
} }
Klass* ConstantPool::klass_at_impl(constantPoolHandle this_oop, int which, TRAPS) { Klass* ConstantPool::klass_at_impl(constantPoolHandle this_oop, int which, TRAPS) {
@ -866,8 +859,7 @@ oop ConstantPool::string_at_impl(constantPoolHandle this_oop, int which, int obj
// If the string has already been interned, this entry will be non-null // If the string has already been interned, this entry will be non-null
oop str = this_oop->resolved_references()->obj_at(obj_index); oop str = this_oop->resolved_references()->obj_at(obj_index);
if (str != NULL) return str; if (str != NULL) return str;
Symbol* sym = this_oop->unresolved_string_at(which);
Symbol* sym = this_oop->unresolved_string_at(which);
str = StringTable::intern(sym, CHECK_(NULL)); str = StringTable::intern(sym, CHECK_(NULL));
this_oop->string_at_put(which, obj_index, str); this_oop->string_at_put(which, obj_index, str);
assert(java_lang_String::is_instance(str), "must be string"); assert(java_lang_String::is_instance(str), "must be string");

1
hotspot/src/share/vm/oops/constantPool.hpp
View File

@ -231,7 +231,6 @@ class ConstantPool : public Metadata {
static int cache_offset_in_bytes() { return offset_of(ConstantPool, _cache); } static int cache_offset_in_bytes() { return offset_of(ConstantPool, _cache); }
static int pool_holder_offset_in_bytes() { return offset_of(ConstantPool, _pool_holder); } static int pool_holder_offset_in_bytes() { return offset_of(ConstantPool, _pool_holder); }
static int resolved_references_offset_in_bytes() { return offset_of(ConstantPool, _resolved_references); } static int resolved_references_offset_in_bytes() { return offset_of(ConstantPool, _resolved_references); }
static int reference_map_offset_in_bytes() { return offset_of(ConstantPool, _reference_map); }
// Storing constants // Storing constants