Enable "-Wshadow-field".

BUILD.gn

@@ -140,6 +140,7 @@ config("extra_warnings") {
       "-Wextra-semi-stmt",
       "-Wfloat-conversion",
       "-Wnon-virtual-dtor",
+      "-Wshadow-field",
       "-Wtautological-type-limit-compare",
       "-Wunneeded-internal-declaration",
 

src/common/debug.h

@@ -368,4 +368,13 @@ std::ostream &FmtHex(std::ostream &os, T value)
 #    define ANGLE_REENABLE_EXTRA_SEMI_WARNING
 #endif
 
+#if defined(__clang__)
+#    define ANGLE_DISABLE_SHADOWING_WARNING \
+        _Pragma("clang diagnostic push") _Pragma("clang diagnostic ignored \"-Wshadow-field\"")
+#    define ANGLE_REENABLE_SHADOWING_WARNING _Pragma("clang diagnostic pop")
+#else
+#    define ANGLE_DISABLE_SHADOWING_WARNING
+#    define ANGLE_REENABLE_SHADOWING_WARNING
+#endif
+
 #endif  // COMMON_DEBUG_H_

src/compiler/translator/tree_util/IntermTraverse.cpp

@@ -577,11 +577,11 @@ void TIntermTraverser::queueReplacementWithParent(TIntermNode *parent,
     mReplacements.push_back(NodeUpdateEntry(parent, original, replacement, originalBecomesChild));
 }
 
-TLValueTrackingTraverser::TLValueTrackingTraverser(bool preVisit,
-                                                   bool inVisit,
-                                                   bool postVisit,
+TLValueTrackingTraverser::TLValueTrackingTraverser(bool preVisitIn,
+                                                   bool inVisitIn,
+                                                   bool postVisitIn,
                                                    TSymbolTable *symbolTable)
-    : TIntermTraverser(preVisit, inVisit, postVisit, symbolTable),
+    : TIntermTraverser(preVisitIn, inVisitIn, postVisitIn, symbolTable),
       mOperatorRequiresLValue(false),
       mInFunctionCallOutParameter(false)
 {

src/compiler/translator/tree_util/IntermTraverse.h

@@ -35,9 +35,9 @@ class TIntermTraverser : angle::NonCopyable
 {
   public:
     POOL_ALLOCATOR_NEW_DELETE
-    TIntermTraverser(bool preVisit,
-                     bool inVisit,
-                     bool postVisit,
+    TIntermTraverser(bool preVisitIn,
+                     bool inVisitIn,
+                     bool postVisitIn,
                      TSymbolTable *symbolTable = nullptr);
     virtual ~TIntermTraverser();
 

src/compiler/translator/tree_util/ReplaceShadowingVariables.cpp

@@ -45,10 +45,7 @@ class ReplaceShadowingVariablesTraverser : public TIntermTraverser
 {
   public:
     ReplaceShadowingVariablesTraverser(TSymbolTable *symbolTable)
-        : TIntermTraverser(true, true, true),
-          mSymbolTable(symbolTable),
-          mParameterNames{},
-          mFunctionBody(nullptr)
+        : TIntermTraverser(true, true, true, symbolTable), mParameterNames{}, mFunctionBody(nullptr)
     {}
 
     bool visitFunctionDefinition(Visit visit, TIntermFunctionDefinition *node) override
@@ -121,7 +118,6 @@ class ReplaceShadowingVariablesTraverser : public TIntermTraverser
     }
 
   private:
-    TSymbolTable *mSymbolTable;
     std::unordered_set<std::string> mParameterNames;
     TIntermBlock *mFunctionBody;
     std::vector<DeferredReplacementBlock> mReplacements;

src/libANGLE/Program.h

@@ -244,8 +244,8 @@ struct SamplerBinding
 // elements specified by 'arrayIndex' can set to be enabled.
 struct TransformFeedbackVarying : public sh::ShaderVariable
 {
-    TransformFeedbackVarying(const sh::ShaderVariable &varyingIn, GLuint index)
-        : sh::ShaderVariable(varyingIn), arrayIndex(index)
+    TransformFeedbackVarying(const sh::ShaderVariable &varyingIn, GLuint arrayIndexIn)
+        : sh::ShaderVariable(varyingIn), arrayIndex(arrayIndexIn)
     {
         ASSERT(!isArrayOfArrays());
     }

src/libANGLE/renderer/d3d/ProgramD3D.cpp

@@ -873,7 +873,7 @@ class ProgramD3D::LoadBinaryTask : public ProgramD3D::GetExecutableTask
 {
   public:
     LoadBinaryTask(ProgramD3D *program, gl::BinaryInputStream *stream, gl::InfoLog &infoLog)
-        : ProgramD3D::GetExecutableTask(program), mProgram(program), mInfoLog(infoLog)
+        : ProgramD3D::GetExecutableTask(program)
     {
         ASSERT(mProgram);
         ASSERT(stream);
@@ -901,9 +901,6 @@ class ProgramD3D::LoadBinaryTask : public ProgramD3D::GetExecutableTask
     }
 
   private:
-    ProgramD3D *mProgram;
-    gl::InfoLog &mInfoLog;
-
     bool mDataCopySucceeded;
     angle::MemoryBuffer mStreamData;
 };
@@ -1903,7 +1900,7 @@ std::unique_ptr<LinkEvent> ProgramD3D::compileProgramExecutables(const gl::Conte
     auto pixelTask    = std::make_shared<GetPixelExecutableTask>(this);
     auto geometryTask = std::make_shared<GetGeometryExecutableTask>(this, context->getState());
     bool useGS        = usesGeometryShader(context->getState(), gl::PrimitiveMode::Points);
-    gl::Shader *vertexShader = mState.getAttachedShader(gl::ShaderType::Vertex);
+    gl::Shader *vertexShader         = mState.getAttachedShader(gl::ShaderType::Vertex);
     gl::Shader *fragmentShader       = mState.getAttachedShader(gl::ShaderType::Fragment);
     const ShaderD3D *vertexShaderD3D = vertexShader ? GetImplAs<ShaderD3D>(vertexShader) : nullptr;
     const ShaderD3D *fragmentShaderD3D =

src/libANGLE/renderer/gl/egl/ContextEGL.cpp

@@ -11,13 +11,13 @@ namespace rx
 ContextEGL::ContextEGL(const gl::State &state,
                        gl::ErrorSet *errorSet,
                        const std::shared_ptr<RendererEGL> &renderer)
-    : ContextGL(state, errorSet, renderer), mRenderer(renderer)
+    : ContextGL(state, errorSet, renderer), mRendererEGL(renderer)
 {}
 
 ContextEGL::~ContextEGL() {}
 
 EGLContext ContextEGL::getContext() const
 {
-    return mRenderer->getContext();
+    return mRendererEGL->getContext();
 }
 }  // namespace rx

src/libANGLE/renderer/gl/egl/ContextEGL.h

@@ -25,7 +25,7 @@ class ContextEGL : public ContextGL
     EGLContext getContext() const;
 
   private:
-    std::shared_ptr<RendererEGL> mRenderer;
+    std::shared_ptr<RendererEGL> mRendererEGL;
 };
 }  // namespace rx
 

src/libANGLE/renderer/gl/wgl/ContextWGL.cpp

@@ -11,13 +11,13 @@ namespace rx
 ContextWGL::ContextWGL(const gl::State &state,
                        gl::ErrorSet *errorSet,
                        const std::shared_ptr<RendererWGL> &renderer)
-    : ContextGL(state, errorSet, renderer), mRenderer(renderer)
+    : ContextGL(state, errorSet, renderer), mRendererWGL(renderer)
 {}
 
 ContextWGL::~ContextWGL() {}
 
 HGLRC ContextWGL::getContext() const
 {
-    return mRenderer->getContext();
+    return mRendererWGL->getContext();
 }
 }  // namespace rx

src/libANGLE/renderer/gl/wgl/ContextWGL.h

@@ -25,7 +25,7 @@ class ContextWGL : public ContextGL
     HGLRC getContext() const;
 
   private:
-    std::shared_ptr<RendererWGL> mRenderer;
+    std::shared_ptr<RendererWGL> mRendererWGL;
 };
 }  // namespace rx
 

src/libANGLE/renderer/glslang_wrapper_utils.cpp

@@ -10,6 +10,7 @@
 
 // glslang has issues with some specific warnings.
 ANGLE_DISABLE_EXTRA_SEMI_WARNING
+ANGLE_DISABLE_SHADOWING_WARNING
 
 // glslang's version of ShaderLang.h, not to be confused with ANGLE's.
 #include <glslang/Public/ShaderLang.h>
@@ -18,6 +19,7 @@ ANGLE_DISABLE_EXTRA_SEMI_WARNING
 #include <SPIRV/GlslangToSpv.h>
 #include <StandAlone/ResourceLimits.h>
 
+ANGLE_REENABLE_SHADOWING_WARNING
 ANGLE_REENABLE_EXTRA_SEMI_WARNING
 
 #include <array>