--- old/src/share/vm/c1/c1_LIRGenerator.hpp 2015-10-14 13:53:48.642507921 +0200 +++ new/src/share/vm/c1/c1_LIRGenerator.hpp 2015-10-14 13:53:48.536510484 +0200 @@ -226,6 +226,8 @@ LIR_Opr round_item(LIR_Opr opr); LIR_Opr force_to_spill(LIR_Opr value, BasicType t); + LIR_Opr force_opr_to(LIR_Opr op, LIR_Opr reg); + PhiResolverState& resolver_state() { return _resolver_state; } void move_to_phi(PhiResolver* resolver, Value cur_val, Value sux_val); @@ -265,6 +267,9 @@ void pre_barrier(LIR_Opr addr_opr, LIR_Opr pre_val, bool do_load, bool patch, CodeEmitInfo* info); void post_barrier(LIR_OprDesc* addr, LIR_OprDesc* new_val); + LIR_Opr shenandoah_read_barrier(LIR_Opr obj, CodeEmitInfo* info, bool need_null_check); + LIR_Opr shenandoah_write_barrier(LIR_Opr obj, CodeEmitInfo* info, bool need_null_check); + // specific implementations // pre barriers