8211145: [ppc] [s390]: Build fails due to -Werror=switch (introduced with JDK-8211029)
Reviewed-by: shade, simonis
--- a/src/hotspot/cpu/ppc/c1_LIRGenerator_ppc.cpp Thu Sep 20 18:29:05 2018 +0100
+++ b/src/hotspot/cpu/ppc/c1_LIRGenerator_ppc.cpp Mon Oct 01 12:07:15 2018 +0200
@@ -535,8 +535,8 @@
case doubleTag: do_ArithmeticOp_FPU(x); return;
case longTag: do_ArithmeticOp_Long(x); return;
case intTag: do_ArithmeticOp_Int(x); return;
+ default: ShouldNotReachHere();
}
- ShouldNotReachHere();
}
@@ -735,39 +735,39 @@
break;
} // else fallthru
}
+ case vmIntrinsics::_dsin: // fall through
+ case vmIntrinsics::_dcos: // fall through
+ case vmIntrinsics::_dtan: // fall through
+ case vmIntrinsics::_dlog: // fall through
case vmIntrinsics::_dlog10: // fall through
- case vmIntrinsics::_dlog: // fall through
- case vmIntrinsics::_dsin: // fall through
- case vmIntrinsics::_dtan: // fall through
- case vmIntrinsics::_dcos: // fall through
case vmIntrinsics::_dexp: {
assert(x->number_of_arguments() == 1, "wrong type");
address runtime_entry = NULL;
switch (x->id()) {
- case vmIntrinsics::_dsqrt:
- runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dsqrt);
- break;
- case vmIntrinsics::_dsin:
- runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dsin);
- break;
- case vmIntrinsics::_dcos:
- runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dcos);
- break;
- case vmIntrinsics::_dtan:
- runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dtan);
- break;
- case vmIntrinsics::_dlog:
- runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dlog);
- break;
- case vmIntrinsics::_dlog10:
- runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dlog10);
- break;
- case vmIntrinsics::_dexp:
- runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dexp);
- break;
- default:
- ShouldNotReachHere();
+ case vmIntrinsics::_dsqrt:
+ runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dsqrt);
+ break;
+ case vmIntrinsics::_dsin:
+ runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dsin);
+ break;
+ case vmIntrinsics::_dcos:
+ runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dcos);
+ break;
+ case vmIntrinsics::_dtan:
+ runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dtan);
+ break;
+ case vmIntrinsics::_dlog:
+ runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dlog);
+ break;
+ case vmIntrinsics::_dlog10:
+ runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dlog10);
+ break;
+ case vmIntrinsics::_dexp:
+ runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dexp);
+ break;
+ default:
+ ShouldNotReachHere();
}
LIR_Opr result = call_runtime(x->argument_at(0), runtime_entry, x->type(), NULL);
@@ -781,6 +781,8 @@
set_result(x, result);
break;
}
+ default:
+ break;
}
}
--- a/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp Thu Sep 20 18:29:05 2018 +0100
+++ b/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp Mon Oct 01 12:07:15 2018 +0200
@@ -2236,8 +2236,10 @@
Bytecodes::Code code = bytecode();
switch (code) {
- case Bytecodes::_nofast_getfield: code = Bytecodes::_getfield; break;
- case Bytecodes::_nofast_putfield: code = Bytecodes::_putfield; break;
+ case Bytecodes::_nofast_getfield: code = Bytecodes::_getfield; break;
+ case Bytecodes::_nofast_putfield: code = Bytecodes::_putfield; break;
+ default:
+ break;
}
assert(byte_no == f1_byte || byte_no == f2_byte, "byte_no out of range");
--- a/src/hotspot/cpu/s390/assembler_s390.cpp Thu Sep 20 18:29:05 2018 +0100
+++ b/src/hotspot/cpu/s390/assembler_s390.cpp Mon Oct 01 12:07:15 2018 +0200
@@ -121,14 +121,14 @@
case bcondNotOrdered : inverse_cc = bcondOrdered; break; // 14
case bcondOrdered : inverse_cc = bcondNotOrdered; break; // 1
- case bcondEqual : inverse_cc = (branch_condition)(bcondNotEqual + bcondNotOrdered); break; // 8
- case bcondNotEqual + bcondNotOrdered : inverse_cc = bcondEqual; break; // 7
+ case bcondEqual : inverse_cc = bcondNotEqualOrNotOrdered; break; // 8
+ case bcondNotEqualOrNotOrdered : inverse_cc = bcondEqual; break; // 7
- case bcondLow + bcondNotOrdered : inverse_cc = (branch_condition)(bcondHigh + bcondEqual); break; // 5
- case bcondNotLow : inverse_cc = (branch_condition)(bcondLow + bcondNotOrdered); break; // 10
+ case bcondLowOrNotOrdered : inverse_cc = bcondNotLow; break; // 5
+ case bcondNotLow : inverse_cc = bcondLowOrNotOrdered; break; // 10
- case bcondHigh : inverse_cc = (branch_condition)(bcondLow + bcondNotOrdered + bcondEqual); break; // 2
- case bcondNotHigh + bcondNotOrdered : inverse_cc = bcondHigh; break; // 13
+ case bcondHigh : inverse_cc = bcondNotHighOrNotOrdered; break; // 2
+ case bcondNotHighOrNotOrdered : inverse_cc = bcondHigh; break; // 13
default :
fprintf(stderr, "inverse_float_condition(%d)\n", (int)cc);
--- a/src/hotspot/cpu/s390/assembler_s390.hpp Thu Sep 20 18:29:05 2018 +0100
+++ b/src/hotspot/cpu/s390/assembler_s390.hpp Mon Oct 01 12:07:15 2018 +0200
@@ -1442,8 +1442,11 @@
bcondNotPositive = bcondNotHigh,
bcondNotOrdered = 1, // float comparisons
bcondOrdered = 14, // float comparisons
- bcondLowOrNotOrdered = bcondLow|bcondNotOrdered, // float comparisons
- bcondHighOrNotOrdered = bcondHigh|bcondNotOrdered, // float comparisons
+ bcondLowOrNotOrdered = bcondLow | bcondNotOrdered, // float comparisons
+ bcondHighOrNotOrdered = bcondHigh | bcondNotOrdered, // float comparisons
+ bcondNotLowOrNotOrdered = bcondNotLow | bcondNotOrdered, // float comparisons
+ bcondNotHighOrNotOrdered = bcondNotHigh | bcondNotOrdered, // float comparisons
+ bcondNotEqualOrNotOrdered = bcondNotEqual | bcondNotOrdered, // float comparisons
// unsigned arithmetic calculation instructions
// Mask bit#0 is not used by these instructions.
// There is no indication of overflow for these instr.
--- a/src/hotspot/cpu/s390/c1_LIRGenerator_s390.cpp Thu Sep 20 18:29:05 2018 +0100
+++ b/src/hotspot/cpu/s390/c1_LIRGenerator_s390.cpp Mon Oct 01 12:07:15 2018 +0200
@@ -529,8 +529,9 @@
case doubleTag: do_ArithmeticOp_FPU(x); return;
case longTag: do_ArithmeticOp_Long(x); return;
case intTag: do_ArithmeticOp_Int(x); return;
+ default:
+ ShouldNotReachHere();
}
- ShouldNotReachHere();
}
// _ishl, _lshl, _ishr, _lshr, _iushr, _lushr
@@ -634,47 +635,49 @@
LIR_Opr dst = rlock_result(x);
switch (x->id()) {
- case vmIntrinsics::_dsqrt: {
- __ sqrt(value.result(), dst, LIR_OprFact::illegalOpr);
- break;
- }
- case vmIntrinsics::_dabs: {
- __ abs(value.result(), dst, LIR_OprFact::illegalOpr);
- break;
- }
+ case vmIntrinsics::_dsqrt: {
+ __ sqrt(value.result(), dst, LIR_OprFact::illegalOpr);
+ break;
+ }
+ case vmIntrinsics::_dabs: {
+ __ abs(value.result(), dst, LIR_OprFact::illegalOpr);
+ break;
+ }
+ default:
+ ShouldNotReachHere();
}
break;
}
+ case vmIntrinsics::_dsin: // fall through
+ case vmIntrinsics::_dcos: // fall through
+ case vmIntrinsics::_dtan: // fall through
+ case vmIntrinsics::_dlog: // fall through
case vmIntrinsics::_dlog10: // fall through
- case vmIntrinsics::_dlog: // fall through
- case vmIntrinsics::_dsin: // fall through
- case vmIntrinsics::_dtan: // fall through
- case vmIntrinsics::_dcos: // fall through
case vmIntrinsics::_dexp: {
assert(x->number_of_arguments() == 1, "wrong type");
address runtime_entry = NULL;
switch (x->id()) {
- case vmIntrinsics::_dsin:
- runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dsin);
- break;
- case vmIntrinsics::_dcos:
- runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dcos);
- break;
- case vmIntrinsics::_dtan:
- runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dtan);
- break;
- case vmIntrinsics::_dlog:
- runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dlog);
- break;
- case vmIntrinsics::_dlog10:
- runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dlog10);
- break;
- case vmIntrinsics::_dexp:
- runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dexp);
- break;
- default:
- ShouldNotReachHere();
+ case vmIntrinsics::_dsin:
+ runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dsin);
+ break;
+ case vmIntrinsics::_dcos:
+ runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dcos);
+ break;
+ case vmIntrinsics::_dtan:
+ runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dtan);
+ break;
+ case vmIntrinsics::_dlog:
+ runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dlog);
+ break;
+ case vmIntrinsics::_dlog10:
+ runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dlog10);
+ break;
+ case vmIntrinsics::_dexp:
+ runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dexp);
+ break;
+ default:
+ ShouldNotReachHere();
}
LIR_Opr result = call_runtime(x->argument_at(0), runtime_entry, x->type(), NULL);
@@ -688,6 +691,8 @@
set_result(x, result);
break;
}
+ default:
+ break;
}
}
--- a/src/hotspot/cpu/s390/sharedRuntime_s390.cpp Thu Sep 20 18:29:05 2018 +0100
+++ b/src/hotspot/cpu/s390/sharedRuntime_s390.cpp Mon Oct 01 12:07:15 2018 +0200
@@ -587,6 +587,9 @@
case T_DOUBLE:
__ freg2mem_opt(Z_FRET, memaddr);
break;
+ default:
+ ShouldNotReachHere();
+ break;
}
}
@@ -616,6 +619,9 @@
case T_DOUBLE:
__ mem2freg_opt(Z_FRET, memaddr);
break;
+ default:
+ ShouldNotReachHere();
+ break;
}
}
--- a/src/hotspot/cpu/s390/templateTable_s390.cpp Thu Sep 20 18:29:05 2018 +0100
+++ b/src/hotspot/cpu/s390/templateTable_s390.cpp Mon Oct 01 12:07:15 2018 +0200
@@ -2417,6 +2417,8 @@
switch (code) {
case Bytecodes::_nofast_getfield: code = Bytecodes::_getfield; break;
case Bytecodes::_nofast_putfield: code = Bytecodes::_putfield; break;
+ default:
+ break;
}
{
@@ -3213,6 +3215,8 @@
case Bytecodes::_fast_lputfield:
__ pop_l(Z_tos);
break;
+ default:
+ break;
}
__ bind(exit);