#8869 Backport of #8852 Fix DEBUG MESSAGE: receiver class disagrees with MemberName.clazz issue

Tue, 21 May 2019 20:45:26 +0800

author
zhaixiang
date
Tue, 21 May 2019 20:45:26 +0800
changeset 9575
e36885fe4ba4
parent 9574
35b891f92673
child 9576
1cee9b02d46f

#8869 Backport of #8852 Fix DEBUG MESSAGE: receiver class disagrees with MemberName.clazz issue
Reviewed-by: fujie, aoqi

src/cpu/mips/vm/macroAssembler_mips.cpp file | annotate | diff | comparison | revisions
     1.1 --- a/src/cpu/mips/vm/macroAssembler_mips.cpp	Tue Apr 09 14:04:58 2019 +0800
     1.2 +++ b/src/cpu/mips/vm/macroAssembler_mips.cpp	Tue May 21 20:45:26 2019 +0800
     1.3 @@ -3714,11 +3714,9 @@
     1.4                                                     Label* L_success,
     1.5                                                     Label* L_failure,
     1.6                                                     bool set_cond_codes) {
     1.7 -  assert_different_registers(sub_klass, super_klass, temp_reg);
     1.8 -  if (temp2_reg != noreg)
     1.9 -    assert_different_registers(sub_klass, super_klass, temp_reg, temp2_reg);
    1.10 -  else
    1.11 -    temp2_reg = T9;
    1.12 +  if (temp2_reg == noreg)
    1.13 +    temp2_reg = TSR;
    1.14 +  assert_different_registers(sub_klass, super_klass, temp_reg, temp2_reg);
    1.15  #define IS_A_TEMP(reg) ((reg) == temp_reg || (reg) == temp2_reg)
    1.16  
    1.17    Label L_fallthrough;

mercurial