[libclang] Now that we have a CXModule object, pass it to the
importedASTFile indexing callback.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@165281 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/c-index-test/c-index-test.c b/tools/c-index-test/c-index-test.c
index caa50d0..c073b80 100644
--- a/tools/c-index-test/c-index-test.c
+++ b/tools/c-index-test/c-index-test.c
@@ -2376,11 +2376,14 @@
printf("[importedASTFile]: ");
printCXIndexFile((CXIdxClientFile)info->file);
- printf(" | loc: ");
- printCXIndexLoc(info->loc, client_data);
- printf(" | name: \"%s\"", info->moduleName);
- printf(" | isModule: %d | isImplicit: %d\n",
- info->isModule, info->isImplicit);
+ if (info->module) {
+ CXString name = clang_Module_getFullName(info->module);
+ printf(" | loc: ");
+ printCXIndexLoc(info->loc, client_data);
+ printf(" | name: \"%s\"", clang_getCString(name));
+ printf(" | isImplicit: %d\n", info->isImplicit);
+ clang_disposeString(name);
+ }
return (CXIdxClientFile)info->file;
}
diff --git a/tools/libclang/IndexingContext.cpp b/tools/libclang/IndexingContext.cpp
index 1186191..74b3cf3 100644
--- a/tools/libclang/IndexingContext.cpp
+++ b/tools/libclang/IndexingContext.cpp
@@ -264,10 +264,9 @@
CXIdxImportedASTFileInfo Info = {
(CXFile)Mod->getASTFile(),
+ Mod,
getIndexLoc(ImportD->getLocation()),
- /*isModule=*/true,
- ImportD->isImplicit(),
- ModuleName.c_str(),
+ ImportD->isImplicit()
};
CXIdxClientASTFile astFile = CB.importedASTFile(ClientData, &Info);
(void)astFile;
@@ -279,10 +278,9 @@
CXIdxImportedASTFileInfo Info = {
(CXFile)File,
+ /*module=*/NULL,
getIndexLoc(SourceLocation()),
- /*isModule=*/false,
- /*isImplicit=*/false,
- /*moduleName=*/NULL
+ /*isImplicit=*/false
};
CXIdxClientASTFile astFile = CB.importedASTFile(ClientData, &Info);
(void)astFile;