summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndres Freund2018-05-02 02:53:48 +0000
committerAndres Freund2018-05-02 02:53:48 +0000
commit2993435dbae5deb8d2f6c2a715690a5aef4eddb8 (patch)
treeff55f5c155d366b72d2b354101305f5619d4934e
parentb2328bf62b6465236e318d31a011ced5dccfd580 (diff)
Further -Wimplicit-fallthrough cleanup.
Tom's earlier commit in 41c912cad159 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/[email protected]
-rw-r--r--src/backend/jit/llvm/llvmjit_expr.c11
-rw-r--r--src/interfaces/libpq/fe-secure.c3
2 files changed, 7 insertions, 7 deletions
diff --git a/src/backend/jit/llvm/llvmjit_expr.c b/src/backend/jit/llvm/llvmjit_expr.c
index c8ec4be852..36c5f7d500 100644
--- a/src/backend/jit/llvm/llvmjit_expr.c
+++ b/src/backend/jit/llvm/llvmjit_expr.c
@@ -672,7 +672,8 @@ llvm_compile_expr(ExprState *state)
LLVMPositionBuilderAtEnd(b, b_nonull);
}
- /* explicit fallthrough */
+ /* FALLTHROUGH */
+
case EEOP_FUNCEXPR:
{
FunctionCallInfo fcinfo = op->d.func.fcinfo_data;
@@ -709,8 +710,8 @@ llvm_compile_expr(ExprState *state)
l_ptr(TypeStorageBool));
LLVMBuildStore(b, l_sbool_const(0), v_boolanynullp);
- /* intentionally fall through */
}
+ /* FALLTHROUGH */
/*
* 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,
l_ptr(TypeStorageBool));
LLVMBuildStore(b, l_sbool_const(0), v_boolanynullp);
-
- /* intentionally fall through */
}
+ /* FALLTHROUGH */
/*
* Treat them the same for now, optimizer can remove
@@ -2083,9 +2083,8 @@ llvm_compile_expr(ExprState *state)
opblocks[op->d.agg_deserialize.jumpnull],
b_deserialize);
LLVMPositionBuilderAtEnd(b, b_deserialize);
-
- /* fallthrough */
}
+ /* FALLTHROUGH */
case EEOP_AGG_DESERIALIZE:
{
diff --git a/src/interfaces/libpq/fe-secure.c b/src/interfaces/libpq/fe-secure.c
index cfb77f6d85..f7dc249bf0 100644
--- a/src/interfaces/libpq/fe-secure.c
+++ b/src/interfaces/libpq/fe-secure.c
@@ -360,9 +360,10 @@ retry_masked:
case EPIPE:
/* Set flag for EPIPE */
REMEMBER_EPIPE(spinfo, true);
- /* FALL THRU */
#ifdef ECONNRESET
+ /* FALL THRU */
+
case ECONNRESET:
#endif
printfPQExpBuffer(&conn->errorMessage,