src/hotspot/cpu/riscv/interp_masm_riscv.cpp

@@ -1591,11 +1591,11 @@
        if (MethodData::profile_return()) {
          // We're right after the type profile for the last
          // argument. tmp is the number of cells left in the
          // CallTypeData/VirtualCallTypeData to reach its end. Non null
          // if there's a return to profile.
-         assert(ReturnTypeEntry::static_cell_count() < TypeStackSlotEntries::per_arg_count(), "can't move past ret type");
+         assert(SingleTypeEntry::static_cell_count() < TypeStackSlotEntries::per_arg_count(), "can't move past ret type");
          shadd(mdp, tmp, mdp, tmp, exact_log2(DataLayout::cell_size));
        }
        sd(mdp, Address(fp, frame::interpreter_frame_mdp_offset * wordSize));
      } else {
        assert(MethodData::profile_return(), "either profile call args or call ret");

@@ -1636,11 +1636,11 @@
        mv(t1, static_cast<int>(vmIntrinsics::_compiledLambdaForm));
        bne(t0, t1, profile_continue);
        bind(do_profile);
      }
  
-     Address mdo_ret_addr(mdp, -in_bytes(ReturnTypeEntry::size()));
+     Address mdo_ret_addr(mdp, -in_bytes(SingleTypeEntry::size()));
      mv(tmp, ret);
      profile_obj_type(tmp, mdo_ret_addr, t1);
  
      bind(profile_continue);
    }