commit dd33b3ea9063458be8758e9d0dd564f128107ede
author John Stiles <johnstiles@google.com> Wed Sep 30 13:20:10 2020 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Sep 30 13:20:20 2020 +0000
tree 5c71a1e15620028303096f656d2b27ea1a8db615
parent 55b69f543c0f7b5512ec71f5bb8ad782929e0a3c

Revert "moved SkSL ExpressionStatement's data into IRNode"

This reverts commit 6877f0bfdcac49c95ad0856cd0eb77d85c990aa4.

Reason for revert: 
../../src/sksl/SkSLDehydrator.cpp:423:31: error: no member named 'fExpression' in 'SkSL::ExpressionStatement'
                this->write(e.fExpression.get());


Original change's description:
> moved SkSL ExpressionStatement's data into IRNode
>
> Change-Id: I11b1662cd58b01fabba75dbbee40267a62c8b420
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/320639
> Reviewed-by: John Stiles <johnstiles@google.com>
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com

Change-Id: Id22b8a9c93e842b2775e11f5d4c173e25860b5d0
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/320824
Reviewed-by: John Stiles <johnstiles@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>

src/sksl/SkSLMetalCodeGenerator.cpp

diff --git a/src/sksl/SkSLMetalCodeGenerator.cpp b/src/sksl/SkSLMetalCodeGenerator.cpp
index a169144..8cd36f1 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>().expression(), kTopLevel_Precedence);
+            this->writeExpression(*s.as<ExpressionStatement>().fExpression, 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>().expression().get());
+            return this->requirements(s->as<ExpressionStatement>().fExpression.get());
         case Statement::Kind::kReturn: {
             const ReturnStatement& r = s->as<ReturnStatement>();
             return this->requirements(r.fExpression.get());