Optimized creating manifests

When creating manifests, we would first compute the list of included
files, then commpute the hash code of their contents and then call
ManifestRepository.getIncludesContentHashForFiles(). That function would
then re-compute the file hash for each file to see whether it's still
the same, but there's no point in doing so since we just computed the
hash!

Author: Frerich Raabe

clcache.py

@@ -208,7 +208,6 @@ def verifyIncludesHashes(includes):
 
     @staticmethod
     def getIncludesContentHashForFiles(includes):
-        ManifestRepository.verifyIncludesHashes(includes)
         return ManifestRepository.getIncludesContentHashForHashes(sorted(includes.values()))
 
     @staticmethod
@@ -1515,10 +1514,12 @@ def processDirect(cache, objectFile, compiler, cmdLine, sourceFile):
         if manifest is not None:
             # NOTE: command line options already included in hash for manifest name
             try:
-                includesContentHash = ManifestRepository.getIncludesContentHashForFiles({
+                includes = {
                     expandBasedirPlaceholder(path, baseDir):contentHash
                     for path, contentHash in manifest.includeFiles.items()
-                })
+                }
+                ManifestRepository.verifyIncludesHashes(includes)
+                includesContentHash = ManifestRepository.getIncludesContentHashForFiles(includes)
 
                 cachekey = manifest.includesContentToObjectMap.get(includesContentHash)
                 assert cachekey is not None