commit 628777c9edc6faf71ec31534ed660e818846a217
author John Stiles <johnstiles@google.com> Wed Aug 04 22:07:41 2021 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Thu Aug 05 21:39:12 2021 +0000
tree 3ec7244db40e2a16406d9b648388aef4e79f2b5b
parent 0e741e2dea688dce6f80a5c90fc0295938cd8eb6

Fix cases of variable shadowing in SkSL.

If we manage to fix all the existing cases of variable shadowing, we
could enable -Wshadow.

Change-Id: Ic582c59b9f7dfee2d7e90e50bfb36c57e958c673
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/436641
Auto-Submit: John Stiles <johnstiles@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>

src/sksl/codegen/SkSLMetalCodeGenerator.cpp

diff --git a/src/sksl/codegen/SkSLMetalCodeGenerator.cpp b/src/sksl/codegen/SkSLMetalCodeGenerator.cpp
index ce4e93f..c6d24e0 100644
--- a/src/sksl/codegen/SkSLMetalCodeGenerator.cpp
+++ b/src/sksl/codegen/SkSLMetalCodeGenerator.cpp
@@ -1751,14 +1751,14 @@
     }
     const StatementArray& block = stmt->as<Block>().children();
     for (int index = block.count(); index--; ) {
-        const Statement& stmt = *block[index];
-        if (stmt.is<ReturnStatement>()) {
+        stmt = block[index].get();
+        if (stmt->is<ReturnStatement>()) {
             return true;
         }
-        if (stmt.is<Block>()) {
-            return is_block_ending_with_return(&stmt);
+        if (stmt->is<Block>()) {
+            return is_block_ending_with_return(stmt);
         }
-        if (!stmt.is<Nop>()) {
+        if (!stmt->is<Nop>()) {
             break;
         }
     }