I haven't looked into a fix for this, but it should be easy to implement and hopefully uncontroversial.

Relavant bug: #8102 (comment)

TODO:

• univalue shadowing fix (merged, synced to our tree )
• serialize.h and nVersion, nType collisions (Do not shadow member variables in serialization #8468 Various serialization simplifcations and optimizations #9039 )
• LOCK inside LOCKshadowing (using __COUNTER__ for LOCK macro) (Do not shadow LOCK's criticalblock variable for LOCK inside LOCK #8472)
• other misc source fixes
• enabling -Wshadow (Enable -Wshadow by default #8794)
• document -Wshadow and add developer notes about it (Enable -Wshadow by default #8794)
• leveldb shadowing fix ? (Reuse previously declared local variable to prevent -Wshadow warnings google/leveldb#378, but fixed by other changes there.)
• GCC Set Do not shadow variables (gcc set) #8808