Mercurial > hg > graal-jvmci-8
changeset 1070:87b2fdd4bf98
6892079: live value must not be garbage failure after fix for 6854812
Reviewed-by: kvn
author | never |
---|---|
date | Wed, 11 Nov 2009 23:39:17 -0800 |
parents | 2f1ec89b9995 |
children | b18963243361 |
files | src/share/vm/opto/parse1.cpp |
diffstat | 1 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/opto/parse1.cpp Tue Nov 10 17:00:18 2009 -0800 +++ b/src/share/vm/opto/parse1.cpp Wed Nov 11 23:39:17 2009 -0800 @@ -231,12 +231,13 @@ // Use the raw liveness computation to make sure that unexpected // values don't propagate into the OSR frame. - MethodLivenessResult live_locals = method()->raw_liveness_at_bci(osr_bci()); + MethodLivenessResult live_locals = method()->liveness_at_bci(osr_bci()); if (!live_locals.is_valid()) { // Degenerate or breakpointed method. C->record_method_not_compilable("OSR in empty or breakpointed method"); return; } + MethodLivenessResult raw_live_locals = method()->raw_liveness_at_bci(osr_bci()); // Extract the needed locals from the interpreter frame. Node *locals_addr = basic_plus_adr(osr_buf, osr_buf, (max_locals-1)*wordSize); @@ -316,6 +317,10 @@ continue; } } + if (type->basic_type() == T_ADDRESS && !raw_live_locals.at(index)) { + // Skip type check for dead address locals + continue; + } set_local(index, check_interpreter_type(l, type, bad_type_exit)); }