Clear the builtin status of SkSL nodes when they are cloned.

This has a slight ripple effect into Enum, as it was using the builtin
status as an indicator that the enum was shared with C++ code. This now
has a dedicated bool flag.

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

Author: johnstiles-google

src/sksl/SkSLHCodeGenerator.cpp

@@ -356,7 +356,7 @@ bool HCodeGenerator::generateCode() {
                  "public:\n",
                  fFullName.c_str());
     for (const auto& p : fProgram.elements()) {
-        if (p->is<Enum>() && !p->as<Enum>().isBuiltin()) {
+        if (p->is<Enum>() && !p->as<Enum>().isSharedWithCpp()) {
             this->writef("%s\n", p->as<Enum>().code().c_str());
         }
     }

src/sksl/SkSLIRGenerator.cpp

@@ -1232,8 +1232,9 @@ void IRGenerator::convertEnum(const ASTNode& e) {
     }
     // Now we orphanize the Enum's symbol table, so that future lookups in it are strict
     fSymbolTable->fParent = nullptr;
-    fProgramElements->push_back(std::unique_ptr<ProgramElement>(
-            new Enum(e.fOffset, e.getString(), fSymbolTable, fIsBuiltinCode)));
+    fProgramElements->push_back(std::make_unique<Enum>(e.fOffset, e.getString(), fSymbolTable,
+                                                       /*isSharedWithCpp=*/fIsBuiltinCode,
+                                                       /*isBuiltin=*/fIsBuiltinCode));
     fSymbolTable = oldTable;
 }
 
@@ -2021,10 +2022,7 @@ void IRGenerator::copyIntrinsicIfNeeded(const FunctionDeclaration& function) {
             this->copyIntrinsicIfNeeded(*f);
         }
 
-        // Unmark the function as a built-in when cloning it, so that it is eligible for alteration.
-        std::unique_ptr<ProgramElement> clonedIntrinsicFn = original.clone();
-        clonedIntrinsicFn->as<FunctionDefinition>().setBuiltin(false);
-        fProgramElements->push_back(std::move(clonedIntrinsicFn));
+        fProgramElements->push_back(original.clone());
     }
 }
 

src/sksl/SkSLRehydrator.cpp

@@ -304,7 +304,8 @@ std::unique_ptr<ProgramElement> Rehydrator::element() {
                 v.setInitialValue(symbols->takeOwnershipOfIRNode(
                         std::make_unique<IntLiteral>(fContext, /*offset=*/-1, value)));
             }
-            return std::unique_ptr<ProgramElement>(new Enum(-1, typeName, std::move(symbols)));
+            return std::make_unique<Enum>(/*offset=*/-1, typeName, std::move(symbols),
+                                          /*isSharedWithCpp=*/true, /*isBuiltin=*/true);
         }
         case Rehydrator::kFunctionDefinition_Command: {
             const FunctionDeclaration* decl = this->symbolRef<FunctionDeclaration>(

src/sksl/ir/SkSLEnum.h

@@ -25,8 +25,8 @@ class Enum : public ProgramElement {
     static constexpr Kind kProgramElementKind = Kind::kEnum;
 
     Enum(int offset, StringFragment typeName, std::shared_ptr<SymbolTable> symbols,
-         bool isBuiltin = true)
-    : INHERITED(offset, EnumData{typeName, std::move(symbols), isBuiltin}) {}
+         bool isSharedWithCpp, bool isBuiltin = true)
+    : INHERITED(offset, EnumData{typeName, std::move(symbols), isSharedWithCpp, isBuiltin}) {}
 
     StringFragment typeName() const {
         return this->enumData().fTypeName;
@@ -40,9 +40,13 @@ class Enum : public ProgramElement {
         return this->enumData().fIsBuiltin;
     }
 
+    bool isSharedWithCpp() const {
+        return this->enumData().fIsSharedWithCpp;
+    }
+
     std::unique_ptr<ProgramElement> clone() const override {
-        return std::unique_ptr<ProgramElement>(new Enum(fOffset, this->typeName(), this->symbols(),
-                                                        this->isBuiltin()));
+        return std::make_unique<Enum>(fOffset, this->typeName(), this->symbols(),
+                                      this->isSharedWithCpp(), /*isBuiltin=*/false);
     }
 
     String code() const {

src/sksl/ir/SkSLFunctionDefinition.h

@@ -40,10 +40,6 @@ struct FunctionDefinition : public ProgramElement {
         return this->functionDefinitionData().fBuiltin;
     }
 
-    void setBuiltin(bool builtin) {
-        this->functionDefinitionData().fBuiltin = builtin;
-    }
-
     std::unique_ptr<Statement>& body() {
         return this->fStatementChildren[0];
     }
@@ -66,7 +62,7 @@ struct FunctionDefinition : public ProgramElement {
 
     std::unique_ptr<ProgramElement> clone() const override {
         return std::make_unique<FunctionDefinition>(fOffset, &this->declaration(),
-                                                    this->isBuiltin(), this->body()->clone(),
+                                                    /*builtin=*/false, this->body()->clone(),
                                                     this->referencedIntrinsics());
     }
 

src/sksl/ir/SkSLIRNode.h

@@ -81,6 +81,7 @@ class IRNode {
     struct EnumData {
         StringFragment fTypeName;
         std::shared_ptr<SymbolTable> fSymbols;
+        bool fIsSharedWithCpp;
         bool fIsBuiltin;
     };