equal
deleted
inserted
replaced
493 |
493 |
494 #ifdef INCLUDE_JVMCI |
494 #ifdef INCLUDE_JVMCI |
495 if (exceptionObject() != NULL) { |
495 if (exceptionObject() != NULL) { |
496 thread->set_exception_oop(exceptionObject()); |
496 thread->set_exception_oop(exceptionObject()); |
497 exec_mode = Unpack_exception; |
497 exec_mode = Unpack_exception; |
|
498 } |
|
499 #endif |
|
500 |
|
501 if (thread->frames_to_pop_failed_realloc() > 0 && exec_mode != Unpack_uncommon_trap) { |
|
502 assert(thread->has_pending_exception(), "should have thrown OOME"); |
|
503 thread->set_exception_oop(thread->pending_exception()); |
|
504 thread->clear_pending_exception(); |
|
505 exec_mode = Unpack_exception; |
|
506 } |
|
507 |
|
508 #if INCLUDE_JVMCI |
|
509 if (thread->frames_to_pop_failed_realloc() > 0) { |
|
510 thread->set_pending_monitorenter(false); |
498 } |
511 } |
499 #endif |
512 #endif |
500 |
513 |
501 UnrollBlock* info = new UnrollBlock(array->frame_size() * BytesPerWord, |
514 UnrollBlock* info = new UnrollBlock(array->frame_size() * BytesPerWord, |
502 caller_adjustment * BytesPerWord, |
515 caller_adjustment * BytesPerWord, |