Clean up storing interface blocks in the symbol table
Merge TInterfaceBlock with TInterfaceBlockName, so that there are no
duplicate data structures for interface blocks. This is similar to the
refactoring that was already done to structs.
BUG=angleproject:2267
TEST=angle_unittests
Change-Id: I67d2af6ccbe5344bddf9c99030d118fe532fbbd8
Reviewed-on: https://chromium-review.googlesource.com/805819
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>
diff --git a/src/compiler/translator/SymbolTable.cpp b/src/compiler/translator/SymbolTable.cpp
index 62bd3ba..adf1e4e 100644
--- a/src/compiler/translator/SymbolTable.cpp
+++ b/src/compiler/translator/SymbolTable.cpp
@@ -70,6 +70,17 @@
*mutableName = name;
}
+TInterfaceBlock::TInterfaceBlock(TSymbolTable *symbolTable,
+ const TString *name,
+ const TFieldList *fields,
+ const TLayoutQualifier &layoutQualifier)
+ : TSymbol(symbolTable, name),
+ TFieldListCollection(fields),
+ mBlockStorage(layoutQualifier.blockStorage),
+ mBinding(layoutQualifier.binding)
+{
+}
+
//
// Functions have buried pointers to delete.
//
@@ -315,27 +326,9 @@
return insertStructType(currentLevel(), str);
}
-TInterfaceBlockName *TSymbolTable::declareInterfaceBlockName(const TString *name)
+bool TSymbolTable::declareInterfaceBlock(TInterfaceBlock *interfaceBlock)
{
- TInterfaceBlockName *blockNameSymbol = new TInterfaceBlockName(this, name);
- if (insert(currentLevel(), blockNameSymbol))
- {
- return blockNameSymbol;
- }
- return nullptr;
-}
-
-TInterfaceBlockName *TSymbolTable::insertInterfaceBlockNameExt(ESymbolLevel level,
- TExtension ext,
- const TString *name)
-{
- TInterfaceBlockName *blockNameSymbol = new TInterfaceBlockName(this, name);
- blockNameSymbol->relateToExtension(ext);
- if (insert(level, blockNameSymbol))
- {
- return blockNameSymbol;
- }
- return nullptr;
+ return insert(currentLevel(), interfaceBlock);
}
TVariable *TSymbolTable::insertVariable(ESymbolLevel level, const char *name, const TType &type)
@@ -379,11 +372,13 @@
bool TSymbolTable::insertStructType(ESymbolLevel level, TStructure *str)
{
ASSERT(str);
- if (insert(level, str))
- {
- return true;
- }
- return false;
+ return insert(level, str);
+}
+
+bool TSymbolTable::insertInterfaceBlock(ESymbolLevel level, TInterfaceBlock *interfaceBlock)
+{
+ ASSERT(interfaceBlock);
+ return insert(level, interfaceBlock);
}
void TSymbolTable::insertBuiltIn(ESymbolLevel level,