From: Argyrios Kyrtzidis Date: Thu, 11 Oct 2012 19:38:23 +0000 (+0000) Subject: [libclang] Make sure the index_data.main_filename field is initialized X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0ef983e89c989ce27ab35d292893a915c8ee398d;p=clang [libclang] Make sure the index_data.main_filename field is initialized in c-index-test. index_enteredMainFile is not invoked when indexing a module file. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@165735 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/test/Index/index-module.m b/test/Index/index-module.m new file mode 100644 index 0000000000..5e790b166f --- /dev/null +++ b/test/Index/index-module.m @@ -0,0 +1,52 @@ + +#include +@__experimental_modules_import DependsOnModule; +int glob; + +// RUN: rm -rf %t.cache +// RUN: c-index-test -index-file %s -fmodule-cache-path %t.cache -fmodules -F %S/../Modules/Inputs \ +// RUN: -Xclang -fdisable-module-hash | FileCheck %s + +// CHECK-NOT: [indexDeclaration] +// CHECK: [importedASTFile]: {{.*}}/DependsOnModule.pcm | loc: 2:2 | name: "DependsOnModule" | isImplicit: 1 +// CHECK-NOT: [indexDeclaration] +// CHECK: [importedASTFile]: {{.*}}/DependsOnModule.pcm | loc: 3:1 | name: "DependsOnModule" | isImplicit: 0 +// CHECK-NEXT: [indexDeclaration]: kind: variable | name: glob | {{.*}} | loc: 4:5 +// CHECK-NOT: [indexDeclaration] + +// RUN: c-index-test -index-tu %t.cache/DependsOnModule.pcm | FileCheck %s -check-prefix=CHECK-DMOD + +// CHECK-DMOD: [startedTranslationUnit] +// CHECK-DMOD-NEXT: [ppIncludedFile]: {{.*}}/Modules/Inputs/DependsOnModule.framework/Headers/DependsOnModule.h | {{.*}} | hash loc: +// CHECK-DMOD-NEXT: [ppIncludedFile]: {{.*}}/Modules/Inputs/DependsOnModule.framework/Headers/other.h | {{.*}} | hash loc: +// CHECK-DMOD-NEXT: [ppIncludedFile]: {{.*}}/Modules/Inputs/DependsOnModule.framework/Frameworks/SubFramework.framework/Headers/SubFramework.h | {{.*}} | hash loc: +// CHECK-DMOD-NEXT: [ppIncludedFile]: {{.*}}/Modules/Inputs/DependsOnModule.framework/Frameworks/SubFramework.framework/Headers/Other.h | name: "SubFramework/Other.h" | hash loc: {{.*}}/Modules/Inputs/DependsOnModule.framework/Frameworks/SubFramework.framework/Headers/SubFramework.h:1:1 | isImport: 0 | isAngled: 0 +// CHECK-DMOD-NEXT: [ppIncludedFile]: {{.*}}/Modules/Inputs/DependsOnModule.framework/PrivateHeaders/DependsOnModulePrivate.h | {{.*}} | hash loc: +// CHECK-DMOD-NEXT: [importedASTFile]: {{.*}}.cache/Module.pcm | loc: {{.*}}/Modules/Inputs/DependsOnModule.framework/Headers/DependsOnModule.h:1:2 | name: "Module" | isImplicit: 1 +// CHECK-DMOD-NEXT: [indexDeclaration]: kind: variable | name: depends_on_module_other | {{.*}} | loc: {{.*}}/Modules/Inputs/DependsOnModule.framework/Headers/other.h:1:5 +// CHECK-DMOD-NEXT: [indexDeclaration]: kind: variable | name: sub_framework | {{.*}} | loc: {{.*}}/Modules/Inputs/DependsOnModule.framework/Frameworks/SubFramework.framework/Headers/SubFramework.h:2:8 +// CHECK-DMOD-NEXT: [indexDeclaration]: kind: variable | name: sub_framework_other | {{.*}} | loc: {{.*}}/Modules/Inputs/DependsOnModule.framework/Frameworks/SubFramework.framework/Headers/Other.h:1:9 +// CHECK-DMOD-NEXT: [indexDeclaration]: kind: variable | name: depends_on_module_private | {{.*}} | loc: {{.*}}/Modules/Inputs/DependsOnModule.framework/PrivateHeaders/DependsOnModulePrivate.h:1:5 +// CHECK-DMOD-NOT: [indexDeclaration] + +// RUN: c-index-test -index-tu %t.cache/Module.pcm | FileCheck %s -check-prefix=CHECK-TMOD + +// CHECK-TMOD: [startedTranslationUnit] +// CHECK-TMOD-NEXT: [ppIncludedFile]: {{.*}}/Modules/Inputs/Module.framework/Headers/Module.h | {{.*}} | hash loc: +// CHECK-TMOD-NEXT: [ppIncludedFile]: {{.*}}/Modules/Inputs/Module.framework/Headers/Sub.h | name: "Module/Sub.h" | hash loc: {{.*}}/Modules/Inputs/Module.framework/Headers/Module.h:23:1 | isImport: 0 | isAngled: 1 +// CHECK-TMOD-NEXT: [ppIncludedFile]: {{.*}}/Modules/Inputs/Module.framework/Headers/Sub2.h | name: "Module/Sub2.h" | hash loc: {{.*}}/Modules/Inputs/Module.framework/Headers/Sub.h:1:1 | isImport: 0 | isAngled: 1 +// CHECK-TMOD-NEXT: [ppIncludedFile]: {{.*}}/Modules/Inputs/Module.framework/Headers/Buried/Treasure.h | name: "Module/Buried/Treasure.h" | hash loc: {{.*}}/Modules/Inputs/Module.framework/Headers/Module.h:24:1 | isImport: 0 | isAngled: 1 +// CHECK-TMOD-NEXT: [ppIncludedFile]: {{.*}}/Modules/Inputs/Module.framework/Frameworks/SubFramework.framework/Headers/SubFramework.h | {{.*}} | hash loc: +// CHECK-TMOD-NEXT: [indexDeclaration]: kind: function | name: getModuleVersion | {{.*}} | loc: {{.*}}/Modules/Inputs/Module.framework/Headers/Module.h:9:13 +// CHECK-TMOD-NEXT: [indexDeclaration]: kind: objc-class | name: Module | {{.*}} | loc: {{.*}}/Modules/Inputs/Module.framework/Headers/Module.h:15:12 +// CHECK-TMOD-NEXT: : kind: interface +// CHECK-TMOD-NEXT: [indexDeclaration]: kind: objc-class-method | name: version | {{.*}} | loc: {{.*}}/Modules/Inputs/Module.framework/Headers/Module.h:16:1 +// CHECK-TMOD-NEXT: [indexDeclaration]: kind: objc-class-method | name: alloc | {{.*}} | loc: {{.*}}/Modules/Inputs/Module.framework/Headers/Module.h:17:1 +// CHECK-TMOD-NEXT: [importedASTFile]: {{.*}}.cache/Module.pcm | loc: {{.*}}/Modules/Inputs/Module.framework/Headers/Module.h:23:2 | name: "Module.Sub" | isImplicit: 1 +// CHECK-TMOD-NEXT: [importedASTFile]: {{.*}}.cache/Module.pcm | loc: {{.*}}/Modules/Inputs/Module.framework/Headers/Module.h:24:2 | name: "Module.Buried.Treasure" | isImplicit: 1 +// CHECK-TMOD-NEXT: [importedASTFile]: {{.*}}.cache/Module.pcm | loc: {{.*}}/Modules/Inputs/Module.framework/Headers/Sub.h:1:2 | name: "Module.Sub2" | isImplicit: 1 +// CHECK-TMOD-NEXT: [indexDeclaration]: kind: variable | name: Module_Sub | {{.*}} | loc: {{.*}}/Modules/Inputs/Module.framework/Headers/Sub.h:2:6 +// CHECK-TMOD-NEXT: [indexDeclaration]: kind: variable | name: Module_Sub2 | USR: c:@Module_Sub2 | {{.*}} | loc: {{.*}}/Modules/Inputs/Module.framework/Headers/Sub2.h:1:6 +// CHECK-TMOD-NEXT: [indexDeclaration]: kind: variable | name: Buried_Treasure | {{.*}} | loc: {{.*}}/Modules/Inputs/Module.framework/Headers/Buried/Treasure.h:1:11 +// CHECK-TMOD-NEXT: [indexDeclaration]: kind: variable | name: module_subframework | {{.*}} | loc: {{.*}}/Modules/Inputs/Module.framework/Frameworks/SubFramework.framework/Headers/SubFramework.h:4:7 +// CHECK-TMOD-NOT: [indexDeclaration] diff --git a/tools/c-index-test/c-index-test.c b/tools/c-index-test/c-index-test.c index 97d57515a0..76e3773e44 100644 --- a/tools/c-index-test/c-index-test.c +++ b/tools/c-index-test/c-index-test.c @@ -2571,6 +2571,7 @@ static int index_file(int argc, const char **argv) { index_data.first_check_printed = 0; index_data.fail_for_error = 0; index_data.abort = 0; + index_data.main_filename = ""; index_opts = getIndexOptions(); idxAction = clang_IndexAction_create(Idx); @@ -2624,6 +2625,7 @@ static int index_tu(int argc, const char **argv) { index_data.first_check_printed = 0; index_data.fail_for_error = 0; index_data.abort = 0; + index_data.main_filename = ""; index_opts = getIndexOptions(); idxAction = clang_IndexAction_create(Idx);