diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2014-07-21 04:10:40 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2014-07-21 04:10:40 +0000 |
| commit | 57721ac5916c52a13d518bdb24aa479417c5beb3 (patch) | |
| tree | 9027b6aef220efc69351d8128ce073e0758b602c /clang/test/Modules/macro-hiding.cpp | |
| parent | ae1ec299df110b938168150158f6f618e5c86491 (diff) | |
| download | bcm5719-llvm-57721ac5916c52a13d518bdb24aa479417c5beb3.tar.gz bcm5719-llvm-57721ac5916c52a13d518bdb24aa479417c5beb3.zip | |
[modules] Fix some of the confusion when computing the override set for a macro
introduced by finalization. This is still not entirely correct; more fixes to
follow.
llvm-svn: 213498
Diffstat (limited to 'clang/test/Modules/macro-hiding.cpp')
| -rw-r--r-- | clang/test/Modules/macro-hiding.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/clang/test/Modules/macro-hiding.cpp b/clang/test/Modules/macro-hiding.cpp index d0dadf319f3..b166f4b194c 100644 --- a/clang/test/Modules/macro-hiding.cpp +++ b/clang/test/Modules/macro-hiding.cpp @@ -62,6 +62,8 @@ // RUN: %clang_cc1 -fmodules -fmodules-cache-path=%t -I%S/Inputs/macro-hiding %s -DA1 -DA2 -DB1 -DB2 -DD1 // RUN: %clang_cc1 -fmodules -fmodules-cache-path=%t -I%S/Inputs/macro-hiding %s -DA1 -DA2 -DB1 -DB2 -DC1 // RUN: %clang_cc1 -fmodules -fmodules-cache-path=%t -I%S/Inputs/macro-hiding %s -DA1 -DA2 -DB1 -DB2 -DC1 -DD1 +// +// RUN: %clang_cc1 -fmodules -fmodules-cache-path=%t -I%S/Inputs/macro-hiding %s -DE1 #ifdef A1 #include "a1.h" @@ -87,7 +89,15 @@ #include "d1.h" #endif -#if defined(A1) || defined(B2) || defined(C1) || defined(D1) +#ifdef E1 +#include "e1.h" +#endif + +#ifdef E2 +#include "e2.h" +#endif + +#if defined(A1) || defined(B2) || defined(C1) || defined(D1) || defined(E1) || defined(E2) void h() { assert(true); } #else void assert() {} |
