commit 98c1f820d21417d3a69c4187b14631c9cf97a2bc
author John Stiles <johnstiles@google.com> Wed Sep 09 14:18:53 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Sep 09 19:55:27 2020 +0000
tree 153987ae3c248fba5f10ca41983f2ec8b2776b3d
parent db16c4845f5feca61664dc52801b43cb4b6a92aa

Add a new statement type 'InlineMarker' to indicate inlined functions.

This will be leveraged in followup CLs to avoid recursive inlining death
spirals.

Change-Id: Icf99c88c4acaaa766e0dc0971830329e24d70509
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/315861
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>

src/sksl/SkSLInliner.cpp

diff --git a/src/sksl/SkSLInliner.cpp b/src/sksl/SkSLInliner.cpp
index a8f9484..064f753 100644
--- a/src/sksl/SkSLInliner.cpp
+++ b/src/sksl/SkSLInliner.cpp
@@ -33,6 +33,7 @@
 #include "src/sksl/ir/SkSLFunctionReference.h"
 #include "src/sksl/ir/SkSLIfStatement.h"
 #include "src/sksl/ir/SkSLIndexExpression.h"
+#include "src/sksl/ir/SkSLInlineMarker.h"
 #include "src/sksl/ir/SkSLIntLiteral.h"
 #include "src/sksl/ir/SkSLInterfaceBlock.h"
 #include "src/sksl/ir/SkSLLayout.h"
@@ -332,6 +333,7 @@
             return std::make_unique<IfStatement>(offset, i.fIsStatic, expr(i.fTest),
                                                  stmt(i.fIfTrue), stmt(i.fIfFalse));
         }
+        case Statement::Kind::kInlineMarker:
         case Statement::Kind::kNop:
             return statement.clone();
         case Statement::Kind::kReturn: {
@@ -442,7 +444,15 @@
                                                        std::vector<std::unique_ptr<Statement>>{},
                                                        /*symbols=*/nullptr,
                                                        /*isScope=*/false);
+
     std::vector<std::unique_ptr<Statement>>& inlinedBody = inlinedCall.fInlinedBody->fStatements;
+    inlinedBody.reserve(1 +                 // Inline marker
+                        1 +                 // Result variable
+                        arguments.size() +  // Function arguments (passing in)
+                        arguments.size() +  // Function arguments (copy out-parameters back)
+                        1);                 // Inlined code (either as a Block or do-while loop)
+
+    inlinedBody.push_back(std::make_unique<InlineMarker>(call->fFunction));
 
     auto makeInlineVar = [&](const String& baseName, const Type& type, Modifiers modifiers,
                              std::unique_ptr<Expression>* initialValue) -> const Variable* {