Fix [-Wimplicit-fallthrough] warnings in Zend Engine

Girgias · Girgias · commit ca666976b705 · 2021-01-15T04:04:28.000Z
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/php-src.iml b/.idea/php-src.iml
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
@@ -884,6 +884,7 @@ static const char *zend_parse_arg_impl(zval *arg, va_list *va, const char **spec
 		case 'Z': /* replace with 'z' */
 		case 'L': /* replace with 'l' */
 			ZEND_ASSERT(0 && "ZPP modifier no longer supported");
+			fallthrough;
 		default:
 			return "unknown";
 	}
diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c
@@ -2013,7 +2013,7 @@ static ZEND_COLD void zend_ast_export_ex(smart_str *str, zend_ast *ast, int prio
 			break;
 		case ZEND_AST_PROP_ELEM:
 			smart_str_appendc(str, '$');
-			/* break missing intentionally */
+			fallthrough;
 		case ZEND_AST_CONST_ELEM:
 			zend_ast_export_name(str, ast->child[0], 0, indent);
 			APPEND_DEFAULT_VALUE(1);
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
@@ -528,7 +528,7 @@ ZEND_FUNCTION(define)
 				val = &val_free;
 				break;
 			}
-			/* no break */
+			fallthrough;
 		default:
 			zval_ptr_dtor(&val_free);
 			zend_argument_type_error(2, "cannot be an object, %s given", zend_zval_type_name(val));
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
@@ -298,7 +298,7 @@ static zend_never_inline ZEND_COLD zval *_get_zval_cv_lookup(zval *ptr, uint32_t
 			break;
 		case BP_VAR_RW:
 			zval_undefined_cv(var EXECUTE_DATA_CC);
-			/* break missing intentionally */
+			fallthrough;
 		case BP_VAR_W:
 			ZVAL_NULL(ptr);
 			break;
@@ -1374,6 +1374,7 @@ static zend_never_inline zend_long zend_check_string_offset(zval *dim, int type
 			}
 			case IS_UNDEF:
 				ZVAL_UNDEFINED_OP2();
+				fallthrough;
 			case IS_DOUBLE:
 			case IS_NULL:
 			case IS_FALSE:
@@ -2037,7 +2038,7 @@ static zend_never_inline zend_uchar slow_index_convert(HashTable *ht, const zval
 			if (EG(exception)) {
 				return IS_NULL;
 			}
-			/* break missing intentionally */
+			fallthrough;
 		}
 		case IS_NULL:
 			value->str = ZSTR_EMPTY_ALLOC();
@@ -2077,7 +2078,7 @@ static zend_always_inline zval *zend_fetch_dimension_address_inner(HashTable *ht
 		switch (type) {
 			case BP_VAR_R:
 				zend_undefined_offset(hval);
-				/* break missing intentionally */
+				fallthrough;
 			case BP_VAR_UNSET:
 			case BP_VAR_IS:
 				retval = &EG(uninitialized_zval);
@@ -2086,7 +2087,7 @@ static zend_always_inline zval *zend_fetch_dimension_address_inner(HashTable *ht
 				if (UNEXPECTED(zend_undefined_offset_write(ht, hval) == FAILURE)) {
 					return NULL;
 				}
-				/* break missing intentionally */
+				fallthrough;
 			case BP_VAR_W:
 				retval = zend_hash_index_add_new(ht, hval, &EG(uninitialized_zval));
 				break;
@@ -2104,7 +2105,7 @@ static zend_always_inline zval *zend_fetch_dimension_address_inner(HashTable *ht
 			switch (type) {
 				case BP_VAR_R:
 					zend_undefined_index(offset_key);
-					/* break missing intentionally */
+					fallthrough;
 				case BP_VAR_UNSET:
 				case BP_VAR_IS:
 					retval = &EG(uninitialized_zval);
@@ -2342,6 +2343,7 @@ static zend_always_inline void zend_fetch_dimension_address_read(zval *result, z
 				}
 				case IS_UNDEF:
 					ZVAL_UNDEFINED_OP2();
+					fallthrough;
 				case IS_DOUBLE:
 				case IS_NULL:
 				case IS_FALSE:
diff --git a/Zend/zend_highlight.c b/Zend/zend_highlight.c
@@ -184,7 +184,7 @@ ZEND_API void zend_strip(void)
 					zend_write(" ", sizeof(" ") - 1);
 					prev_space = 1;
 				}
-						/* lack of break; is intentional */
+				fallthrough;
 			case T_COMMENT:
 			case T_DOC_COMMENT:
 				ZVAL_UNDEF(&token);
diff --git a/Zend/zend_ini_scanner.l b/Zend/zend_ini_scanner.l
@@ -187,7 +187,7 @@ static void zend_ini_copy_typed_value(zval *retval, const int type, const char *
 			if (convert_to_number(retval, str, len) == SUCCESS) {
 				break;
 			}
-			/* intentional fall-through */
+			fallthrough;
 		default:
 			zend_ini_copy_value(retval, str, len);
 	}
@@ -329,6 +329,7 @@ static void zend_ini_escape_string(zval *lval, char *str, int len, char quote_ty
 						*t++ = *s;
 						break;
 					}
+					fallthrough;
 				case '\\':
 				case '$':
 					*t++ = *s;
@@ -607,7 +608,7 @@ end_raw_value_chars:
 				if (YYCURSOR < YYLIMIT && *YYCURSOR != '"') {
 					YYCURSOR++;
 				}
-				/* fall through */
+				fallthrough;
 			default:
 				continue;
 		}
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
@@ -992,6 +992,7 @@ static zend_result zend_scan_escape_string(zval *zendlval, char *str, int len, c
 						*t++ = *s;
 						break;
 					}
+					fallthrough;
 				case '\\':
 				case '$':
 					*t++ = *s;
@@ -2366,7 +2367,7 @@ inline_char_handler:
 					YYCURSOR--;
 					break;
 				}
-				/* fall through */
+				fallthrough;
 			default:
 				continue;
 		}
@@ -2549,7 +2550,7 @@ skip_escape_conversion:
 				if (YYCURSOR < YYLIMIT) {
 					YYCURSOR++;
 				}
-				/* fall through */
+				fallthrough;
 			default:
 				continue;
 		}
@@ -2786,7 +2787,7 @@ skip_escape_conversion:
 				if (YYCURSOR < YYLIMIT) {
 					YYCURSOR++;
 				}
-				/* fall through */
+				fallthrough;
 			default:
 				continue;
 		}
@@ -2833,7 +2834,7 @@ double_quotes_scan_done:
 				if (YYCURSOR < YYLIMIT) {
 					YYCURSOR++;
 				}
-				/* fall through */
+				fallthrough;
 			default:
 				continue;
 		}
@@ -2869,7 +2870,7 @@ double_quotes_scan_done:
 				if (*YYCURSOR == '\n') {
 					YYCURSOR++;
 				}
-				/* fall through */
+				fallthrough;
 			case '\n':
 				indentation = spacing = 0;
 
@@ -2939,7 +2940,7 @@ double_quotes_scan_done:
 				if (YYCURSOR < YYLIMIT && *YYCURSOR != '\n' && *YYCURSOR != '\r') {
 					YYCURSOR++;
 				}
-				/* fall through */
+				fallthrough;
 			default:
 				continue;
 		}
@@ -2993,7 +2994,7 @@ heredoc_scan_done:
 				if (*YYCURSOR == '\n') {
 					YYCURSOR++;
 				}
-				/* fall through */
+				fallthrough;
 			case '\n':
 				indentation = spacing = 0;
 
@@ -3044,7 +3045,7 @@ heredoc_scan_done:
 
 					goto nowdoc_scan_done;
 				}
-				/* fall through */
+				fallthrough;
 			default:
 				continue;
 		}
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
@@ -1782,7 +1782,7 @@ ZEND_API HashTable *zend_std_get_properties_for(zend_object *obj, zend_prop_purp
 				}
 				return ht;
 			}
-			/* break missing intentionally */
+			fallthrough;
 		case ZEND_PROP_PURPOSE_ARRAY_CAST:
 		case ZEND_PROP_PURPOSE_SERIALIZE:
 		case ZEND_PROP_PURPOSE_VAR_EXPORT:
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c
@@ -704,7 +704,7 @@ static void emit_live_range(
 				return;
 			}
 		}
-		/* explicit fallthrough */
+		fallthrough;
 		default:
 			start++;
 			kind = ZEND_LIVE_TMPVAR;
@@ -994,14 +994,14 @@ ZEND_API void pass_two(zend_op_array *op_array)
 				if (op_array->fn_flags & ZEND_ACC_HAS_FINALLY_BLOCK) {
 					zend_check_finally_breakout(op_array, opline - op_array->opcodes, opline->op1.opline_num);
 				}
-				/* break omitted intentionally */
+				fallthrough;
 			case ZEND_JMP:
 				ZEND_PASS_TWO_UPDATE_JMP_TARGET(op_array, opline, opline->op1);
 				break;
 			case ZEND_JMPZNZ:
 				/* absolute index to relative offset */
 				opline->extended_value = ZEND_OPLINE_NUM_TO_OFFSET(op_array, opline, opline->extended_value);
-				/* break omitted intentionally */
+				fallthrough;
 			case ZEND_JMPZ:
 			case ZEND_JMPNZ:
 			case ZEND_JMPZ_EX:
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
@@ -95,11 +95,11 @@ ZEND_API int ZEND_FASTCALL zend_atoi(const char *str, size_t str_len) /* {{{ */
 			case 'g':
 			case 'G':
 				retval *= 1024;
-				/* break intentionally missing */
+				fallthrough;
 			case 'm':
 			case 'M':
 				retval *= 1024;
-				/* break intentionally missing */
+				fallthrough;
 			case 'k':
 			case 'K':
 				retval *= 1024;
@@ -123,11 +123,11 @@ ZEND_API zend_long ZEND_FASTCALL zend_atol(const char *str, size_t str_len) /* {
 			case 'g':
 			case 'G':
 				retval *= 1024;
-				/* break intentionally missing */
+				fallthrough;
 			case 'm':
 			case 'M':
 				retval *= 1024;
-				/* break intentionally missing */
+				fallthrough;
 			case 'k':
 			case 'K':
 				retval *= 1024;
@@ -2455,7 +2455,7 @@ ZEND_API zend_result ZEND_FASTCALL increment_function(zval *op1) /* {{{ */
 					return SUCCESS;
 				}
 			}
-			/* break missing intentionally */
+			fallthrough;
 		case IS_RESOURCE:
 		case IS_ARRAY:
 			zend_type_error("Cannot increment %s", zend_zval_type_name(op1));
@@ -2517,7 +2517,7 @@ ZEND_API zend_result ZEND_FASTCALL decrement_function(zval *op1) /* {{{ */
 					return SUCCESS;
 				}
 			}
-			/* break missing intentionally */
+			fallthrough;
 		case IS_RESOURCE:
 		case IS_ARRAY:
 			zend_type_error("Cannot decrement %s", zend_zval_type_name(op1));
diff --git a/Zend/zend_strtod.c b/Zend/zend_strtod.c
@@ -1911,7 +1911,7 @@ gethex( CONST char **sp, U *rvp, int rounding, int sign)
 		switch(*++s) {
 		  case '-':
 			esign = 1;
-			/* no break */
+			fallthrough;
 		  case '+':
 			s++;
 		  }
@@ -2578,11 +2578,11 @@ zend_strtod
 	for(s = s00;;s++) switch(*s) {
 		case '-':
 			sign = 1;
-			/* no break */
+			fallthrough;
 		case '+':
 			if (*++s)
 				goto break2;
-			/* no break */
+			fallthrough;
 		case 0:
 			goto ret0;
 		case '\t':
@@ -2698,6 +2698,7 @@ zend_strtod
 		switch(c = *++s) {
 			case '-':
 				esign = 1;
+				fallthrough;
 			case '+':
 				c = *++s;
 			}
@@ -3952,15 +3953,15 @@ zend_dtoa
 			break;
 		case 2:
 			leftright = 0;
-			/* no break */
+			fallthrough;
 		case 4:
 			if (ndigits <= 0)
 				ndigits = 1;
 			ilim = ilim1 = i = ndigits;
 			break;
 		case 3:
 			leftright = 0;
-			/* no break */
+			fallthrough;
 		case 5:
 			i = ndigits + k + 1;
 			ilim = i;
diff --git a/Zend/zend_virtual_cwd.c b/Zend/zend_virtual_cwd.c
@@ -1673,7 +1673,7 @@ CWD_API FILE *virtual_popen(const char *command, const char *type) /* {{{ */
 				*ptr++ = '\'';
 				*ptr++ = '\\';
 				*ptr++ = '\'';
-				/* fall-through */
+				fallthrough;
 			default:
 				*ptr++ = *dir;
 			}
diff --git a/ext/session/tests/session_test_936e28c2e65332e2525cabe7864a6e66 b/ext/session/tests/session_test_936e28c2e65332e2525cabe7864a6e66
@@ -0,0 +1 @@
+Blah|s:12:"Hello World!";Foo|b:0;Guff|i:1234567890;Bar|s:3:"Foo";

Original file line number	Diff line number	Diff line change
`@@ -884,6 +884,7 @@ static const char zend_parse_arg_impl(zval arg, va_list va, const char *spec`
`884`	`884`	`case 'Z': /* replace with 'z' */`
`885`	`885`	`case 'L': /* replace with 'l' */`
`886`	`886`	`ZEND_ASSERT(0 && "ZPP modifier no longer supported");`
	`887`	`+ fallthrough;`
`887`	`888`	`default:`
`888`	`889`	`return "unknown";`
`889`	`890`	`}`
Original file line number	Diff line number	Diff line change
`@@ -528,7 +528,7 @@ ZEND_FUNCTION(define)`
`528`	`528`	`val = &val_free;`
`529`	`529`	`break;`
`530`	`530`	`}`
`531`		`- /* no break */`
	`531`	`+ fallthrough;`
`532`	`532`	`default:`
`533`	`533`	`zval_ptr_dtor(&val_free);`
`534`	`534`	`zend_argument_type_error(2, "cannot be an object, %s given", zend_zval_type_name(val));`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ ZEND_API void zend_strip(void)`
`184`	`184`	`zend_write(" ", sizeof(" ") - 1);`
`185`	`185`	`prev_space = 1;`
`186`	`186`	`}`
`187`		`- /* lack of break; is intentional */`
	`187`	`+ fallthrough;`
`188`	`188`	`case T_COMMENT:`
`189`	`189`	`case T_DOC_COMMENT:`
`190`	`190`	`ZVAL_UNDEF(&token);`