From aff812ed4cfb1902577dbb9d3a14ec97230ae978 Mon Sep 17 00:00:00 2001 From: Richard Barnes Date: Fri, 19 Jan 2024 03:54:36 -0800 Subject: [PATCH] Fix shadowed variable in faiss/clone_index.cpp Summary: 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: dmm-fb Differential Revision: D52582793 fbshipit-source-id: 2941630671d99de39c19cfc5d24b2e27e495c171 --- faiss/clone_index.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/faiss/clone_index.cpp b/faiss/clone_index.cpp index 44ab1f7cc3..39de1a8208 100644 --- a/faiss/clone_index.cpp +++ b/faiss/clone_index.cpp @@ -63,9 +63,10 @@ Index* clone_index(const Index* index) { // assumes there is a copy constructor ready. Always try from most // specific to most general. Most indexes don't have complicated // structs, the default copy constructor often just works. -#define TRYCLONE(classname, obj) \ - if (const classname* clo = dynamic_cast(obj)) { \ - return new classname(*clo); \ +#define TRYCLONE(classname, obj) \ + if (const classname* clo##classname = \ + dynamic_cast(obj)) { \ + return new classname(*clo##classname); \ } else VectorTransform* Cloner::clone_VectorTransform(const VectorTransform* vt) {