SapMachine #1502: Fix merge issue

RealCLanger · RealCLanger · commit 9f85395b43de · 2026-04-20T08:57:38.000+02:00
diff --git a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp
@@ -176,11 +176,6 @@ void LIR_Assembler::osr_entry() {
       // Restore.
       __ sub_const_optimized(OSR_buf, OSR_buf, locals_space);
     }
-
-    if (use_OSR_bias) {
-      // Restore.
-      __ sub_const_optimized(OSR_buf, OSR_buf, locals_space);
-    }
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -176,11 +176,6 @@ void LIR_Assembler::osr_entry() {`
`176`	`176`	`// Restore.`
`177`	`177`	`__ sub_const_optimized(OSR_buf, OSR_buf, locals_space);`
`178`	`178`	`}`
`179`		`-`
`180`		`- if (use_OSR_bias) {`
`181`		`- // Restore.`
`182`		`- __ sub_const_optimized(OSR_buf, OSR_buf, locals_space);`
`183`		`- }`
`184`	`179`	`}`
`185`	`180`	`}`
`186`	`181`