BaseTools: defaultdict(set) allows us to just add to the set

New sets will get created automatically when needed

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index 6b47aa2a8f904c98ca650992566f1ab65ab4acae..cf6dcc6ab4ddf58dee48eecbeb3b0c9dba428e79 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -46,6 +46,7 @@ import datetime
 import hashlib\r
 from GenVar import VariableMgr,var_info\r
 from collections import OrderedDict\r
+from collections import defaultdict\r
 \r
 ## Regular expression for splitting Dependency Expression string into tokens\r
 gDepexTokenPattern = re.compile("(\(|\)|\w+| \S+\.inf)")\r
@@ -3483,8 +3484,8 @@ class ModuleAutoGen(AutoGen):
         if self._BuildTargets is None:\r
             self._IntroBuildTargetList = set()\r
             self._FinalBuildTargetList = set()\r
-            self._BuildTargets = {}\r
-            self._FileTypes = {}\r
+            self._BuildTargets = defaultdict(set)\r
+            self._FileTypes = defaultdict(set)\r
 \r
         SubDirectory = os.path.join(self.OutputDir, File.SubDir)\r
         if not os.path.exists(SubDirectory):\r
@@ -3521,8 +3522,6 @@ class ModuleAutoGen(AutoGen):
                 break\r
 \r
             FileType = RuleObject.SourceFileType\r
-            if FileType not in self._FileTypes:\r
-                self._FileTypes[FileType] = set()\r
             self._FileTypes[FileType].add(Source)\r
 \r
             # stop at STATIC_LIBRARY for library\r
@@ -3540,8 +3539,6 @@ class ModuleAutoGen(AutoGen):
                 # Only do build for target with outputs\r
                 self._FinalBuildTargetList.add(Target)\r
 \r
-            if FileType not in self._BuildTargets:\r
-                self._BuildTargets[FileType] = set()\r
             self._BuildTargets[FileType].add(Target)\r
 \r
             if not Source.IsBinary and Source == File:\r
@@ -3560,8 +3557,8 @@ class ModuleAutoGen(AutoGen):
         if self._BuildTargets is None:\r
             self._IntroBuildTargetList = set()\r
             self._FinalBuildTargetList = set()\r
-            self._BuildTargets = {}\r
-            self._FileTypes = {}\r
+            self._BuildTargets = defaultdict(set)\r
+            self._FileTypes = defaultdict(set)\r
 \r
         #TRICK: call _GetSourceFileList to apply build rule for source files\r
         if self.SourceFileList:\r