diff options
| author | Yaxun Liu <Yaxun.Liu@amd.com> | 2016-09-07 18:40:20 +0000 |
|---|---|---|
| committer | Yaxun Liu <Yaxun.Liu@amd.com> | 2016-09-07 18:40:20 +0000 |
| commit | 2807f026db5bd56d92704d6568424cc7b6849e09 (patch) | |
| tree | 1a83b3f09c5638025a8d66f76efddfa240de7877 /test/PCH | |
| parent | 8a4ab9f7f73f68949bb7095bf2322c51d94fd36c (diff) | |
Do not validate pch when -fno-validate-pch is set
There is a bug causing pch to be validated even though -fno-validate-pch is set. This patch fixes it.
ASTReader relies on ASTReaderListener to initialize SuggestedPredefines, which is required for compilations using PCH. Before this change, PCHValidator is the default ASTReaderListener. After this change, when -fno-validate-pch is set, PCHValidator is disabled, but we need a replacement ASTReaderListener to initialize SuggestedPredefines. Class SimpleASTReaderListener is implemented for this purpose.
This change only affects -fno-validate-pch. There is no functional change if -fno-validate-pch is not set.
If -fno-validate-pch is not set, conflicts in predefined macros between pch and current compiler instance causes error.
If -fno-validate-pch is set, predefine macros in current compiler override those in pch so that compilation can continue.
Differential Revision: https://reviews.llvm.org/D24054
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@280842 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/PCH')
| -rw-r--r-- | test/PCH/no-validate-pch.cl | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/test/PCH/no-validate-pch.cl b/test/PCH/no-validate-pch.cl new file mode 100644 index 0000000000..26c5fd5cc0 --- /dev/null +++ b/test/PCH/no-validate-pch.cl @@ -0,0 +1,39 @@ +// RUN: %clang_cc1 -emit-pch -D TWO=2 -D X=4 -o %t %s -triple spir-unknown-unknown +// RUN: %clang_cc1 -include-pch %t -D THREE=3 -D X=5 -O0 -U__OPTIMIZE__ -fno-validate-pch %s -triple spir-unknown-unknown 2>&1 | FileCheck %s +// RUN: not %clang_cc1 -include-pch %t -D THREE=3 -D X=5 -D VALIDATE -O0 -fsyntax-only %s -triple spir-unknown-unknown 2>&1 | FileCheck --check-prefix=CHECK-VAL %s + +#ifndef HEADER +#define HEADER +// Header. + +#define ONE 1 + +#else +// Using the header. + +// CHECK: warning: 'X' macro redefined +// CHECK: #define X 5 +// CHECK: note: previous definition is here +// CHECK: #define X 4 + +// CHECK-VAL: error: __OPTIMIZE__ predefined macro was enabled in PCH file but is currently disabled +// CHECK-VAL: error: definition of macro 'X' differs between the precompiled header ('4') and the command line ('5') + +void test(void) { + int a = ONE; + int b = TWO; + int c = THREE; + +#ifndef VALIDATE +#if X != 5 +#error Definition of X is not overridden! +#endif + +#ifdef __OPTIMIZE__ +#error Optimization is not off! +#endif +#endif + +} + +#endif |