8304880: [PPC64] VerifyOops code in C1 doesn't work with ZGC

TheRealMDoerr · TheRealMDoerr · commit ac655ba08e73 · 2023-03-31T12:31:01.000Z
Reviewed-by: rrich
Backport-of: 695683b5b15c69a56fe7ee1a93482fe7c3530ca8
diff --git a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp
@@ -828,7 +828,6 @@ int LIR_Assembler::load(Register base, int offset, LIR_Opr to_reg, BasicType typ
           } else {
             __ ld(to_reg->as_register(), offset, base);
           }
-          __ verify_oop(to_reg->as_register(), FILE_AND_LINE);
           break;
         }
       case T_FLOAT:  __ lfs(to_reg->as_float_reg(), offset, base); break;
@@ -859,7 +858,6 @@ int LIR_Assembler::load(Register base, Register disp, LIR_Opr to_reg, BasicType
         } else {
           __ ldx(to_reg->as_register(), base, disp);
         }
-        __ verify_oop(to_reg->as_register(), FILE_AND_LINE);
         break;
       }
     case T_FLOAT:  __ lfsx(to_reg->as_float_reg() , base, disp); break;

Original file line number	Diff line number	Diff line change
`@@ -828,7 +828,6 @@ int LIR_Assembler::load(Register base, int offset, LIR_Opr to_reg, BasicType typ`
`828`	`828`	`} else {`
`829`	`829`	`__ ld(to_reg->as_register(), offset, base);`
`830`	`830`	`}`
`831`		`- __ verify_oop(to_reg->as_register(), FILE_AND_LINE);`
`832`	`831`	`break;`
`833`	`832`	`}`
`834`	`833`	`case T_FLOAT: __ lfs(to_reg->as_float_reg(), offset, base); break;`
`@@ -859,7 +858,6 @@ int LIR_Assembler::load(Register base, Register disp, LIR_Opr to_reg, BasicType`
`859`	`858`	`} else {`
`860`	`859`	`__ ldx(to_reg->as_register(), base, disp);`
`861`	`860`	`}`
`862`		`- __ verify_oop(to_reg->as_register(), FILE_AND_LINE);`
`863`	`861`	`break;`
`864`	`862`	`}`
`865`	`863`	`case T_FLOAT: __ lfsx(to_reg->as_float_reg() , base, disp); break;`