Further -Wimplicit-fallthrough cleanup.

anarazel · anarazel · commit 2993435dbae5 · 2018-05-01T19:53:48.000-07:00
Tom's earlier commit in 41c912c 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
diff --git 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
@@ -360,9 +360,10 @@ pqsecure_raw_write(PGconn *conn, const void *ptr, size_t len)
 			case EPIPE:
 				/* Set flag for EPIPE */
 				REMEMBER_EPIPE(spinfo, true);
-				/* FALL THRU */
 
 #ifdef ECONNRESET
+				/* FALL THRU */
+
 			case ECONNRESET:
 #endif
 				printfPQExpBuffer(&conn->errorMessage,

Original file line number	Diff line number	Diff line change
`@@ -672,7 +672,8 @@ llvm_compile_expr(ExprState *state)`
`672`	`672`
`673`	`673`	`LLVMPositionBuilderAtEnd(b, b_nonull);`
`674`	`674`	`}`
`675`		`- /* explicit fallthrough */`
	`675`	`+ /* FALLTHROUGH */`
	`676`	`+`
`676`	`677`	`case EEOP_FUNCEXPR:`
`677`	`678`	`{`
`678`	`679`	`FunctionCallInfo fcinfo = op->d.func.fcinfo_data;`
`@@ -709,8 +710,8 @@ llvm_compile_expr(ExprState *state)`
`709`	`710`	`l_ptr(TypeStorageBool));`
`710`	`711`	`LLVMBuildStore(b, l_sbool_const(0), v_boolanynullp);`
`711`	`712`
`712`		`- /* intentionally fall through */`
`713`	`713`	`}`
	`714`	`+ /* FALLTHROUGH */`
`714`	`715`
`715`	`716`	`/*`
`716`	`717`	`* Treat them the same for now, optimizer can remove`
`@@ -810,9 +811,8 @@ llvm_compile_expr(ExprState *state)`
`810`	`811`	`v_boolanynullp = l_ptr_const(op->d.boolexpr.anynull,`
`811`	`812`	`l_ptr(TypeStorageBool));`
`812`	`813`	`LLVMBuildStore(b, l_sbool_const(0), v_boolanynullp);`
`813`		`-`
`814`		`- /* intentionally fall through */`
`815`	`814`	`}`
	`815`	`+ /* FALLTHROUGH */`
`816`	`816`
`817`	`817`	`/*`
`818`	`818`	`* Treat them the same for now, optimizer can remove`
`@@ -2083,9 +2083,8 @@ llvm_compile_expr(ExprState *state)`
`2083`	`2083`	`opblocks[op->d.agg_deserialize.jumpnull],`
`2084`	`2084`	`b_deserialize);`
`2085`	`2085`	`LLVMPositionBuilderAtEnd(b, b_deserialize);`
`2086`		`-`
`2087`		`- /* fallthrough */`
`2088`	`2086`	`}`
	`2087`	`+ /* FALLTHROUGH */`
`2089`	`2088`
`2090`	`2089`	`case EEOP_AGG_DESERIALIZE:`
`2091`	`2090`	`{`