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/SkSLInliner.cpp

diff --git a/src/sksl/SkSLInliner.cpp b/src/sksl/SkSLInliner.cpp
index 623b9e7..9062d34 100644
--- a/src/sksl/SkSLInliner.cpp
+++ b/src/sksl/SkSLInliner.cpp
@@ -470,7 +470,7 @@
         }
         case Statement::Kind::kExpression: {
             const ExpressionStatement& e = statement.as<ExpressionStatement>();
-            return std::make_unique<ExpressionStatement>(expr(e.fExpression));
+            return std::make_unique<ExpressionStatement>(expr(e.expression()));
         }
         case Statement::Kind::kFor: {
             const ForStatement& f = statement.as<ForStatement>();
@@ -868,7 +868,7 @@
                 }
                 case Statement::Kind::kExpression: {
                     ExpressionStatement& expr = (*stmt)->as<ExpressionStatement>();
-                    this->visitExpression(&expr.fExpression);
+                    this->visitExpression(&expr.expression());
                     break;
                 }
                 case Statement::Kind::kFor: {