src/share/vm/opto/library_call.cpp

rev 6553 : 8033626: assert(ex_map->jvms()->same_calls_as(_exceptions->jvms())) failed: all collected exceptions must come from the same place
Reviewed-by: ?

*** 4577,4587 ****
  
      if (!stopped()) {
        // It's an instance, and it passed the slow-path tests.
        PreserveJVMState pjvms(this);
        Node* obj_size  = NULL;
!       Node* alloc_obj = new_instance(obj_klass, NULL, &obj_size);
  
        copy_to_clone(obj, alloc_obj, obj_size, false, !use_ReduceInitialCardMarks());
  
        // Present the results of the slow call.
        result_reg->init_req(_instance_path, control());
--- 4577,4590 ----
  
      if (!stopped()) {
        // It's an instance, and it passed the slow-path tests.
        PreserveJVMState pjvms(this);
        Node* obj_size  = NULL;
!       // Need to deoptimize on exception from allocation since Object.clone intrinsic
!       // is reexecuted if deoptimization occurs and there could be problems when merging
!       // exception state between multiple Object.clone versions (reexecute=true vs reexecute=false).
!       Node* alloc_obj = new_instance(obj_klass, NULL, &obj_size, /*deoptimize_on_exception=*/true);
  
        copy_to_clone(obj, alloc_obj, obj_size, false, !use_ReduceInitialCardMarks());
  
        // Present the results of the slow call.
        result_reg->init_req(_instance_path, control());