8248816: C1: Fix signature mismatch of LIRGenerator::strengh_reduce_multiply

lewurm · mo-beck · luhenry · lewurm · commit d3776c7d30f2 · 2020-07-30T15:05:22.000+02:00
Co-authored-by: Monica Beckwith &lt;monica.beckwith@microsoft.com&gt;
Co-authored-by: Ludovic Henry &lt;luhenry@microsoft.com&gt;
Reviewed-by: aph
diff --git a/src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp
@@ -291,7 +291,7 @@ void LIRGenerator::cmp_reg_mem(LIR_Condition condition, LIR_Opr reg, LIR_Opr bas
 }
 
 
-bool LIRGenerator::strength_reduce_multiply(LIR_Opr left, int c, LIR_Opr result, LIR_Opr tmp) {
+bool LIRGenerator::strength_reduce_multiply(LIR_Opr left, jint c, LIR_Opr result, LIR_Opr tmp) {
 
   if (is_power_of_2(c - 1)) {
     __ shift_left(left, exact_log2(c - 1), tmp);
diff --git a/src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp b/src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp
@@ -326,7 +326,7 @@ void LIRGenerator::cmp_reg_mem(LIR_Condition condition, LIR_Opr reg, LIR_Opr bas
 }
 
 
-bool LIRGenerator::strength_reduce_multiply(LIR_Opr left, int c, LIR_Opr result, LIR_Opr tmp) {
+bool LIRGenerator::strength_reduce_multiply(LIR_Opr left, jint c, LIR_Opr result, LIR_Opr tmp) {
   assert(left != result, "should be different registers");
   if (is_power_of_2(c + 1)) {
     LIR_Address::Scale scale = (LIR_Address::Scale) log2_intptr(c + 1);
diff --git a/src/hotspot/cpu/ppc/c1_LIRGenerator_ppc.cpp b/src/hotspot/cpu/ppc/c1_LIRGenerator_ppc.cpp
@@ -290,7 +290,7 @@ void LIRGenerator::cmp_reg_mem(LIR_Condition condition, LIR_Opr reg, LIR_Opr bas
 }
 
 
-bool LIRGenerator::strength_reduce_multiply(LIR_Opr left, int c, LIR_Opr result, LIR_Opr tmp) {
+bool LIRGenerator::strength_reduce_multiply(LIR_Opr left, jint c, LIR_Opr result, LIR_Opr tmp) {
   assert(left != result, "should be different registers");
   if (is_power_of_2(c + 1)) {
     __ shift_left(left, log2_int(c + 1), result);
diff --git a/src/hotspot/cpu/s390/c1_LIRGenerator_s390.cpp b/src/hotspot/cpu/s390/c1_LIRGenerator_s390.cpp
@@ -224,7 +224,7 @@ void LIRGenerator::cmp_reg_mem(LIR_Condition condition, LIR_Opr reg, LIR_Opr bas
   __ cmp_reg_mem(condition, reg, new LIR_Address(base, disp, type), info);
 }
 
-bool LIRGenerator::strength_reduce_multiply(LIR_Opr left, int c, LIR_Opr result, LIR_Opr tmp) {
+bool LIRGenerator::strength_reduce_multiply(LIR_Opr left, jint c, LIR_Opr result, LIR_Opr tmp) {
   if (tmp->is_valid()) {
     if (is_power_of_2(c + 1)) {
       __ move(left, tmp);

Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ void LIRGenerator::cmp_reg_mem(LIR_Condition condition, LIR_Opr reg, LIR_Opr bas`
`291`	`291`	`}`
`292`	`292`
`293`	`293`
`294`		`-bool LIRGenerator::strength_reduce_multiply(LIR_Opr left, int c, LIR_Opr result, LIR_Opr tmp) {`
	`294`	`+bool LIRGenerator::strength_reduce_multiply(LIR_Opr left, jint c, LIR_Opr result, LIR_Opr tmp) {`
`295`	`295`
`296`	`296`	`if (is_power_of_2(c - 1)) {`
`297`	`297`	`__ shift_left(left, exact_log2(c - 1), tmp);`
Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,7 @@ void LIRGenerator::cmp_reg_mem(LIR_Condition condition, LIR_Opr reg, LIR_Opr bas`
`326`	`326`	`}`
`327`	`327`
`328`	`328`
`329`		`-bool LIRGenerator::strength_reduce_multiply(LIR_Opr left, int c, LIR_Opr result, LIR_Opr tmp) {`
	`329`	`+bool LIRGenerator::strength_reduce_multiply(LIR_Opr left, jint c, LIR_Opr result, LIR_Opr tmp) {`
`330`	`330`	`assert(left != result, "should be different registers");`
`331`	`331`	`if (is_power_of_2(c + 1)) {`
`332`	`332`	`LIR_Address::Scale scale = (LIR_Address::Scale) log2_intptr(c + 1);`
Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ void LIRGenerator::cmp_reg_mem(LIR_Condition condition, LIR_Opr reg, LIR_Opr bas`
`290`	`290`	`}`
`291`	`291`
`292`	`292`
`293`		`-bool LIRGenerator::strength_reduce_multiply(LIR_Opr left, int c, LIR_Opr result, LIR_Opr tmp) {`
	`293`	`+bool LIRGenerator::strength_reduce_multiply(LIR_Opr left, jint c, LIR_Opr result, LIR_Opr tmp) {`
`294`	`294`	`assert(left != result, "should be different registers");`
`295`	`295`	`if (is_power_of_2(c + 1)) {`
`296`	`296`	`__ shift_left(left, log2_int(c + 1), result);`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ void LIRGenerator::cmp_reg_mem(LIR_Condition condition, LIR_Opr reg, LIR_Opr bas`
`224`	`224`	`__ cmp_reg_mem(condition, reg, new LIR_Address(base, disp, type), info);`
`225`	`225`	`}`
`226`	`226`
`227`		`-bool LIRGenerator::strength_reduce_multiply(LIR_Opr left, int c, LIR_Opr result, LIR_Opr tmp) {`
	`227`	`+bool LIRGenerator::strength_reduce_multiply(LIR_Opr left, jint c, LIR_Opr result, LIR_Opr tmp) {`
`228`	`228`	`if (tmp->is_valid()) {`
`229`	`229`	`if (is_power_of_2(c + 1)) {`
`230`	`230`	`__ move(left, tmp);`