Skip to content

Commit 3b56fdf

Browse files
r-barnesfacebook-github-bot
authored andcommitted
Fix shadowed variable in executorch/backends/apple/coreml/runtime/inmemoryfs/inmemory_filesystem.cpp (#6289)
Summary: Pull Request resolved: #6289 Our upcoming compiler upgrade will require us not to have shadowed variables. Such variables have a _high_ bug rate and reduce readability, so we would like to avoid them even if the compiler was not forcing us to do so. This codemod attempts to fix an instance of a shadowed variable. Please review with care: if it's failed the result will be a silent bug. **What's a shadowed variable?** Shadowed variables are variables in an inner scope with the same name as another variable in an outer scope. Having the same name for both variables might be semantically correct, but it can make the code confusing to read! It can also hide subtle bugs. This diff fixes such an issue by renaming the variable. - If you approve of this diff, please use the "Accept & Ship" button :-) Reviewed By: meyering Differential Revision: D64398725 fbshipit-source-id: 0f411311bb72eae9271dc0c636d0f3e78d559dc9
1 parent 2e67e3a commit 3b56fdf

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

backends/apple/coreml/runtime/inmemoryfs/inmemory_filesystem.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -253,11 +253,11 @@ bool write_directory_node(InMemoryDirectoryNode* node,
253253
return false;
254254
}
255255

256-
for (const auto& [_, node]: node->get_items()) {
257-
if (node.get()->isDirectory() && !recursive) {
256+
for (const auto& [_, node_2]: node->get_items()) {
257+
if (node_2.get()->isDirectory() && !recursive) {
258258
continue;
259259
}
260-
if (!write_node(node.get(), dir_path, recursive, error)) {
260+
if (!write_node(node_2.get(), dir_path, recursive, error)) {
261261
return false;
262262
}
263263
}
@@ -383,9 +383,9 @@ FlattenedInMemoryNode::unflatten(const std::vector<FlattenedInMemoryNode>& flatt
383383
case InMemoryFileSystem::InMemoryNode::Kind::Directory: {
384384
std::unordered_map<std::string, std::unique_ptr<InMemoryFileSystem::InMemoryNode>> items;
385385
items.reserve(flattened_node_metadata.child_name_to_indices_map.size());
386-
for (const auto& [name, index]: flattened_node_metadata.child_name_to_indices_map) {
387-
auto moveIt = std::make_move_iterator(nodes.begin() + index);
388-
items[name] = *moveIt;
386+
for (const auto& [name_2, index_2]: flattened_node_metadata.child_name_to_indices_map) {
387+
auto moveIt = std::make_move_iterator(nodes.begin() + index_2);
388+
items[name_2] = *moveIt;
389389
}
390390
auto directory_node =
391391
std::make_unique<InMemoryDirectoryNode>(std::move(name), std::move(attributes), std::move(items));

0 commit comments

Comments
 (0)