archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-22 03:54:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8038624: interpretedVFrame::expressions() must respect InterpreterOopMap for liveness

Browse source 
Reviewed-by: coleenp, minqi
This commit is contained in:
Markus Grönlund 2014-04-05 21:33:11 +02:00
parent 9aa74d318c
commit 47bf9f6d57
1 changed files with 28 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

42
hotspot/src/share/vm/runtime/vframe.cpp
View file

@ -321,24 +321,38 @@ void interpretedVFrame::set_locals(StackValueCollection* values) const {
} }
} }
StackValueCollection* interpretedVFrame::expressions() const { StackValueCollection* interpretedVFrame::expressions() const {
int length = fr().interpreter_frame_expression_stack_size();
if (method()->is_native()) { InterpreterOopMap oop_mask;
// If the method is native, there is no expression stack
length = 0; if (!method()->is_native()) {
// Get oopmap describing oops and int for current bci
if (TraceDeoptimization && Verbose) {
methodHandle m_h(method());
OopMapCache::compute_one_oop_map(m_h, bci(), &oop_mask);
} else {
method()->mask_for(bci(), &oop_mask);
}
}
// If the bci is a call instruction, i.e. any of the invoke* instructions,
// the InterpreterOopMap does not include expression/operand stack liveness
// info in the oop_mask/bit_mask. This can lead to a discrepancy of what
// is actually on the expression stack compared to what is given by the
// oop_map. We need to use the length reported in the oop_map.
int length = oop_mask.expression_stack_size();
assert(fr().interpreter_frame_expression_stack_size() >= length,
"error in expression stack!");
StackValueCollection* result = new StackValueCollection(length);
if (0 == length) {
return result;
} }
int nof_locals = method()->max_locals(); int nof_locals = method()->max_locals();
StackValueCollection* result = new StackValueCollection(length);
InterpreterOopMap oop_mask;
// Get oopmap describing oops and int for current bci
if (TraceDeoptimization && Verbose) {
methodHandle m_h(method());
OopMapCache::compute_one_oop_map(m_h, bci(), &oop_mask);
} else {
method()->mask_for(bci(), &oop_mask);
}
// handle expressions // handle expressions
for(int i=0; i < length; i++) { for(int i=0; i < length; i++) {
// Find stack location // Find stack location