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

7130676: Tiered: assert(bci == 0 || 0<= bci && bci<code_size()) during stack trace construction

Browse Source 
Reviewed-by: kvn, iveresov
This commit is contained in:
Tom Rodriguez 2012-01-22 14:03:20 -08:00
parent 55c9a74046
commit 52979e6206
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hotspot/src/share/vm/classfile/javaClasses.cpp
View File

@ -1347,7 +1347,13 @@ class BacktraceBuilder: public StackObj {
return _backtrace(); return _backtrace();
} }
inline void push(methodOop method, short bci, TRAPS) { inline void push(methodOop method, int bci, TRAPS) {
// Smear the -1 bci to 0 since the array only holds unsigned
// shorts. The later line number lookup would just smear the -1
// to a 0 even if it could be recorded.
if (bci == SynchronizationEntryBCI) bci = 0;
assert(bci == (jushort)bci, "doesn't fit");
if (_index >= trace_chunk_size) { if (_index >= trace_chunk_size) {
methodHandle mhandle(THREAD, method); methodHandle mhandle(THREAD, method);
expand(CHECK); expand(CHECK);
@ -1574,8 +1580,13 @@ void java_lang_Throwable::fill_in_stack_trace_of_preallocated_backtrace(Handle t
int chunk_count = 0; int chunk_count = 0;
for (;!st.at_end(); st.next()) { for (;!st.at_end(); st.next()) {
// add element // Add entry and smear the -1 bci to 0 since the array only holds
bcis->ushort_at_put(chunk_count, st.bci()); // unsigned shorts. The later line number lookup would just smear
// the -1 to a 0 even if it could be recorded.
int bci = st.bci();
if (bci == SynchronizationEntryBCI) bci = 0;
assert(bci == (jushort)bci, "doesn't fit");
bcis->ushort_at_put(chunk_count, bci);
methods->obj_at_put(chunk_count, st.method()); methods->obj_at_put(chunk_count, st.method());
chunk_count++; chunk_count++;