src/cpu/x86/vm/c1_LIRGenerator_x86.cpp

*** 872,881 ****
--- 872,885 ----
  }
  
  
  void LIRGenerator::do_ArrayCopy(Intrinsic* x) {
    assert(x->number_of_arguments() == 5, "wrong type");
+ 
+   // Make all state_for calls early since they can emit code
+   CodeEmitInfo* info = state_for(x, x->state());
+ 
    LIRItem src(x->argument_at(0), this);
    LIRItem src_pos(x->argument_at(1), this);
    LIRItem dst(x->argument_at(2), this);
    LIRItem dst_pos(x->argument_at(3), this);
    LIRItem length(x->argument_at(4), this);
*** 914,924 ****
  
    int flags;
    ciArrayKlass* expected_type;
    arraycopy_helper(x, &flags, &expected_type);
  
-   CodeEmitInfo* info = state_for(x, x->state()); // we may want to have stack (deoptimization?)
    __ arraycopy(src.result(), src_pos.result(), dst.result(), dst_pos.result(), length.result(), tmp, expected_type, flags, info); // does add_safepoint
  }
  
  
  // _i2l, _i2f, _i2d, _l2i, _l2f, _l2d, _f2i, _f2l, _f2d, _d2i, _d2l, _d2f
--- 918,927 ----