Further -Wimplicit-fallthrough cleanup.

Tom's earlier commit in 41c912cad1 didn't update a few cases that
are only encountered with the non-standard --with-llvm config
flag. Additionally there's also one case that appears to be a
deficiency in gcc's (up to trunk as of a few days ago) detection of
"fallthrough" comments - changing the placement slightly fixes that.

Author: Andres Freund
Discussion: https://postgr.es/m/20180502003239.wfnqu7ekz7j7imm4@alap3.anarazel.de
This commit is contained in:
Andres Freund 2018-05-01 19:53:48 -07:00
parent b2328bf62b
commit 2993435dba
2 changed files with 7 additions and 7 deletions

View File

@ -672,7 +672,8 @@ llvm_compile_expr(ExprState *state)
LLVMPositionBuilderAtEnd(b, b_nonull); LLVMPositionBuilderAtEnd(b, b_nonull);
} }
/* explicit fallthrough */ /* FALLTHROUGH */
case EEOP_FUNCEXPR: case EEOP_FUNCEXPR:
{ {
FunctionCallInfo fcinfo = op->d.func.fcinfo_data; FunctionCallInfo fcinfo = op->d.func.fcinfo_data;
@ -709,8 +710,8 @@ llvm_compile_expr(ExprState *state)
l_ptr(TypeStorageBool)); l_ptr(TypeStorageBool));
LLVMBuildStore(b, l_sbool_const(0), v_boolanynullp); LLVMBuildStore(b, l_sbool_const(0), v_boolanynullp);
/* intentionally fall through */
} }
/* FALLTHROUGH */
/* /*
* Treat them the same for now, optimizer can remove * Treat them the same for now, optimizer can remove
@ -810,9 +811,8 @@ llvm_compile_expr(ExprState *state)
v_boolanynullp = l_ptr_const(op->d.boolexpr.anynull, v_boolanynullp = l_ptr_const(op->d.boolexpr.anynull,
l_ptr(TypeStorageBool)); l_ptr(TypeStorageBool));
LLVMBuildStore(b, l_sbool_const(0), v_boolanynullp); LLVMBuildStore(b, l_sbool_const(0), v_boolanynullp);
/* intentionally fall through */
} }
/* FALLTHROUGH */
/* /*
* Treat them the same for now, optimizer can remove * Treat them the same for now, optimizer can remove
@ -2083,9 +2083,8 @@ llvm_compile_expr(ExprState *state)
opblocks[op->d.agg_deserialize.jumpnull], opblocks[op->d.agg_deserialize.jumpnull],
b_deserialize); b_deserialize);
LLVMPositionBuilderAtEnd(b, b_deserialize); LLVMPositionBuilderAtEnd(b, b_deserialize);
/* fallthrough */
} }
/* FALLTHROUGH */
case EEOP_AGG_DESERIALIZE: case EEOP_AGG_DESERIALIZE:
{ {

View File

@ -360,9 +360,10 @@ retry_masked:
case EPIPE: case EPIPE:
/* Set flag for EPIPE */ /* Set flag for EPIPE */
REMEMBER_EPIPE(spinfo, true); REMEMBER_EPIPE(spinfo, true);
/* FALL THRU */
#ifdef ECONNRESET #ifdef ECONNRESET
/* FALL THRU */
case ECONNRESET: case ECONNRESET:
#endif #endif
printfPQExpBuffer(&conn->errorMessage, printfPQExpBuffer(&conn->errorMessage,