commit d503a5a00f228eebe18b08e37010185356e5d2a5
author Ethan Nicholas <ethannicholas@google.com> Wed Sep 30 09:29:55 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Sep 30 14:08:27 2020 +0000
tree 9d80980e493920beee5586b01771dcbd0368513e
parent 718ae76d5b56153f2e0b90e5ea188363c64d9f88

Revert "Revert "moved SkSL ExpressionStatement's data into IRNode""

This reverts commit dd33b3ea9063458be8758e9d0dd564f128107ede.

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

src/sksl/SkSLMetalCodeGenerator.cpp

diff --git a/src/sksl/SkSLMetalCodeGenerator.cpp b/src/sksl/SkSLMetalCodeGenerator.cpp
index 8cd36f1..a169144 100644
--- a/src/sksl/SkSLMetalCodeGenerator.cpp
+++ b/src/sksl/SkSLMetalCodeGenerator.cpp
@@ -1249,7 +1249,7 @@
             this->writeBlock(s.as<Block>());
             break;
         case Statement::Kind::kExpression:
-            this->writeExpression(*s.as<ExpressionStatement>().fExpression, kTopLevel_Precedence);
+            this->writeExpression(*s.as<ExpressionStatement>().expression(), kTopLevel_Precedence);
             this->write(";");
             break;
         case Statement::Kind::kReturn:
@@ -1796,7 +1796,7 @@
             return result;
         }
         case Statement::Kind::kExpression:
-            return this->requirements(s->as<ExpressionStatement>().fExpression.get());
+            return this->requirements(s->as<ExpressionStatement>().expression().get());
         case Statement::Kind::kReturn: {
             const ReturnStatement& r = s->as<ReturnStatement>();
             return this->requirements(r.fExpression.get());