Mercurial > hg > graal-compiler
changeset 20454:b186a900f63a
8055946: assert(result == NULL || result->is_oop()) failed: must be oop
Summary: caller of popped frame doesn't have valid result during deoptimization
Reviewed-by: kvn
author | roland |
---|---|
date | Wed, 27 Aug 2014 17:37:18 +0200 |
parents | be56d800c946 |
children | 07f629123254 |
files | src/share/vm/runtime/deoptimization.cpp |
diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/runtime/deoptimization.cpp Mon Aug 11 15:09:04 2014 +0200 +++ b/src/share/vm/runtime/deoptimization.cpp Wed Aug 27 17:37:18 2014 +0200 @@ -228,7 +228,8 @@ // It is not guaranteed that we can get such information here only // by analyzing bytecode in deoptimized frames. This is why this flag // is set during method compilation (see Compile::Process_OopMap_Node()). - bool save_oop_result = chunk->at(0)->scope()->return_oop(); + // If the previous frame was popped, we don't have a result. + bool save_oop_result = chunk->at(0)->scope()->return_oop() && !thread->popframe_forcing_deopt_reexecution(); Handle return_value; if (save_oop_result) { // Reallocation may trigger GC. If deoptimization happened on return from