diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-10-13 00:39:40 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-10-13 00:39:40 +0000 |
| commit | e69bdd10ead6347dfe42593247dec9a07687389d (patch) | |
| tree | 7a6e5b188c547ecb66a0cbbf51b8927f1a44c67c /clang/test/Modules | |
| parent | 38c2f6cb202f85e9ee725e3bcfbae55a16879258 (diff) | |
| download | bcm5719-llvm-e69bdd10ead6347dfe42593247dec9a07687389d.tar.gz bcm5719-llvm-e69bdd10ead6347dfe42593247dec9a07687389d.zip | |
[modules] Allow the error on importing a C++ module within an extern "C"
context (but otherwise at the top level) to be disabled, to support use of C++
standard library implementations that (legitimately) mark their <blah.h>
headers as being C++ headers from C libraries that wrap things in 'extern "C"'
a bit too enthusiastically.
llvm-svn: 250137
Diffstat (limited to 'clang/test/Modules')
| -rw-r--r-- | clang/test/Modules/extern_c.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/clang/test/Modules/extern_c.cpp b/clang/test/Modules/extern_c.cpp index c9b4b8435fd..c072b7e75ab 100644 --- a/clang/test/Modules/extern_c.cpp +++ b/clang/test/Modules/extern_c.cpp @@ -9,6 +9,8 @@ // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -verify -fmodules-cache-path=%t -I %S/Inputs %s -DCXX_HEADER -DEXTERN_CXX // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -verify -fmodules-cache-path=%t -I %S/Inputs %s -DCXX_HEADER -DEXTERN_C -DEXTERN_CXX // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -verify -fmodules-cache-path=%t -I %S/Inputs %s -DCXX_HEADER -DEXTERN_C -DNAMESPACE +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -verify -fmodules-cache-path=%t -I %S/Inputs %s -DCXX_HEADER -DEXTERN_C -DNO_EXTERN_C_ERROR -Wno-module-import-in-extern-c +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -verify -fmodules-cache-path=%t -I %S/Inputs %s -DCXX_HEADER -DEXTERN_C -DNAMESPACE -DNO_EXTERN_C_ERROR -Wno-module-import-in-extern-c // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -verify -fmodules-cache-path=%t -I %S/Inputs -x c %s // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -verify -fmodules-cache-path=%t -I %S/Inputs/elsewhere -I %S/Inputs %s -DEXTERN_C -DINDIRECT @@ -36,12 +38,12 @@ extern "C++" { #include HEADER -#if defined(EXTERN_C) && !defined(EXTERN_CXX) && defined(CXX_HEADER) -// expected-error@-3 {{import of C++ module 'cxx_library' appears within extern "C" language linkage specification}} -// expected-note@-17 {{extern "C" language linkage specification begins here}} -#elif defined(NAMESPACE) -// expected-error-re@-6 {{import of module '{{c_library.inner|cxx_library}}' appears within namespace 'M'}} -// expected-note@-24 {{namespace 'M' begins here}} +#if defined(NAMESPACE) +// expected-error-re@-3 {{import of module '{{c_library.inner|cxx_library}}' appears within namespace 'M'}} +// expected-note@-21 {{namespace 'M' begins here}} +#elif defined(EXTERN_C) && !defined(EXTERN_CXX) && defined(CXX_HEADER) && !defined(NO_EXTERN_C_ERROR) +// expected-error@-6 {{import of C++ module 'cxx_library' appears within extern "C" language linkage specification}} +// expected-note@-20 {{extern "C" language linkage specification begins here}} #endif #ifdef EXTERN_CXX |
