commit 6d696086211df59a339987e340430bca968d5dba
author John Stiles <johnstiles@google.com> Thu Oct 01 10:18:54 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Oct 02 19:00:14 2020 +0000
tree 8ce8d31ed5dea69fc50074295a9be46d1741d05a
parent 8cc5f19f439d31e832b137664b75b11607096eb3

Store a unique_ptr* for a candidate's parent statement.

This will later allow us to rescan parent statements independently,
instead of performing a full rescan of the entire Program on each
iteration.

Change-Id: Id86e139d81125bc529aba9453cba5606d1041908
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/321462
Auto-Submit: John Stiles <johnstiles@google.com>
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 e9b0115..9c663a5 100644
--- a/src/sksl/SkSLInliner.cpp
+++ b/src/sksl/SkSLInliner.cpp
@@ -199,7 +199,8 @@
     return src;
 }
 
-static Statement* find_parent_statement(const std::vector<std::unique_ptr<Statement>*>& stmtStack) {
+static std::unique_ptr<Statement>* find_parent_statement(
+        const std::vector<std::unique_ptr<Statement>*>& stmtStack) {
     SkASSERT(!stmtStack.empty());
 
     // Walk the statement stack from back to front, ignoring the last element (which is the
@@ -209,8 +210,8 @@
 
     // Anything counts as a parent statement other than a scopeless Block.
     for (; iter != stmtStack.rend(); ++iter) {
-        Statement* stmt = (*iter)->get();
-        if (!stmt->is<Block>() || stmt->as<Block>().isScope()) {
+        std::unique_ptr<Statement>* stmt = *iter;
+        if (!(*stmt)->is<Block>() || (*stmt)->as<Block>().isScope()) {
             return stmt;
         }
     }
@@ -782,7 +783,7 @@
     // A candidate function for inlining, containing everything that `inlineCall` needs.
     struct InlineCandidate {
         SymbolTable* fSymbols;                        // the SymbolTable of the candidate
-        Statement* fParentStmt;                       // the parent Statement of the enclosing stmt
+        std::unique_ptr<Statement>* fParentStmt;      // the parent Statement of the enclosing stmt
         std::unique_ptr<Statement>* fEnclosingStmt;   // the Statement containing the candidate
         std::unique_ptr<Expression>* fCandidateExpr;  // the candidate FunctionCall to be inlined
         FunctionDefinition* fEnclosingFunction;       // the Function containing the candidate
@@ -1122,7 +1123,7 @@
                                                    &candidate.fEnclosingFunction->fDeclaration);
         if (inlinedCall.fInlinedBody) {
             // Ensure that the inlined body has a scope if it needs one.
-            this->ensureScopedBlocks(inlinedCall.fInlinedBody.get(), candidate.fParentStmt);
+            this->ensureScopedBlocks(inlinedCall.fInlinedBody.get(), candidate.fParentStmt->get());
 
             // Move the enclosing statement to the end of the unscoped Block containing the inlined
             // function, then replace the enclosing statement with that Block.