Cleanup createManifestEntry

Author: siu

clcache.py

@@ -1386,12 +1386,12 @@ def processCacheHit(cache, objectFile, cachekey):
 
 def createManifestEntry(manifestHash, includePaths):
     sortedIncludePaths = sorted(set(includePaths))
-    includesWithHash = {path:getFileHash(path) for path in sortedIncludePaths}
-    includesContentHash = ManifestRepository.getIncludesContentHashForHashes(
-        [includesWithHash[key] for key in sortedIncludePaths])
-    cachekey = CompilerArtifactsRepository.computeKeyDirect(manifestHash, includesContentHash)
+    includeHashes = [getFileHash(path) for path in sortedIncludePaths]
 
     safeIncludes = [collapseBasedirToPlaceholder(path) for path in sortedIncludePaths]
+    includesContentHash = ManifestRepository.getIncludesContentHashForHashes(includeHashes)
+    cachekey = CompilerArtifactsRepository.computeKeyDirect(manifestHash, includesContentHash)
+
     return ManifestEntry(safeIncludes, includesContentHash, cachekey)