fcc699aee8
VerifyDiagnosticConsumer previously would not check that the diagnostic and
its matching directive referenced the same source file. Common practice was
to create directives that referenced other files but only by line number,
and this led to problems such as when the file containing the directive
didn't have enough lines to match the location of the diagnostic in the
other file, leading to bizarre file formatting and other oddities.
This patch causes VerifyDiagnosticConsumer to match source files as well as
line numbers. Therefore, a new syntax is made available for directives, for
example:
// expected-error@file:line {{diagnostic message}}
This extends the @line feature where "file" is the file where the diagnostic
is generated. The @line syntax is still available and uses the current file
for the diagnostic. "file" can be specified either as a relative or absolute
path - although the latter has less usefulness, I think! The #include search
paths will be used to locate the file and if it is not found an error will be
generated.
The new check is not optional: if the directive is in a different file to the
diagnostic, the file must be specified. Therefore, a number of test-cases
have been updated with regard to this.
This closes out PR15613.
llvm-svn: 179677
74 lines
3.0 KiB
Objective-C
74 lines
3.0 KiB
Objective-C
// RUN: rm -rf %t
|
|
// RUN: %clang_cc1 -Wauto-import -fmodules-cache-path=%t -fmodules -F %S/Inputs %s -verify
|
|
|
|
#include <DependsOnModule/DependsOnModule.h> // expected-warning{{treating #include as an import of module 'DependsOnModule'}}
|
|
|
|
// expected-note@Inputs/NoUmbrella.framework/PrivateHeaders/A_Private.h:1{{'no_umbrella_A_private' declared here}}
|
|
|
|
#ifdef MODULE_H_MACRO
|
|
# error MODULE_H_MACRO should have been hidden
|
|
#endif
|
|
|
|
#ifdef DEPENDS_ON_MODULE
|
|
# error DEPENDS_ON_MODULE should have been hidden
|
|
#endif
|
|
|
|
Module *mod; // expected-error{{unknown type name 'Module'}}
|
|
|
|
#import <AlsoDependsOnModule/AlsoDependsOnModule.h> // expected-warning{{treating #import as an import of module 'AlsoDependsOnModule'}}
|
|
Module *mod2;
|
|
|
|
int getDependsOther() { return depends_on_module_other; }
|
|
|
|
void testSubframeworkOther() {
|
|
double *sfo1 = sub_framework_other; // expected-error{{use of undeclared identifier 'sub_framework_other'}}
|
|
}
|
|
|
|
// Test umbrella-less submodule includes
|
|
#include <NoUmbrella/A.h> // expected-warning{{treating #include as an import of module 'NoUmbrella.A'}}
|
|
int getNoUmbrellaA() { return no_umbrella_A; }
|
|
|
|
// Test umbrella-less submodule includes
|
|
#include <NoUmbrella/SubDir/C.h> // expected-warning{{treating #include as an import of module 'NoUmbrella.SubDir.C'}}
|
|
int getNoUmbrellaC() { return no_umbrella_C; }
|
|
|
|
// Test header cross-subframework include pattern.
|
|
#include <DependsOnModule/../Frameworks/SubFramework.framework/Headers/Other.h> // expected-warning{{treating #include as an import of module 'DependsOnModule.SubFramework.Other'}}
|
|
|
|
void testSubframeworkOtherAgain() {
|
|
double *sfo1 = sub_framework_other;
|
|
}
|
|
|
|
void testModuleSubFramework() {
|
|
char *msf = module_subframework;
|
|
}
|
|
|
|
#include <Module/../Frameworks/SubFramework.framework/Headers/SubFramework.h> // expected-warning{{treating #include as an import of module 'Module.SubFramework'}}
|
|
|
|
void testModuleSubFrameworkAgain() {
|
|
char *msf = module_subframework;
|
|
}
|
|
|
|
// Test inclusion of private headers.
|
|
#include <DependsOnModule/DependsOnModulePrivate.h> // expected-warning{{treating #include as an import of module 'DependsOnModule.Private.DependsOnModule'}}
|
|
|
|
int getDependsOnModulePrivate() { return depends_on_module_private; }
|
|
|
|
#include <Module/ModulePrivate.h> // includes the header
|
|
|
|
int getModulePrivate() { return module_private; }
|
|
|
|
#include <NoUmbrella/A_Private.h> // expected-warning{{treating #include as an import of module 'NoUmbrella.Private.A_Private'}}
|
|
int getNoUmbrellaAPrivate() { return no_umbrella_A_private; }
|
|
|
|
int getNoUmbrellaBPrivateFail() { return no_umbrella_B_private; } // expected-error{{use of undeclared identifier 'no_umbrella_B_private'; did you mean 'no_umbrella_A_private'?}}
|
|
|
|
// Test inclusion of headers that are under an umbrella directory but
|
|
// not actually part of the module.
|
|
#include <Module/NotInModule.h> // expected-warning{{treating #include as an import of module 'Module.NotInModule'}} \
|
|
// expected-warning{{missing submodule 'Module.NotInModule'}}
|
|
|
|
int getNotInModule() {
|
|
return not_in_module;
|
|
}
|