py, extmod: Introduce and use MP_FALLTHROUGH macro.

esmil · esmil · commit ccd92335a11f · 2020-10-22T11:53:16.000+02:00
Newer GCC versions are able to warn about switch cases that fall
through.  This is usually a sign of a forgotten break statement, but in
the few cases where a fall through is intended we annotate it with this
macro to avoid the warning.
diff --git a/extmod/moductypes.c b/extmod/moductypes.c
@@ -506,6 +506,7 @@ STATIC mp_obj_t uctypes_struct_attr_op(mp_obj_t self_in, qstr attr, mp_obj_t set
                 return mp_obj_new_bytearray_by_ref(uctypes_struct_agg_size(sub, self->flags, &dummy), self->addr + offset);
             }
             // Fall thru to return uctypes struct object
+            MP_FALLTHROUGH
         }
         case PTR: {
             mp_obj_uctypes_struct_t *o = m_new_obj(mp_obj_uctypes_struct_t);
@@ -627,7 +628,7 @@ STATIC mp_obj_t uctypes_struct_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
                     return mp_obj_new_int((mp_int_t)(uintptr_t)p);
                 }
             }
-        /* fallthru */
+            MP_FALLTHROUGH
 
         default:
             return MP_OBJ_NULL;      // op not supported
diff --git a/extmod/re1.5/compilecode.c b/extmod/re1.5/compilecode.c
@@ -29,6 +29,7 @@ static const char *_compilecode(const char *re, ByteProg *prog, int sizecode)
                 prog->len++;
                 break;
             }
+            MP_FALLTHROUGH
         default:
             term = PC;
             EMIT(PC++, Char);
diff --git a/extmod/re1.5/recursiveloop.c b/extmod/re1.5/recursiveloop.c
@@ -22,6 +22,7 @@ recursiveloop(char *pc, const char *sp, Subject *input, const char **subp, int n
 		case Char:
 			if(*sp != *pc++)
 				return 0;
+			MP_FALLTHROUGH
 		case Any:
 			sp++;
 			continue;
diff --git a/py/gc.c b/py/gc.c
@@ -298,7 +298,8 @@ STATIC void gc_sweep(void) {
                 #if MICROPY_PY_GC_COLLECT_RETVAL
                 MP_STATE_MEM(gc_collected)++;
                 #endif
-            // fall through to free the head
+                // fall through to free the head
+                MP_FALLTHROUGH
 
             case AT_TAIL:
                 if (free_tail) {
diff --git a/py/lexer.c b/py/lexer.c
@@ -346,7 +346,8 @@ STATIC void parse_string_literal(mp_lexer_t *lex, bool is_raw) {
                                 vstr_add_char(&lex->vstr, '\\');
                                 break;
                             }
-                        // Otherwise fall through.
+                            // Otherwise fall through.
+                            MP_FALLTHROUGH
                         case 'x': {
                             mp_uint_t num = 0;
                             if (!get_hex(lex, (c == 'x' ? 2 : c == 'u' ? 4 : 8), &num)) {
diff --git a/py/mpconfig.h b/py/mpconfig.h
@@ -1643,6 +1643,13 @@ typedef double mp_float_t;
 #endif
 #endif
 
+// Explicitly annotate switch case fall throughs
+#if defined(__GNUC__) && __GNUC__ >= 7
+#define MP_FALLTHROUGH __attribute__((fallthrough));
+#else
+#define MP_FALLTHROUGH
+#endif
+
 #ifndef MP_HTOBE16
 #if MP_ENDIANNESS_LITTLE
 #define MP_HTOBE16(x) ((uint16_t)((((x) & 0xff) << 8) | (((x) >> 8) & 0xff)))
diff --git a/py/objset.c b/py/objset.c
@@ -445,6 +445,7 @@ STATIC mp_obj_t set_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
                 }
                 return MP_OBJ_NEW_SMALL_INT(hash);
             }
+            MP_FALLTHROUGH
         #endif
         default:
             return MP_OBJ_NULL;      // op not supported

Original file line number	Diff line number	Diff line change
`@@ -506,6 +506,7 @@ STATIC mp_obj_t uctypes_struct_attr_op(mp_obj_t self_in, qstr attr, mp_obj_t set`
`506`	`506`	`return mp_obj_new_bytearray_by_ref(uctypes_struct_agg_size(sub, self->flags, &dummy), self->addr + offset);`
`507`	`507`	`}`
`508`	`508`	`// Fall thru to return uctypes struct object`
	`509`	`+ MP_FALLTHROUGH`
`509`	`510`	`}`
`510`	`511`	`case PTR: {`
`511`	`512`	`mp_obj_uctypes_struct_t *o = m_new_obj(mp_obj_uctypes_struct_t);`
`@@ -627,7 +628,7 @@ STATIC mp_obj_t uctypes_struct_unary_op(mp_unary_op_t op, mp_obj_t self_in) {`
`627`	`628`	`return mp_obj_new_int((mp_int_t)(uintptr_t)p);`
`628`	`629`	`}`
`629`	`630`	`}`
`630`		`- /* fallthru */`
	`631`	`+ MP_FALLTHROUGH`
`631`	`632`
`632`	`633`	`default:`
`633`	`634`	`return MP_OBJ_NULL; // op not supported`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ static const char _compilecode(const char re, ByteProg *prog, int sizecode)`
`29`	`29`	`prog->len++;`
`30`	`30`	`break;`
`31`	`31`	`}`
	`32`	`+ MP_FALLTHROUGH`
`32`	`33`	`default:`
`33`	`34`	`term = PC;`
`34`	`35`	`EMIT(PC++, Char);`
Original file line number	Diff line number	Diff line change
`@@ -445,6 +445,7 @@ STATIC mp_obj_t set_unary_op(mp_unary_op_t op, mp_obj_t self_in) {`
`445`	`445`	`}`
`446`	`446`	`return MP_OBJ_NEW_SMALL_INT(hash);`
`447`	`447`	`}`
	`448`	`+ MP_FALLTHROUGH`
`448`	`449`	`#endif`
`449`	`450`	`default:`
`450`	`451`	`return MP_OBJ_NULL; // op not supported`