remove unneeded extra constructions now that pool allocation is fixed
authorMalcolm Bechard <malcolm@derivative.ca>
Mon, 15 Nov 2021 15:44:08 +0000 (10:44 -0500)
committerMalcolm Bechard <malcolm@derivative.ca>
Wed, 17 Nov 2021 23:11:10 +0000 (18:11 -0500)
glslang/MachineIndependent/SymbolTable.cpp

index 5b7e27f..a3ffa0c 100644 (file)
@@ -426,12 +426,7 @@ TSymbolTableLevel* TSymbolTableLevel::clone() const
     symTableLevel->thisLevel = thisLevel;
     symTableLevel->retargetedSymbols.clear();
     for (auto &s : retargetedSymbols) {
-        // Extra constructions to make sure they use the correct allocator pool
-        TString newFrom;
-        newFrom = s.first;
-        TString newTo;
-        newTo = s.second;
-        symTableLevel->retargetedSymbols.push_back({std::move(newFrom), std::move(newTo)});
+        symTableLevel->retargetedSymbols.push_back({s.first, s.second});
     }
     std::vector<bool> containerCopied(anonId, false);
     tLevel::const_iterator iter;
@@ -462,11 +457,7 @@ TSymbolTableLevel* TSymbolTableLevel::clone() const
         TSymbol* sym = symTableLevel->find(s.second);
         if (!sym)
             continue;
-
-        // Need to declare and assign so newS is using the correct pool allocator
-        TString newS;
-        newS = s.first;
-        symTableLevel->insert(newS, sym);
+        symTableLevel->insert(s.first, sym);
     }
 
     return symTableLevel;