[C++ PATCH] refactor duplicate_decls