8257502: Builds fail with new warnings after JDK-8256254

shipilev · shipilev · commit eaf4db6b8b88 · 2020-12-01T13:51:35.000Z
Reviewed-by: jiefu, stuefe
diff --git a/src/hotspot/cpu/s390/sharedRuntime_s390.cpp b/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
@@ -920,7 +920,7 @@ static void gen_special_dispatch(MacroAssembler *masm,
     has_receiver = MethodHandles::ref_kind_has_receiver(ref_kind);
   } else {
     guarantee(special_dispatch == vmIntrinsics::_invokeBasic || special_dispatch == vmIntrinsics::_linkToNative,
-              "special_dispatch=%d", special_dispatch);
+              "special_dispatch=%d", vmIntrinsics::as_int(special_dispatch));
     has_receiver = true;
   }
 
diff --git a/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp b/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
@@ -1288,7 +1288,7 @@ static void gen_special_dispatch(MacroAssembler* masm,
   } else if (iid == vmIntrinsics::_invokeBasic) {
     has_receiver = true;
   } else {
-    fatal("unexpected intrinsic id %d", iid);
+    fatal("unexpected intrinsic id %d", vmIntrinsics::as_int(iid));
   }
 
   if (member_reg != noreg) {

Original file line number	Diff line number	Diff line change
`@@ -920,7 +920,7 @@ static void gen_special_dispatch(MacroAssembler *masm,`
`920`	`920`	`has_receiver = MethodHandles::ref_kind_has_receiver(ref_kind);`
`921`	`921`	`} else {`
`922`	`922`	`guarantee(special_dispatch == vmIntrinsics::_invokeBasic \|\| special_dispatch == vmIntrinsics::_linkToNative,`
`923`		`- "special_dispatch=%d", special_dispatch);`
	`923`	`+ "special_dispatch=%d", vmIntrinsics::as_int(special_dispatch));`
`924`	`924`	`has_receiver = true;`
`925`	`925`	`}`
`926`	`926`
Original file line number	Diff line number	Diff line change
`@@ -1288,7 +1288,7 @@ static void gen_special_dispatch(MacroAssembler* masm,`
`1288`	`1288`	`} else if (iid == vmIntrinsics::_invokeBasic) {`
`1289`	`1289`	`has_receiver = true;`
`1290`	`1290`	`} else {`
`1291`		`- fatal("unexpected intrinsic id %d", iid);`
	`1291`	`+ fatal("unexpected intrinsic id %d", vmIntrinsics::as_int(iid));`
`1292`	`1292`	`}`
`1293`	`1293`
`1294`	`1294`	`if (member_reg != noreg) {`