Mercurial > hg > graal-jvmci-8
diff src/share/vm/runtime/deoptimization.cpp @ 22720:48fde4d03767
Add assert for Unpack_uncommon_trap for ppc and always check for rethrow_exception
| author | Gilles Duboscq <gilles.m.duboscq@oracle.com> |
|---|---|
| date | Wed, 04 Nov 2015 16:11:58 +0100 |
| parents | ba7846fcb814 |
| children | 1dc87d090f96 |
line wrap: on
line diff
--- a/src/share/vm/runtime/deoptimization.cpp Mon Nov 02 23:53:10 2015 +0100 +++ b/src/share/vm/runtime/deoptimization.cpp Wed Nov 04 16:11:58 2015 +0100 @@ -226,7 +226,6 @@ assert(vf->is_compiled_frame(), "Wrong frame type"); chunk->push(compiledVFrame::cast(vf)); -#ifdef INCLUDE_JVMCI ScopeDesc* trap_scope = chunk->at(0)->scope(); Handle exceptionObject; if (trap_scope->rethrow_exception()) { @@ -239,7 +238,6 @@ exceptionObject = StackValue::create_stack_value(&deoptee, &map, topOfStack)->get_obj(); assert(exceptionObject() != NULL, "exception oop can not be null"); } -#endif bool realloc_failures = false;