Move ownership of SkSL::Inliner to SkSL::Compiler.

This will allow the Compiler to access the Inliner (in addition to the
IRGenerator, as before).

Change-Id: I1aeeaf8e3d3fb5d15533f7bf5c635a4798115d1f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/314357
Auto-Submit: John Stiles <[email protected]>
Reviewed-by: Brian Osman <[email protected]>
Commit-Queue: John Stiles <[email protected]>

Author: johnstiles-google

src/sksl/SkSLCompiler.cpp

@@ -106,7 +106,7 @@ Compiler::Compiler(Flags flags)
 , fContext(std::make_shared<Context>())
 , fErrorCount(0) {
     auto symbols = std::make_shared<SymbolTable>(this);
-    fIRGenerator = std::make_unique<IRGenerator>(fContext.get(), symbols, *this);
+    fIRGenerator = std::make_unique<IRGenerator>(fContext.get(), &fInliner, symbols, *this);
     #define ADD_TYPE(t) symbols->addWithoutOwnership(fContext->f ## t ## _Type->fName, \
                                                      fContext->f ## t ## _Type.get())
     ADD_TYPE(Void);
@@ -1547,6 +1547,7 @@ std::unique_ptr<Program> Compiler::convertProgram(Program::Kind kind, String tex
                                                   const Program::Settings& settings) {
     fErrorText = "";
     fErrorCount = 0;
+    fInliner.reset(context(), settings);
     std::vector<std::unique_ptr<ProgramElement>>* inherited;
     std::vector<std::unique_ptr<ProgramElement>> elements;
     switch (kind) {

src/sksl/SkSLCompiler.h

@@ -16,6 +16,7 @@
 #include "src/sksl/SkSLCFGGenerator.h"
 #include "src/sksl/SkSLContext.h"
 #include "src/sksl/SkSLErrorReporter.h"
+#include "src/sksl/SkSLInliner.h"
 #include "src/sksl/SkSLLexer.h"
 #include "src/sksl/ir/SkSLProgram.h"
 #include "src/sksl/ir/SkSLSymbolTable.h"
@@ -241,6 +242,7 @@ class SK_API Compiler : public ErrorReporter {
     std::vector<std::unique_ptr<ProgramElement>> fFPInclude;
     std::shared_ptr<SymbolTable> fFPSymbolTable;
 
+    Inliner fInliner;
     std::unique_ptr<IRGenerator> fIRGenerator;
     int fFlags;
 

src/sksl/SkSLIRGenerator.cpp

@@ -120,15 +120,18 @@ class AutoDisableInline {
     bool fOldCanInline;
 };
 
-IRGenerator::IRGenerator(const Context* context, std::shared_ptr<SymbolTable> symbolTable,
-                         ErrorReporter& errorReporter)
-: fContext(*context)
-, fCurrentFunction(nullptr)
-, fRootSymbolTable(symbolTable)
-, fSymbolTable(symbolTable)
-, fLoopLevel(0)
-, fSwitchLevel(0)
-, fErrors(errorReporter) {}
+IRGenerator::IRGenerator(const Context* context, Inliner* inliner,
+                         std::shared_ptr<SymbolTable> symbolTable, ErrorReporter& errorReporter)
+        : fContext(*context)
+        , fInliner(inliner)
+        , fCurrentFunction(nullptr)
+        , fRootSymbolTable(symbolTable)
+        , fSymbolTable(symbolTable)
+        , fLoopLevel(0)
+        , fSwitchLevel(0)
+        , fErrors(errorReporter) {
+    SkASSERT(fInliner);
+}
 
 void IRGenerator::pushSymbolTable() {
     fSymbolTable.reset(new SymbolTable(std::move(fSymbolTable)));
@@ -176,7 +179,6 @@ void IRGenerator::start(const Program::Settings* settings,
     this->pushSymbolTable();
     fInvocations = -1;
     fInputs.reset();
-    fInliner.reset(fContext, *fSettings);
     fSkPerVertex = nullptr;
     fRTAdjust = nullptr;
     fRTAdjustInterfaceBlock = nullptr;
@@ -1990,9 +1992,9 @@ std::unique_ptr<Expression> IRGenerator::call(int offset,
 
     auto funcCall = std::make_unique<FunctionCall>(offset, *returnType, function,
                                                    std::move(arguments));
-    if (fCanInline && fInliner.isSafeToInline(*funcCall, fSettings->fInlineThreshold)) {
-        Inliner::InlinedCall inlinedCall = fInliner.inlineCall(std::move(funcCall),
-                                                               fSymbolTable.get());
+    if (fCanInline && fInliner->isSafeToInline(*funcCall, fSettings->fInlineThreshold)) {
+        Inliner::InlinedCall inlinedCall = fInliner->inlineCall(std::move(funcCall),
+                                                                fSymbolTable.get());
         if (inlinedCall.fInlinedBody) {
             fExtraStatements.push_back(std::move(inlinedCall.fInlinedBody));
         }

src/sksl/SkSLIRGenerator.h

@@ -51,7 +51,7 @@ using IRIntrinsicMap = std::unordered_map<String, IRIntrinsic>;
  */
 class IRGenerator {
 public:
-    IRGenerator(const Context* context, std::shared_ptr<SymbolTable> root,
+    IRGenerator(const Context* context, Inliner* inliner, std::shared_ptr<SymbolTable> root,
                 ErrorReporter& errorReporter);
 
     void convertProgram(Program::Kind kind,
@@ -168,7 +168,7 @@ class IRGenerator {
     bool checkSwizzleWrite(const Swizzle& swizzle);
     void copyIntrinsicIfNeeded(const FunctionDeclaration& function);
 
-    Inliner fInliner;
+    Inliner* fInliner = nullptr;
     std::unique_ptr<ASTFile> fFile;
     const FunctionDeclaration* fCurrentFunction;
     std::unordered_map<String, Program::Settings::Value> fCapsMap;