Merge remote-tracking branch 'aosp/upstream'android-o-mr1-iot-release-smart-display-r3oreo-mr1-1.2-iot-release

* aosp/upstream:
  Mark fallthrough cases with [[clang::fallthrough]]

Test: treehugger
Change-Id: I3e9cac7a16e992e970719f98fd65ed4c0b6e18d8

2 files changed, 6 insertions, 2 deletions

diff --git a/func.cc b/func.cc
index bc3e57f..8131e4b 100644
--- a/func.cc
+++ b/func.cc
@@ -64,7 +64,9 @@ void StripShellComment(string* cmd) {
             in++;
           break;
         }
-        /* FALLTHRU */
+#if defined(__has_cpp_attribute) && __has_cpp_attribute(clang::fallthrough)
+	[[clang::fallthrough]];
+#endif
 
       case '\'':
       case '"':
diff --git a/ninja.cc b/ninja.cc
index fb42444..0b87d5c 100644
--- a/ninja.cc
+++ b/ninja.cc
@@ -530,7 +530,9 @@ class NinjaGenerator {
         case ':':
         case ' ':
           r += '$';
-        // fall through.
+#if defined(__has_cpp_attribute) && __has_cpp_attribute(clang::fallthrough)
+          [[clang::fallthrough]];
+#endif
         default:
           r += c;
       }