[PATCH v2 0/1] BaseTools: Cannot store library cache of different arch together

[PATCH v2 0/1] BaseTools: Cannot store library cache of different arch together

[Steven Shi]

V2:
Follow the Christian suggestion, Still keep the set() usage, but instead to
enahnce the AutoGen object __hash__ definition to be unique by including
the AutoGen object arch string into the __hash_ values.

V1:
Avoid to use the set() as the container to save the library and module objects


Steven Shi (1):
  BaseTools: Cannot store library cache of different arch together

 BaseTools/Source/Python/AutoGen/AutoGen.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.17.1.windows.2

[PATCH v2 1/1] BaseTools: Cannot store library cache of different arch together

[Steven Shi]

https://bugzilla.tianocore.org/show_bug.cgi?id=1895

Build cache cannot store cache for the same library modules
in different arch together. E.g. Both the below IA32 and X64
arch BaseLib caches should exist after build Ovmf3264, but now
only the one in X64 arch exist.
The reason is the current Basetool use a set() to same all
library AutoGen objects, but the different arch lib AutoGen
objects have same __hash_ value which comes from the lib
MetaFile(The path of module file):
    def __hash__(self):
        return hash(self.MetaFile)

So the different arch lib AutoGen objects are duplicated one
to the set() and only one can exist. This is why the Basetool
can only store one arch cache for library.

This patch adds the AutoGen object arch string into the __hash_
definition and ensure the different arch AutoGen objects have
different __hash_ values.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Christian Rodriguez <christian.rodriguez@intel.com>
Signed-off-by: Steven Shi <steven.shi@intel.com>
---
 BaseTools/Source/Python/AutoGen/AutoGen.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index 3f41fbb507..1fe8312d22 100644
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -271,7 +271,7 @@ class AutoGen(object):
     #   @retval int     Hash value of the file path of platform file
     #
     def __hash__(self):
-        return hash(self.MetaFile)
+        return hash((self.MetaFile, self.Arch))
 
     ## str() operator
     #
-- 
2.17.1.windows.2