Revert of SkSL performance improvements

src/sksl/SkSLCompiler.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
  
 #include "SkSLCompiler.h"
 
 #include <fstream>
@@ skipping 25 matching lines @@
 ;
 
 namespace SkSL {
 
 Compiler::Compiler() 
 : fErrorCount(0) {
     auto types = std::shared_ptr<SymbolTable>(new SymbolTable(*this));
     auto symbols = std::shared_ptr<SymbolTable>(new SymbolTable(types, *this));
     fIRGenerator = new IRGenerator(symbols, *this);
     fTypes = types;
-    #define ADD_TYPE(t) types->addWithoutOwnership(k ## t ## _Type->fName, k ## t ## _Type)
+    #define ADD_TYPE(t) types->add(k ## t ## _Type->fName, k ## t ## _Type)
     ADD_TYPE(Void);
     ADD_TYPE(Float);
     ADD_TYPE(Vec2);
     ADD_TYPE(Vec3);
     ADD_TYPE(Vec4);
     ADD_TYPE(Double);
     ADD_TYPE(DVec2);
     ADD_TYPE(DVec3);
     ADD_TYPE(DVec4);
     ADD_TYPE(Int);
@@ skipping 121 matching lines @@
             default:
                 ABORT("unsupported declaration: %s\n", decl.description().c_str());
         }
     }
 }
 
 std::unique_ptr<Program> Compiler::convertProgram(Program::Kind kind, std::string text) {
     fErrorText = "";
     fErrorCount = 0;
     fIRGenerator->pushSymbolTable();
-    std::vector<std::unique_ptr<ProgramElement>> elements;
+    std::vector<std::unique_ptr<ProgramElement>> result;
     switch (kind) {
         case Program::kVertex_Kind:
-            this->internalConvertProgram(SKSL_VERT_INCLUDE, &elements);
+            this->internalConvertProgram(SKSL_VERT_INCLUDE, &result);
             break;
         case Program::kFragment_Kind:
-            this->internalConvertProgram(SKSL_FRAG_INCLUDE, &elements);
+            this->internalConvertProgram(SKSL_FRAG_INCLUDE, &result);
             break;
     }
-    this->internalConvertProgram(text, &elements);
-    auto result = std::unique_ptr<Program>(new Program(kind, std::move(elements), 
-                                                       fIRGenerator->fSymbolTable));;
+    this->internalConvertProgram(text, &result);
     fIRGenerator->popSymbolTable();
     this->writeErrorCount();
-    return result;
+    return std::unique_ptr<Program>(new Program(kind, std::move(result)));;
 }
 
 void Compiler::error(Position position, std::string msg) {
     fErrorCount++;
     fErrorText += "error: " + position.description() + ": " + msg.c_str() + "\n";
 }
 
 std::string Compiler::errorText() {
     std::string result = fErrorText;
     return result;
@@ skipping 23 matching lines @@
 bool Compiler::toSPIRV(Program::Kind kind, std::string text, std::string* out) {
     std::stringstream buffer;
     bool result = this->toSPIRV(kind, text, buffer);
     if (result) {
         *out = buffer.str();
     }
     return fErrorCount == 0;
 }
 
 } // namespace