src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp

rev 51408 : [mq]: cleanup-c1.patch

*** 2164,2173 ****
--- 2164,2176 ----
    Register src_pos = op->src_pos()->as_register();
    Register dst_pos = op->dst_pos()->as_register();
    Register length  = op->length()->as_register();
    Register tmp = op->tmp()->as_register();
  
+   __ resolve_for_read(IN_HEAP, src);
+   __ resolve_for_write(IN_HEAP, dst);
+ 
    CodeStub* stub = op->stub();
    int flags = op->flags();
    BasicType basic_type = default_type != NULL ? default_type->element_type()->basic_type() : T_ILLEGAL;
    if (basic_type == T_ARRAY) basic_type = T_OBJECT;
  
*** 2507,2516 ****
--- 2510,2520 ----
      Register scratch = noreg;
      if (UseBiasedLocking) {
        scratch = op->scratch_opr()->as_register();
      }
      assert(BasicLock::displaced_header_offset_in_bytes() == 0, "lock_reg must point to the displaced header");
+     __ resolve_for_write(IN_HEAP, obj);
      // add debug info for NullPointerException only if one is possible
      int null_check_offset = __ lock_object(hdr, obj, lock, scratch, *op->stub()->entry());
      if (op->info() != NULL) {
        add_debug_info_for_null_check(null_check_offset, op->info());
      }