BaseTool: Fixed the StructurePcd incorrect value.

If user not set Structure overall value in Dsc,
Structure Pcd value would be incorrect.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/BaseTools/Source/Python/Workspace/BuildClassObject.py b/BaseTools/Source/Python/Workspace/BuildClassObject.py
index 83140049ed59cfc2e99ddfd25e2eba4d31df3b4c..3afb27a9c0f2ee8798d47d741a8afda8f0694f43 100644 (file)
--- a/BaseTools/Source/Python/Workspace/BuildClassObject.py
+++ b/BaseTools/Source/Python/Workspace/BuildClassObject.py
@@ -67,7 +67,7 @@ class PcdClassObject(object):
         self.DscDefaultValue = None\r
         if IsDsc:\r
             self.DscDefaultValue = Value\r
-        \r
+\r
     ## Convert the class to a string\r
     #\r
     #  Convert each member of the class to string\r
@@ -109,7 +109,11 @@ class PcdClassObject(object):
         return hash((self.TokenCName, self.TokenSpaceGuidCName))\r
 \r
 class StructurePcd(PcdClassObject):\r
-    def __init__(self, StructuredPcdIncludeFile="", Packages=None, Name=None, Guid=None, Type=None, DatumType=None, Value=None, Token=None, MaxDatumSize=None, SkuInfoList={}, IsOverrided=False, GuidValue=None, validateranges=[], validlists=[], expressions=[],default_store = TAB_DEFAULT_STORES_DEFAULT):\r
+    def __init__(self, StructuredPcdIncludeFile=None, Packages=None, Name=None, Guid=None, Type=None, DatumType=None, Value=None, Token=None, MaxDatumSize=None, SkuInfoList=None, IsOverrided=False, GuidValue=None, validateranges=None, validlists=None, expressions=None,default_store = TAB_DEFAULT_STORES_DEFAULT):\r
+        if SkuInfoList is None: SkuInfoList={}\r
+        if validateranges is None: validateranges=[]\r
+        if validlists is None: validlists=[]\r
+        if expressions is None : expressions=[]\r
         super(StructurePcd, self).__init__(Name, Guid, Type, DatumType, Value, Token, MaxDatumSize, SkuInfoList, IsOverrided, GuidValue, validateranges, validlists, expressions)\r
         self.StructuredPcdIncludeFile = StructuredPcdIncludeFile\r
         self.PackageDecs = Packages\r
@@ -441,4 +445,3 @@ class PlatformBuildClassObject(object):
     #\r
     def __hash__(self):\r
         return hash(self.MetaFile)\r
-\r