commit ceb6214a556a147deaea561c3dc72d45586ec1fa
author Ethan Nicholas <ethannicholas@google.com> Fri Oct 09 16:51:18 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Oct 12 14:29:37 2020 +0000
tree 15aa0d157136a8a8343b5351e1404c40209679b7
parent c67948d2c005c020b2b2ec833ef6e0afb78b8bee

moved SkSL InlineMarker and UnresolvedFunction data into IRNode

Change-Id: I05b940c69b7756d41277626fc3eef06003d133c1
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/324886
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

src/sksl/SkSLInliner.cpp

diff --git a/src/sksl/SkSLInliner.cpp b/src/sksl/SkSLInliner.cpp
index 42b86bb..babd1e8 100644
--- a/src/sksl/SkSLInliner.cpp
+++ b/src/sksl/SkSLInliner.cpp
@@ -178,7 +178,8 @@
         }
 
         bool visitStatement(const Statement& stmt) override {
-            if (stmt.is<InlineMarker>() && stmt.as<InlineMarker>().fFuncDecl->matches(*fFuncDecl)) {
+            if (stmt.is<InlineMarker>() &&
+                stmt.as<InlineMarker>().function().matches(*fFuncDecl)) {
                 return true;
             }
             return INHERITED::visitStatement(stmt);
@@ -609,7 +610,7 @@
                                    arguments.size() + // Function arguments (copy out-params back)
                                    1);                // Inlined code (Block or do-while loop)
 
-    inlinedBody.children().push_back(std::make_unique<InlineMarker>(call->function()));
+    inlinedBody.children().push_back(std::make_unique<InlineMarker>(&call->function()));
 
     auto makeInlineVar =
             [&](const String& baseName, const Type* type, Modifiers modifiers,