archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8009836: nsk/regression/b4222717 fails with empty stack trace

Browse source 
Some zeroing was missed for bug 8003553, causing empty stack traces and Xcom crashes, add back zeroing to metablock

Reviewed-by: dholmes, rbackman
This commit is contained in:
Coleen Phillimore 2013-03-13 09:10:35 -04:00
parent fc336457e7
commit 70b26044ba
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
hotspot/src/share/vm/memory/metablock.cpp
View file

@ -65,9 +65,10 @@ Metablock* Metablock::initialize(MetaWord* p, size_t word_size) {
} }
Metablock* result = (Metablock*) p; Metablock* result = (Metablock*) p;
// Clear the memory
Copy::fill_to_aligned_words((HeapWord*)result, word_size);
#ifdef ASSERT #ifdef ASSERT
// Add just to catch missing initializations
Copy::fill_to_words((HeapWord*) result, word_size, 0xf1f1f1f1);
result->set_word_size(word_size); result->set_word_size(word_size);
#endif #endif
return result; return result;

3
hotspot/src/share/vm/oops/constMethod.cpp
View file

@ -55,7 +55,7 @@ ConstMethod::ConstMethod(int byte_code_size,
set_stackmap_data(NULL); set_stackmap_data(NULL);
set_code_size(byte_code_size); set_code_size(byte_code_size);
set_constMethod_size(size); set_constMethod_size(size);
set_inlined_tables_length(sizes); set_inlined_tables_length(sizes); // sets _flags
set_method_type(method_type); set_method_type(method_type);
assert(this->size() == size, "wrong size for object"); assert(this->size() == size, "wrong size for object");
set_name_index(0); set_name_index(0);
@ -64,6 +64,7 @@ ConstMethod::ConstMethod(int byte_code_size,
set_max_stack(0); set_max_stack(0);
set_max_locals(0); set_max_locals(0);
set_method_idnum(0); set_method_idnum(0);
set_size_of_parameters(0);
} }

3
hotspot/src/share/vm/oops/method.cpp
View file

@ -87,6 +87,9 @@ Method::Method(ConstMethod* xconst, AccessFlags access_flags, int size) {
#endif #endif
set_intrinsic_id(vmIntrinsics::_none); set_intrinsic_id(vmIntrinsics::_none);
set_jfr_towrite(false); set_jfr_towrite(false);
set_force_inline(false);
set_hidden(false);
set_dont_inline(false);
set_method_data(NULL); set_method_data(NULL);
set_interpreter_throwout_count(0); set_interpreter_throwout_count(0);
set_vtable_index(Method::garbage_vtable_index); set_vtable_index(Method::garbage_vtable_index);