Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8173699: Crash during deoptimization with "assert(result == __null || result->is_oop()) failed: must be oop"
authorthartmann
Fri, 03 Feb 2017 08:17:35 +0100
changeset 43931 b31dd7e27325
parent 43683 c3f65860f2e2
child 43932 685a262f474f
8173699: Crash during deoptimization with "assert(result == __null || result->is_oop()) failed: must be oop" Summary: Ignore return_oop() when dispatching an exception and only try to retrieve the oop when performing re-allocation during a normal deoptimization (if exec_mode == Unpack_deopt). Reviewed-by: kvn, vlivanov
hotspot/src/share/vm/runtime/deoptimization.cpp file | annotate | diff | comparison | revisions 
--- a/hotspot/src/share/vm/runtime/deoptimization.cpp	Thu Feb 02 16:57:01 2017 -0800
+++ b/hotspot/src/share/vm/runtime/deoptimization.cpp	Fri Feb 03 08:17:35 2017 +0100
@@ -221,8 +221,9 @@
       // 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()).
-      // 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();
+      // If the previous frame was popped or if we are dispatching an exception,
+      // we don't have an oop result.
+      bool save_oop_result = chunk->at(0)->scope()->return_oop() && !thread->popframe_forcing_deopt_reexecution() && (exec_mode == Unpack_deopt);
       Handle return_value;
       if (save_oop_result) {
         // Reallocation may trigger GC. If deoptimization happened on return from
jdk-sandbox