pw_build: Specify -Wshadow-all for Clang

GCC's `-Wshadow` is stricter than Clang's. Use `-Wshadow-all` in internal Clang builds. Disable it in a few places as needed. Fixes: b/346999138 Change-Id: I3647ce5f0c3d30e2615f9adadae026e401ab52ab Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/216033 Reviewed-by: Dave Roth <[email protected]> Pigweed-Auto-Submit: Wyatt Hepler <[email protected]> Lint: Lint 🤖 <[email protected]> Commit-Queue: Wyatt Hepler <[email protected]>
google · Aug 26, 2024 · 16e6c7a · 16e6c7a
1 parent c6e858e
commit 16e6c7a
Show file tree

Hide file tree

Showing 17 changed files with 71 additions and 58 deletions.
diff --git a/pw_build/BUILD.gn b/pw_build/BUILD.gn
@@ -189,7 +189,10 @@ config("extra_strict_warnings") {
 # This config MUST NOT be used downstream to allow for warnings to be
 # added in the future without breaking downstream.
 config("internal_strict_warnings") {
-  configs = [ ":internal_strict_warnings_core" ]
+  configs = [
+    ":internal_strict_warnings_core",
+    ":shadow_all",
+  ]
 }
 
 # Core flags from ":internal_strict_warnings" that are enabled throughout

diff --git a/pw_digital_io_linux/digital_io_cli.cc b/pw_digital_io_linux/digital_io_cli.cc
@@ -281,19 +281,19 @@ int main(int argc, char* argv[]) {
   pw::Status status;
   if (command == "get") {
     LinuxInputConfig config(
-        /* index= */ index,
-        /* polarity= */ polarity);
+        /* gpio_index= */ index,
+        /* gpio_polarity= */ polarity);
     status = GetInput(chip, config);
   } else if (command == "set") {
     LinuxOutputConfig config(
-        /* index= */ index,
-        /* polarity= */ polarity,
-        /* default_state= */ *set_value);
+        /* gpio_index= */ index,
+        /* gpio_polarity= */ polarity,
+        /* gpio_default_state= */ *set_value);
     status = SetOutput(chip, config);
   } else if (command == "watch") {
     LinuxInputConfig config(
-        /* index= */ index,
-        /* polarity= */ polarity);
+        /* gpio_index= */ index,
+        /* gpio_polarity= */ polarity);
     status = WatchInput(chip, config, trigger);
   }
 

diff --git a/pw_digital_io_linux/digital_io_test.cc b/pw_digital_io_linux/digital_io_test.cc
@@ -430,8 +430,8 @@ TEST_F(DigitalIoTest, DoInput) {
 
   auto& line = line0();
   LinuxInputConfig config(
-      /* index= */ 0,
-      /* polarity= */ Polarity::kActiveHigh);
+      /* gpio_index= */ 0,
+      /* gpio_polarity= */ Polarity::kActiveHigh);
 
   ASSERT_OK_AND_ASSIGN(auto input, chip.GetInputLine(config));
 
@@ -464,8 +464,8 @@ TEST_F(DigitalIoTest, DoInputInvert) {
 
   auto& line = line0();
   LinuxInputConfig config(
-      /* index= */ 0,
-      /* polarity= */ Polarity::kActiveLow);
+      /* gpio_index= */ 0,
+      /* gpio_polarity= */ Polarity::kActiveLow);
 
   ASSERT_OK_AND_ASSIGN(auto input, chip.GetInputLine(config));
 
@@ -498,9 +498,9 @@ TEST_F(DigitalIoTest, DoOutput) {
 
   auto& line = line1();
   LinuxOutputConfig config(
-      /* index= */ 1,
-      /* polarity= */ Polarity::kActiveHigh,
-      /* default_state= */ State::kActive);
+      /* gpio_index= */ 1,
+      /* gpio_polarity= */ Polarity::kActiveHigh,
+      /* gpio_default_state== */ State::kActive);
 
   ASSERT_OK_AND_ASSIGN(auto output, chip.GetOutputLine(config));
 
@@ -532,9 +532,9 @@ TEST_F(DigitalIoTest, DoOutputInvert) {
 
   auto& line = line1();
   LinuxOutputConfig config(
-      /* index= */ 1,
-      /* polarity= */ Polarity::kActiveLow,
-      /* default_state= */ State::kActive);
+      /* gpio_index= */ 1,
+      /* gpio_polarity= */ Polarity::kActiveLow,
+      /* gpio_default_state== */ State::kActive);
 
   ASSERT_OK_AND_ASSIGN(auto output, chip.GetOutputLine(config));
 
@@ -567,9 +567,9 @@ TEST_F(DigitalIoTest, OutputGetState) {
 
   auto& line = line1();
   LinuxOutputConfig config(
-      /* index= */ 1,
-      /* polarity= */ Polarity::kActiveHigh,
-      /* default_state= */ State::kInactive);
+      /* gpio_index= */ 1,
+      /* gpio_polarity= */ Polarity::kActiveHigh,
+      /* gpio_default_state== */ State::kInactive);
 
   ASSERT_OK_AND_ASSIGN(auto output, chip.GetOutputLine(config));
 
@@ -603,8 +603,8 @@ TEST_F(DigitalIoTest, DoInputInterruptsEnabledBefore) {
 
   auto& line = line0();
   LinuxInputConfig config(
-      /* index= */ 0,
-      /* polarity= */ Polarity::kActiveHigh);
+      /* gpio_index= */ 0,
+      /* gpio_polarity= */ Polarity::kActiveHigh);
 
   ASSERT_OK_AND_ASSIGN(auto input, chip.GetInterruptLine(config, notifier));
 
@@ -634,8 +634,8 @@ TEST_F(DigitalIoTest, DoInputInterruptsEnabledAfter) {
 
   auto& line = line0();
   LinuxInputConfig config(
-      /* index= */ 0,
-      /* polarity= */ Polarity::kActiveHigh);
+      /* gpio_index= */ 0,
+      /* gpio_polarity= */ Polarity::kActiveHigh);
 
   ASSERT_OK_AND_ASSIGN(auto input, chip.GetInterruptLine(config, notifier));
 
@@ -668,8 +668,8 @@ TEST_F(DigitalIoTest, DoInputInterruptsReadOne) {
 
   auto& line = line0();
   LinuxInputConfig config(
-      /* index= */ 0,
-      /* polarity= */ Polarity::kActiveHigh);
+      /* gpio_index= */ 0,
+      /* gpio_polarity= */ Polarity::kActiveHigh);
 
   ASSERT_OK_AND_ASSIGN(auto input, chip.GetInterruptLine(config, notifier));
 
@@ -715,8 +715,8 @@ TEST_F(DigitalIoTest, DoInputInterruptsThread) {
 
   auto& line = line0();
   LinuxInputConfig config(
-      /* index= */ 0,
-      /* polarity= */ Polarity::kActiveHigh);
+      /* gpio_index= */ 0,
+      /* gpio_polarity= */ Polarity::kActiveHigh);
 
   ASSERT_OK_AND_ASSIGN(auto input, chip.GetInterruptLine(config, notifier));
 

diff --git a/pw_digital_io_linux/examples/input.cc b/pw_digital_io_linux/examples/input.cc
@@ -28,8 +28,8 @@ pw::Status InputExample() {
 
   // Configure input line.
   LinuxInputConfig config(
-      /* index= */ 5,
-      /* polarity= */ Polarity::kActiveHigh);
+      /* gpio_index= */ 5,
+      /* gpio_polarity= */ Polarity::kActiveHigh);
   PW_TRY_ASSIGN(auto input, chip.GetInputLine(config));
   PW_TRY(input.Enable());
 

diff --git a/pw_digital_io_linux/examples/interrupt.cc b/pw_digital_io_linux/examples/interrupt.cc
@@ -41,8 +41,8 @@ pw::Status InterruptExample() {
 
   // Configure input line.
   LinuxInputConfig config(
-      /* index= */ 5,
-      /* polarity= */ Polarity::kActiveHigh);
+      /* gpio_index= */ 5,
+      /* gpio_polarity= */ Polarity::kActiveHigh);
   PW_TRY_ASSIGN(auto input, chip.GetInterruptLine(config, notifier));
 
   // Configure the interrupt handler.

diff --git a/pw_digital_io_linux/examples/output.cc b/pw_digital_io_linux/examples/output.cc
@@ -28,9 +28,9 @@ pw::Status OutputExample() {
   // Configure output line.
   // Set the polarity to active-low and default state to active.
   LinuxOutputConfig config(
-      /* index= */ 4,
-      /* polarity= */ Polarity::kActiveLow,
-      /* default_state= */ State::kActive);
+      /* gpio_index= */ 4,
+      /* gpio_polarity= */ Polarity::kActiveLow,
+      /* gpio_default_state== */ State::kActive);
   PW_TRY_ASSIGN(auto output, chip.GetOutputLine(config));
 
   // Enable the output pin. This pulls the pin to ground since the

diff --git a/pw_digital_io_linux/public/pw_digital_io_linux/digital_io.h b/pw_digital_io_linux/public/pw_digital_io_linux/digital_io.h
@@ -31,22 +31,25 @@ struct LinuxConfig {
   uint32_t index;
   Polarity polarity;
 
-  LinuxConfig(uint32_t index, Polarity polarity)
-      : index(index), polarity(polarity) {}
+  LinuxConfig(uint32_t gpio_index, Polarity gpio_polarity)
+      : index(gpio_index), polarity(gpio_polarity) {}
   uint32_t GetFlags() const;
 };
 
 struct LinuxInputConfig final : LinuxConfig {
-  LinuxInputConfig(uint32_t index, Polarity polarity)
-      : LinuxConfig(index, polarity) {}
+  LinuxInputConfig(uint32_t gpio_index, Polarity gpio_polarity)
+      : LinuxConfig(gpio_index, gpio_polarity) {}
   uint32_t GetFlags() const;
 };
 
 struct LinuxOutputConfig final : LinuxConfig {
   State default_state;
 
-  LinuxOutputConfig(uint32_t index, Polarity polarity, State default_state)
-      : LinuxConfig(index, polarity), default_state(default_state) {}
+  LinuxOutputConfig(uint32_t gpio_index,
+                    Polarity gpio_polarity,
+                    State gpio_default_state)
+      : LinuxConfig(gpio_index, gpio_polarity),
+        default_state(gpio_default_state) {}
   uint32_t GetFlags() const;
 };
 

diff --git a/pw_function/function_test.cc b/pw_function/function_test.cc
@@ -380,8 +380,7 @@ TEST(Function, CallbackDestroysTargetAfterBeingCalled) {
 
   int destroyed_count = 0;
   MoveOnlyDestructionCounter destruction_counter(&destroyed_count);
-  Callback<void()> cb = [destruction_counter =
-                             std::move(destruction_counter)]() {};
+  Callback<void()> cb = [counter = std::move(destruction_counter)]() {};
   EXPECT_EQ(destroyed_count, 0);
   cb();
   EXPECT_EQ(destroyed_count, 1);

diff --git a/pw_rpc/benchmark.cc b/pw_rpc/benchmark.cc
@@ -54,9 +54,9 @@ void BenchmarkService::BidirectionalEcho(
 
   auto captures = std::make_unique<Captures>(Captures{.self = this, .id = id});
   new_reader_writer.set_on_next(
-      [captures = std::move(captures)](ConstByteSpan request) {
-        auto& reader_writers = captures->self->reader_writers_;
-        auto rw_id = captures->id;
+      [context = std::move(captures)](ConstByteSpan request) {
+        auto& reader_writers = context->self->reader_writers_;
+        auto rw_id = context->id;
         auto reader_writer = reader_writers.find(rw_id);
         if (reader_writer == reader_writers.end()) {
           return;

diff --git a/pw_rpc/client_integration_test.cc b/pw_rpc/client_integration_test.cc
@@ -110,12 +110,12 @@ TEST(RawRpcIntegrationTest, DISABLED_OnNextOverwritesItsOwnCall) {
 
     // Chain together three calls. The first and third copy the string in normal
     // order, while the second copies the string in reverse order.
-    ctx.call = kServiceClient.BidirectionalEcho([&ctx](ConstByteSpan data) {
-      ctx.call = kServiceClient.BidirectionalEcho([&ctx](ConstByteSpan data) {
-        ctx.receiver.ReverseCopyStringPayload(data);
+    ctx.call = kServiceClient.BidirectionalEcho([&ctx](ConstByteSpan data_1) {
+      ctx.call = kServiceClient.BidirectionalEcho([&ctx](ConstByteSpan data_2) {
+        ctx.receiver.ReverseCopyStringPayload(data_2);
         ctx.call = kServiceClient.BidirectionalEcho(ctx.receiver.OnNext());
       });
-      ctx.receiver.CopyStringPayload(data);
+      ctx.receiver.CopyStringPayload(data_1);
     });
 
     ASSERT_EQ(OkStatus(), ctx.call.Write(pw::as_bytes(pw::span("Window"))));

diff --git a/pw_rpc/fuzz/engine.cc b/pw_rpc/fuzz/engine.cc
@@ -374,8 +374,8 @@ void Fuzzer::Run(const pw::Vector<uint32_t>& actions) {
       callback_iterator_ = callback_actions_.begin();
     } else {
       threads_.emplace_back(
-          [this, thread_id, actions = std::move(thread_actions)]() {
-            for (const auto& encoded : actions) {
+          [this, thread_id, actions_to_perform = std::move(thread_actions)]() {
+            for (const auto& encoded : actions_to_perform) {
               Action action(encoded);
               action.set_thread_id(thread_id);
               Perform(action);

diff --git a/pw_rpc_transport/public/pw_rpc_transport/hdlc_framing.h b/pw_rpc_transport/public/pw_rpc_transport/hdlc_framing.h
@@ -90,9 +90,9 @@ class HdlcRpcPacketDecoder
   Status Decode(ConstByteSpan buffer, OnRpcPacketDecodedCallback&& callback) {
     decoder_.Process(
         buffer,
-        [callback = std::move(callback)](Result<hdlc::Frame> hdlc_frame) {
+        [function = std::move(callback)](Result<hdlc::Frame> hdlc_frame) {
           if (hdlc_frame.ok()) {
-            callback(hdlc_frame->data());
+            function(hdlc_frame->data());
           }
         });
     return OkStatus();

diff --git a/pw_rpc_transport/rpc_integration_test.cc b/pw_rpc_transport/rpc_integration_test.cc
@@ -49,8 +49,8 @@ class TestService final
 
 template <size_t kMaxPacketSize, size_t kLocalEgressQueueSize>
 struct SocketRpcEndpoint {
-  explicit SocketRpcEndpoint(SocketRpcTransport<kMaxPacketSize>& transport)
-      : transport(transport),
+  explicit SocketRpcEndpoint(SocketRpcTransport<kMaxPacketSize>& rpc_transport)
+      : transport(rpc_transport),
         rpc_egress("tx", transport),
         tx_channels({rpc::Channel::Create<kTestChannelId>(&rpc_egress)}),
         rx_channels({ChannelEgress{kTestChannelId, local_egress}}),

diff --git a/pw_toolchain/cc/BUILD.bazel b/pw_toolchain/cc/BUILD.bazel
@@ -70,6 +70,9 @@ pw_cc_flag_set(
     flags = [
         "-Wswitch-enum",
         "-Wextra-semi",
+        # TODO: b/361229275 - Add -Wshadow-all, but for Clang only, since GCC
+        # does not support it.
+        # "-Wshadow-all",
     ] + select({
         "@platforms//os:windows": [],
         # TODO: b/243069432 - Enable pedantic warnings on Windows once passing.

diff --git a/third_party/fuchsia/BUILD.gn b/third_party/fuchsia/BUILD.gn
@@ -39,7 +39,10 @@ pw_test("function_tests") {
   defines = [ "EXPECT_NULL(arg)=EXPECT_EQ((arg), nullptr)" ]
 
   # This test does not build with strict warnings, so disable them.
-  remove_configs = [ "$dir_pw_build:strict_warnings" ]
+  remove_configs = [
+    "$dir_pw_build:internal_strict_warnings",
+    "$dir_pw_build:strict_warnings",
+  ]
 }
 
 group("stdcompat") {

diff --git a/third_party/fuzztest/BUILD.gn b/third_party/fuzztest/BUILD.gn
@@ -24,6 +24,7 @@ config("fuzztest_public_config") {
     "-Wno-shorten-64-to-32",
     "-Wno-unused-parameter",
     "-Wno-missing-field-initializers",
+    "-Wno-shadow-all",
   ]
   cflags_cc = [ "-Wno-extra-semi" ]
   if (dir_pw_third_party_fuzztest != "") {

diff --git a/third_party/googletest/BUILD.gn b/third_party/googletest/BUILD.gn
@@ -35,6 +35,7 @@ if (dir_pw_third_party_googletest != "") {
     cflags = [
       "-Wno-undef",
       "-Wno-conversion",
+      "-Wno-shadow-all",
       "-Wno-switch-enum",
     ]
   }