diff options
author | Douglas Gregor <dgregor@apple.com> | 2013-01-18 04:34:14 +0000 |
---|---|---|
committer | Douglas Gregor <dgregor@apple.com> | 2013-01-18 04:34:14 +0000 |
commit | d3b036efdf0bf4ec216c701183a4b990cd041cd6 (patch) | |
tree | d5d0e6464583c3bef62ffd720714526ab388a980 /test/PCH | |
parent | 6a21a556a728325e1fae4387128d149927a4fbff (diff) | |
download | clang-d3b036efdf0bf4ec216c701183a4b990cd041cd6.tar.gz |
Revert Clang r172620 and r172629, which caused a hang when building
complicated modules (<rdar://problem/13038265>). Unfortunately, this
un-fixes <rdar://problem/13016031>.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@172783 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/PCH')
-rw-r--r-- | test/PCH/macro-redef.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/test/PCH/macro-redef.c b/test/PCH/macro-redef.c deleted file mode 100644 index 7e25d7f5a2..0000000000 --- a/test/PCH/macro-redef.c +++ /dev/null @@ -1,28 +0,0 @@ -// RUN: %clang_cc1 %s -emit-pch -o %t1.pch -verify -// RUN: %clang_cc1 %s -emit-pch -o %t2.pch -include-pch %t1.pch -verify -// RUN: %clang_cc1 -fsyntax-only %s -include-pch %t2.pch -verify - -// Test that a redefinition inside the PCH won't manifest as an ambiguous macro. -// rdar://13016031 - -#ifndef HEADER1 -#define HEADER1 - -#define M1 0 // expected-note {{previous}} -#define M1 1 // expected-warning {{redefined}} - -#define M2 3 - -#elif !defined(HEADER2) -#define HEADER2 - -#define M2 4 // expected-warning {{redefined}} - // expected-note@-6 {{previous}} - -#else - -// Use the error to verify it was parsed. -int x = M1; // expected-note {{previous}} -int x = M2; // expected-error {{redefinition}} - -#endif |