Revert of SkSL performance improvements

src/sksl/SkSLIRGenerator.h

Index: src/sksl/SkSLIRGenerator.h
diff --git a/src/sksl/SkSLIRGenerator.h b/src/sksl/SkSLIRGenerator.h
index 7cf38f3fe5316b176c2a5fbd7da04f852a628db9..d23e5a1bdb3a31eb1e901febbce4d70f0290413e 100644
--- a/src/sksl/SkSLIRGenerator.h
+++ b/src/sksl/SkSLIRGenerator.h
@@ -65,20 +65,21 @@
     void pushSymbolTable();
     void popSymbolTable();
 
-    const Type* convertType(const ASTType& type);
+    std::shared_ptr<Type> convertType(const ASTType& type);
     std::unique_ptr<Expression> call(Position position, 
-                                     const FunctionDeclaration& function, 
+                                     std::shared_ptr<FunctionDeclaration> function, 
                                      std::vector<std::unique_ptr<Expression>> arguments);
-    bool determineCallCost(const FunctionDeclaration& function, 
+    bool determineCallCost(std::shared_ptr<FunctionDeclaration> function, 
                            const std::vector<std::unique_ptr<Expression>>& arguments,
                            int* outCost);
     std::unique_ptr<Expression> call(Position position, std::unique_ptr<Expression> function, 
                                      std::vector<std::unique_ptr<Expression>> arguments);
-    std::unique_ptr<Expression> coerce(std::unique_ptr<Expression> expr, const Type& type);
+    std::unique_ptr<Expression> coerce(std::unique_ptr<Expression> expr, 
+                                       std::shared_ptr<Type> type);
     std::unique_ptr<Block> convertBlock(const ASTBlock& block);
     std::unique_ptr<Statement> convertBreak(const ASTBreakStatement& b);
     std::unique_ptr<Expression> convertConstructor(Position position, 
-                                                   const Type& type, 
+                                                   std::shared_ptr<Type> type, 
                                                    std::vector<std::unique_ptr<Expression>> params);
     std::unique_ptr<Statement> convertContinue(const ASTContinueStatement& c);
     std::unique_ptr<Statement> convertDiscard(const ASTDiscardStatement& d);
@@ -105,10 +106,10 @@
     std::unique_ptr<Statement> convertWhile(const ASTWhileStatement& w);
 
     void checkValid(const Expression& expr);
-    void markReadFrom(const Variable& var);
+    void markReadFrom(std::shared_ptr<Variable> var);
     void markWrittenTo(const Expression& expr);
 
-    const FunctionDeclaration* fCurrentFunction;
+    std::shared_ptr<FunctionDeclaration> fCurrentFunction;
     std::shared_ptr<SymbolTable> fSymbolTable;
     ErrorReporter& fErrors;