Clang: Collect source dependencies

It is quite easy because we track the include directives in the
preprocessor callbacks.

Change-Id: I2d7bd67b31f50c0d8d4a46c57e83dffa0c558dc7
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>

1 files changed, 15 insertions, 7 deletions

diff --git a/src/tools/clangrefactoringbackend/source/symbolsvisitorbase.h b/src/tools/clangrefactoringbackend/source/symbolsvisitorbase.h
index 9c5b701dfb..6dfc969fad 100644
--- a/src/tools/clangrefactoringbackend/source/symbolsvisitorbase.h
+++ b/src/tools/clangrefactoringbackend/source/symbolsvisitorbase.h
@@ -50,22 +50,30 @@ public:
 
     FilePathId filePathId(clang::SourceLocation sourceLocation)
     {
-        uint clangFileId = m_sourceManager.getFileID(sourceLocation).getHashValue();
+        clang::FileID clangFileId = m_sourceManager.getFileID(sourceLocation);
+        const clang::FileEntry *fileEntry = m_sourceManager.getFileEntryForID(clangFileId);
 
-        auto found = m_filePathIndices.find(clangFileId);
+        return filePathId(fileEntry);
+    }
+
+    FilePathId filePathId(const clang::FileEntry *fileEntry)
+    {
+        if (fileEntry) {
+            uint fileHash = fileEntry->getUID();
 
-        if (found != m_filePathIndices.end())
-            return found->second;
+            auto found = m_filePathIndices.find(fileHash);
 
-        auto filePath = m_sourceManager.getFilename(sourceLocation);
+            if (found != m_filePathIndices.end())
+                return found->second;
 
-        if (filePath.size() > 0) {
+            auto filePath = fileEntry->getName();
             FilePathId filePathId = m_filePathCache.filePathId(FilePath::fromNativeFilePath(absolutePath(filePath)));
 
-            m_filePathIndices.emplace(clangFileId, filePathId);
+            m_filePathIndices.emplace(fileHash, filePathId);
 
             return filePathId;
         }
+
         return {};
     }