From c52a98dde5ecdbc62086c8624c2d1190d1d6737e Mon Sep 17 00:00:00 2001
From: Motomu Utsumi <motomuman@google.com>
Date: Fri, 21 Mar 2025 15:08:42 +0900
Subject: [PATCH] Add -Wshadow to bpf_cc_defaults

Test: m
Change-Id: I08899d0c1bbdb05c3a2ef7df4b0debe748c25d94
---
 Android.bp        | 1 +
 loader/Loader.cpp | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Android.bp b/Android.bp
index 023ab6f..fd5b5cf 100644
--- a/Android.bp
+++ b/Android.bp
@@ -48,6 +48,7 @@ cc_defaults {
         "-Werror=sometimes-uninitialized",
         "-Wextra",
         "-Wnullable-to-nonnull-conversion",
+        "-Wshadow",
         "-Wsign-compare",
         "-Wtautological-unsigned-zero-compare",
         "-Wthread-safety",
diff --git a/loader/Loader.cpp b/loader/Loader.cpp
index 89bdb80..940ce19 100644
--- a/loader/Loader.cpp
+++ b/loader/Loader.cpp
@@ -431,9 +431,9 @@ static int readCodeSections(ifstream& elfFile, vector<codeSection>& cs,
         vector<string> csSymNames;
         ret = getSectionSymNames(elfFile, oldName, csSymNames, STT_FUNC);
         if (ret || !csSymNames.size()) return ret;
-        for (size_t i = 0; i < progDefNames.size(); ++i) {
-            if (!progDefNames[i].compare(csSymNames[0] + "_def")) {
-                cs_temp.prog_def = pd[i];
+        for (size_t j = 0; j < progDefNames.size(); ++j) {
+            if (!progDefNames[j].compare(csSymNames[0] + "_def")) {
+                cs_temp.prog_def = pd[j];
                 break;
             }
         }