Eliminate -Wimplicit-fallthrough triggers

For each nontrivial `switch` fallthrough, either insert a missing `break` or annotate it as an intended fallthrough. This quashes -Wimplicit-fallthrough, which isn’t an error today but will be soon. Change on 2018/07/18 by bbaren <bbaren@google.com> ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=205158031
google · Jul 31, 2018 · 401ee7a · 401ee7a
1 parent d08db63
commit 401ee7a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/protobuf/runtime/src/com/google/protobuf/GeneratedMessage.mm b/protobuf/runtime/src/com/google/protobuf/GeneratedMessage.mm
@@ -1443,7 +1443,7 @@ static BOOL ReadMapEntryField(
       return stream->ReadRetainedNSString(&value->valueId);
     case ComGoogleProtobufDescriptors_FieldDescriptor_Type_Enum_GROUP:
       isGroup = YES;
-      // fall through.
+      FALLTHROUGH_INTENDED;
     case ComGoogleProtobufDescriptors_FieldDescriptor_Type_Enum_MESSAGE: {
       ComGoogleProtobufGeneratedMessage *newMsg = CGPNewMessage(field->valueType_);
       if (!(isGroup ?
@@ -1554,7 +1554,7 @@ static BOOL MergeExtensionValueFromStream(
       return YES;
     case ComGoogleProtobufDescriptors_FieldDescriptor_Type_Enum_GROUP:
       isGroup = YES;
-      // fall through.
+      FALLTHROUGH_INTENDED;
     case ComGoogleProtobufDescriptors_FieldDescriptor_Type_Enum_MESSAGE:
       {
         CGPDescriptor *fieldType = field->valueType_;
@@ -1806,7 +1806,7 @@ static BOOL MergeFieldFromStream(
       return YES;
     case ComGoogleProtobufDescriptors_FieldDescriptor_Type_Enum_GROUP:
       isGroup = YES;
-      // fall through.
+      FALLTHROUGH_INTENDED;
     case ComGoogleProtobufDescriptors_FieldDescriptor_Type_Enum_MESSAGE:
       {
         CGPDescriptor *fieldType = field->valueType_;

diff --git a/protobuf/runtime/src/com/google/protobuf/common.h b/protobuf/runtime/src/com/google/protobuf/common.h
@@ -46,4 +46,18 @@ typedef uint16_t uint16;
 typedef uint32_t uint32;
 typedef uint64_t uint64;
 
+#if defined(__clang__) && defined(__has_warning)
+#if __has_feature(cxx_attributes) && __has_warning("-Wimplicit-fallthrough")
+#define FALLTHROUGH_INTENDED [[clang::fallthrough]]
+#endif
+#elif defined(__GNUC__) && __GNUC__ >= 7
+#define FALLTHROUGH_INTENDED [[gnu::fallthrough]]
+#endif
+
+#ifndef FALLTHROUGH_INTENDED
+#define FALLTHROUGH_INTENDED \
+  do {                            \
+  } while (0)
+#endif
+
 #endif // __ComGoogleProtobufCommon_H__