src/share/vm/opto/library_call.cpp

*** 3221,3237 ****
      uncommon_trap(Deoptimization::Reason_intrinsic,
                    Deoptimization::Action_maybe_recompile);
    }
  
    if (!stopped()) {
      // How many elements will we copy from the original?
      // The answer is MinI(orig_length - start, length).
      Node* orig_tail = _gvn.transform( new(C, 3) SubINode(orig_length, start) );
      Node* moved = generate_min_max(vmIntrinsics::_min, orig_tail, length);
  
      const bool raw_mem_only = true;
!     Node* newcopy = new_array(klass_node, length, nargs, raw_mem_only);
  
      // Generate a direct call to the right arraycopy function(s).
      // We know the copy is disjoint but we might not know if the
      // oop stores need checking.
      // Extreme case:  Arrays.copyOf((Integer[])x, 10, String[].class).
--- 3221,3241 ----
      uncommon_trap(Deoptimization::Reason_intrinsic,
                    Deoptimization::Action_maybe_recompile);
    }
  
    if (!stopped()) {
+     //set the original stack and the restart bit for deopt to restart
+     _sp += nargs;
+     jvms()->set_restart(true);
+ 
      // How many elements will we copy from the original?
      // The answer is MinI(orig_length - start, length).
      Node* orig_tail = _gvn.transform( new(C, 3) SubINode(orig_length, start) );
      Node* moved = generate_min_max(vmIntrinsics::_min, orig_tail, length);
  
      const bool raw_mem_only = true;
!     Node* newcopy = new_array(klass_node, length, 0, raw_mem_only);
  
      // Generate a direct call to the right arraycopy function(s).
      // We know the copy is disjoint but we might not know if the
      // oop stores need checking.
      // Extreme case:  Arrays.copyOf((Integer[])x, 10, String[].class).
*** 3239,3248 ****
--- 3243,3254 ----
      bool disjoint_bases = true;
      bool length_never_negative = true;
      generate_arraycopy(TypeAryPtr::OOPS, T_OBJECT,
                         original, start, newcopy, intcon(0), moved,
                         disjoint_bases, length_never_negative);
+     _sp -= nargs;
+     jvms()->set_restart(false);
  
      push(newcopy);
    }
  
    C->set_has_split_ifs(true); // Has chance for split-if optimization
*** 4023,4032 ****
--- 4029,4042 ----
  
    const TypePtr* raw_adr_type = TypeRawPtr::BOTTOM;
    int raw_adr_idx = Compile::AliasIdxRaw;
    const bool raw_mem_only = true;
  
+   //set the original stack and the restart bit for deopt to restart
+   _sp += nargs;
+   jvms()->set_restart(true);
+ 
    Node* array_ctl = generate_array_guard(obj_klass, (RegionNode*)NULL);
    if (array_ctl != NULL) {
      // It's an array.
      PreserveJVMState pjvms(this);
      set_control(array_ctl);
*** 4127,4136 ****
--- 4137,4149 ----
      result_val->init_req(_slow_path, slow_result);
      result_i_o ->set_req(_slow_path, i_o());
      result_mem ->set_req(_slow_path, reset_memory());
    }
  
+   _sp -= nargs;
+   jvms()->set_restart(false);
+ 
    // Return the combined state.
    set_control(    _gvn.transform(result_reg) );
    set_i_o(        _gvn.transform(result_i_o) );
    set_all_memory( _gvn.transform(result_mem) );