Skip to content

Commit 7f65cc2

Browse files
cyndyishidacyndyishida
authored
[clang][modules] rename "AST" to precompiled in diagnostic messages NFCI (#142635)
As follow up to: 883130e
1 parent f72054a commit 7f65cc2

19 files changed

+64
-62
lines changed

‎clang/include/clang/Basic/DiagnosticSerializationKinds.td

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ def err_fe_unable_to_read_pch_file : Error<
1313
"unable to read PCH file %0: '%1'">;
1414
def err_fe_not_a_pch_file : Error<
1515
"input is not a PCH file: '%0'">;
16-
def err_fe_pch_malformed : Error<
17-
"malformed or corrupted AST file: '%0'">, DefaultFatal;
16+
def err_fe_ast_file_malformed : Error<
17+
"malformed or corrupted precompiled file: '%0'">, DefaultFatal;
1818
def err_fe_pch_malformed_block : Error<
1919
"malformed block record in PCH file: '%0'">, DefaultFatal;
2020
def err_fe_ast_file_modified : Error<
2121
"file '%0' has been modified since the "
22-
"%select{precompiled header|module file|AST file}1 '%2' was built"
22+
"%select{precompiled header|module file|precompiled file}1 '%2' was built"
2323
": %select{size|mtime|content}3 changed%select{| (was %5, now %6)}4">,
2424
DefaultFatal;
2525
def err_fe_pch_file_overridden : Error<
@@ -31,19 +31,19 @@ def note_module_cache_path : Note<
3131
"after modifying system headers, please delete the module cache at '%0'">;
3232

3333
def err_ast_file_targetopt_mismatch : Error<
34-
"AST file '%0' was compiled for the %1 '%2' but the current translation "
34+
"precompiled file '%0' was compiled for the %1 '%2' but the current translation "
3535
"unit is being compiled for target '%3'">;
3636
def err_ast_file_targetopt_feature_mismatch : Error<
37-
"%select{AST file '%1' was|current translation unit is}0 compiled with the target "
38-
"feature '%2' but the %select{current translation unit is|AST file '%1' was}0 "
37+
"%select{precompiled file '%1' was|current translation unit is}0 compiled with the target "
38+
"feature '%2' but the %select{current translation unit is|precompiled file '%1' was}0 "
3939
"not">;
4040
def err_ast_file_langopt_mismatch : Error<"%0 was %select{disabled|enabled}1 in "
41-
"AST file '%3' but is currently %select{disabled|enabled}2">;
41+
"precompiled file '%3' but is currently %select{disabled|enabled}2">;
4242
def err_ast_file_langopt_value_mismatch : Error<
43-
"%0 differs in AST file '%1' vs. current file">;
43+
"%0 differs in precompiled file '%1' vs. current file">;
4444
def err_ast_file_diagopt_mismatch : Error<"%0 is currently enabled, but was not in "
45-
"the AST file '%1'">;
46-
def err_ast_file_modulecache_mismatch : Error<"AST file '%2' was compiled with module cache "
45+
"the precompiled file '%1'">;
46+
def err_ast_file_modulecache_mismatch : Error<"precompiled file '%2' was compiled with module cache "
4747
"path '%0', but the path is currently '%1'">;
4848
def warn_pch_vfsoverlay_mismatch : Warning<
4949
"PCH was compiled with different VFS overlay files than are currently in use">,
@@ -52,27 +52,27 @@ def note_pch_vfsoverlay_files : Note<"%select{PCH|current translation unit}0 has
5252
def note_pch_vfsoverlay_empty : Note<"%select{PCH|current translation unit}0 has no VFS overlays">;
5353

5454
def err_ast_file_version_too_old : Error<
55-
"%select{PCH|module|AST}0 file '%1' uses an older format that is no longer supported">;
55+
"%select{PCH|module|precompiled}0 file '%1' uses an older format that is no longer supported">;
5656
def err_ast_file_version_too_new : Error<
57-
"%select{PCH|module|AST}0 file '%1' uses a newer format that cannot be read">;
57+
"%select{PCH|module|precompiled }0 file '%1' uses a newer format that cannot be read">;
5858
def err_ast_file_different_branch : Error<
59-
"%select{PCH|module|AST}0 file '%1' built from a different branch (%2) than the compiler (%3)">;
59+
"%select{PCH|module|precompiled}0 file '%1' built from a different branch (%2) than the compiler (%3)">;
6060
def err_ast_file_with_compiler_errors : Error<
61-
"%select{PCH|module|AST}0 file '%1' contains compiler errors">;
61+
"%select{PCH|module|precompiled}0 file '%1' contains compiler errors">;
6262

6363
def err_module_file_conflict : Error<
6464
"module '%0' is defined in both '%1' and '%2'">, DefaultFatal;
6565
def err_ast_file_not_found : Error<
66-
"%select{PCH|module|AST}0 file '%1' not found%select{|: %3}2">, DefaultFatal;
66+
"%select{PCH|module|precompiled}0 file '%1' not found%select{|: %3}2">, DefaultFatal;
6767
def err_ast_file_out_of_date : Error<
68-
"%select{PCH|module|AST}0 file '%1' is out of date and "
68+
"%select{PCH|module|precompiled}0 file '%1' is out of date and "
6969
"needs to be rebuilt%select{|: %3}2">, DefaultFatal;
7070
def err_ast_file_invalid : Error<
71-
"file '%1' is not a valid precompiled %select{PCH|module|AST}0 file: %2">, DefaultFatal;
71+
"file '%1' is not a valid %select{PCH|module|precompiled}0 file: %2">, DefaultFatal;
7272
def note_module_file_imported_by : Note<
7373
"imported by %select{|module '%2' in }1'%0'">;
7474
def err_module_file_not_module : Error<
75-
"AST file '%0' was not built as a module">, DefaultFatal;
75+
"precompiled file '%0' was not built as a module">, DefaultFatal;
7676
def err_module_file_missing_top_level_submodule : Error<
7777
"module file '%0' is missing its top-level submodule">, DefaultFatal;
7878
def note_module_file_conflict : Note<
@@ -84,14 +84,14 @@ def remark_module_import : Remark<
8484
InGroup<ModuleImport>;
8585

8686
def err_imported_module_not_found : Error<
87-
"module '%0' in AST file '%1' %select{(imported by AST file '%2') |}4"
87+
"module '%0' in precompiled file '%1' %select{(imported by precompiled file '%2') |}4"
8888
"is not defined in any loaded module map file; "
8989
"maybe you need to load '%3'?">, DefaultFatal;
9090
def note_imported_by_pch_module_not_found : Note<
9191
"consider adding '%0' to the header search path">;
9292
def err_imported_module_modmap_changed : Error<
93-
"module '%0' %select{in|imported by}4 AST file '%1' found in a different module map file"
94-
" (%2) than when the importing AST file was built (%3)">, DefaultFatal;
93+
"module '%0' %select{in|imported by}4 precompiled file '%1' found in a different module map file"
94+
" (%2) than when the importing precompiled file was built (%3)">, DefaultFatal;
9595
def err_imported_module_relocated : Error<
9696
"module '%0' was built in directory '%1' but now resides in "
9797
"directory '%2'">, DefaultFatal;
@@ -100,18 +100,18 @@ def err_module_different_modmap : Error<
100100
"%select{| not}1 used when the module was built">;
101101

102102
def err_ast_file_macro_def_undef : Error<
103-
"macro '%0' was %select{defined|undef'd}1 in the AST file '%2' but "
103+
"macro '%0' was %select{defined|undef'd}1 in the precompiled file '%2' but "
104104
"%select{undef'd|defined}1 on the command line">;
105105
def err_ast_file_macro_def_conflict : Error<
106-
"definition of macro '%0' differs between the AST file '%3' ('%1') "
106+
"definition of macro '%0' differs between the precompiled file '%3' ('%1') "
107107
"and the command line ('%2')">;
108108
def err_ast_file_undef : Error<
109-
"%select{command line contains|AST file '%1' was built with}0 "
110-
"'-undef' but %select{AST file '%1' was not built with it|"
109+
"%select{command line contains|precompiled file '%1' was built with}0 "
110+
"'-undef' but %select{precompiled file '%1' was not built with it|"
111111
"it is not present on the command line}0">;
112112
def err_ast_file_pp_detailed_record : Error<
113-
"%select{command line contains|AST file '%1' was built with}0 "
114-
"'-detailed-preprocessing-record' but %select{AST file '%1' was not "
113+
"%select{command line contains|precompiled file '%1' was built with}0 "
114+
"'-detailed-preprocessing-record' but %select{precompiled file '%1' was not "
115115
"built with it|it is not present on the command line}0">;
116116

117117
def err_module_odr_violation_missing_decl : Error<

‎clang/lib/Serialization/ASTReader.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1532,7 +1532,7 @@ bool ASTReader::ReadSpecializations(ModuleFile &M, BitstreamCursor &Cursor,
15321532
}
15331533

15341534
void ASTReader::Error(StringRef Msg) const {
1535-
Error(diag::err_fe_pch_malformed, Msg);
1535+
Error(diag::err_fe_ast_file_malformed, Msg);
15361536
if (PP.getLangOpts().Modules &&
15371537
!PP.getHeaderSearchInfo().getModuleCachePath().empty()) {
15381538
Diag(diag::note_module_cache_path)
@@ -4953,20 +4953,21 @@ ASTReader::ASTReadResult ASTReader::ReadAST(StringRef FileName, ModuleKind Type,
49534953

49544954
static ASTFileSignature readASTFileSignature(StringRef PCH);
49554955

4956-
/// Whether \p Stream doesn't start with the AST/PCH file magic number 'CPCH'.
4956+
/// Whether \p Stream doesn't start with the AST file magic number 'CPCH'.
49574957
static llvm::Error doesntStartWithASTFileMagic(BitstreamCursor &Stream) {
49584958
// FIXME checking magic headers is done in other places such as
49594959
// SerializedDiagnosticReader and GlobalModuleIndex, but error handling isn't
49604960
// always done the same. Unify it all with a helper.
49614961
if (!Stream.canSkipToPos(4))
4962-
return llvm::createStringError(std::errc::illegal_byte_sequence,
4963-
"file too small to contain AST file magic");
4962+
return llvm::createStringError(
4963+
std::errc::illegal_byte_sequence,
4964+
"file too small to contain precompiled file magic");
49644965
for (unsigned C : {'C', 'P', 'C', 'H'})
49654966
if (Expected<llvm::SimpleBitstreamCursor::word_t> Res = Stream.Read(8)) {
49664967
if (Res.get() != C)
49674968
return llvm::createStringError(
49684969
std::errc::illegal_byte_sequence,
4969-
"file doesn't start with AST file magic");
4970+
"file doesn't start with precompiled file magic");
49704971
} else
49714972
return Res.takeError();
49724973
return llvm::Error::success();

‎clang/test/Modules/check-for-sanitizer-feature.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
//
4444
// Import the PCH without ASan enabled (we expect an error).
4545
// RUN: not %clang_cc1 -x c -include-pch %t.asan_pch %s -verify 2>&1 | FileCheck %s --check-prefix=PCH_MISMATCH
46-
// PCH_MISMATCH: AST file '{{.*}}.asan_pch' was compiled with the target feature '-fsanitize=address' but the current translation unit is not
46+
// PCH_MISMATCH: precompiled file '{{.*}}.asan_pch' was compiled with the target feature '-fsanitize=address' but the current translation unit is not
4747
//
4848
// Emit a PCH with UBSan enabled.
4949
// RUN: %clang_cc1 -x c -fsanitize=null %S/Inputs/check-for-sanitizer-feature/check.h -emit-pch -o %t.ubsan_pch

‎clang/test/Modules/cxx20-force-check-input.cppm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ module;
2929
export module a;
3030
export using ::foo;
3131

32-
// CHECK-HEADER-FAILURE: fatal error:{{.*}}foo.h' has been modified since the AST file {{.*}}was built
33-
// CHECK-FAILURE: fatal error:{{.*}}a.cppm' has been modified since the AST file {{.*}}was built
32+
// CHECK-HEADER-FAILURE: fatal error:{{.*}}foo.h' has been modified since the precompiled file {{.*}}was built
33+
// CHECK-FAILURE: fatal error:{{.*}}a.cppm' has been modified since the precompiled file {{.*}}was built

‎clang/test/Modules/explicit-build.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153
// RUN: -fmodule-file=%t/a.pch \
154154
// RUN: %s 2>&1 | FileCheck --check-prefix=CHECK-A-AS-PCH %s
155155
//
156-
// CHECK-A-AS-PCH: fatal error: AST file '{{.*}}a.pch' was not built as a module
156+
// CHECK-A-AS-PCH: fatal error: precompiled file '{{.*}}a.pch' was not built as a module
157157

158158
// -------------------------------
159159
// Try to import a non-AST file with -fmodule-file=
@@ -164,7 +164,7 @@
164164
// RUN: -fmodule-file=%t/not.pcm \
165165
// RUN: %s 2>&1 | FileCheck --check-prefix=CHECK-BAD-FILE %s
166166
//
167-
// CHECK-BAD-FILE: fatal error: file '{{.*}}not.pcm' is not a valid precompiled module file: file too small to contain AST file magic
167+
// CHECK-BAD-FILE: fatal error: file '{{.*}}not.pcm' is not a valid module file: file too small to contain precompiled file magic
168168

169169
// RUN: not %clang_cc1 -triple=x86_64-linux-gnu -x c++ -std=c++11 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -Rmodule-build -fno-modules-error-recovery \
170170
// RUN: -fmodule-file=%t/nonexistent.pcm \

‎clang/test/Modules/fatal-module-loader-error.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88

99
#ifdef IMPLICIT
1010

11-
// expected-error@+1{{Module.pcm' is not a valid precompiled module file}}
11+
// expected-error@+1{{Module.pcm' is not a valid module file}}
1212
#import <Module/Module.h>
1313
#pragma clang __debug crash;
1414

1515
#else
1616

17-
// expected-error@+1{{Module.pcm' is not a valid precompiled module file}}
17+
// expected-error@+1{{Module.pcm' is not a valid module file}}
1818
@import Module;
1919
#pragma clang __debug crash;
2020

‎clang/test/Modules/ignored_macros.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// RUN: %clang_cc1 -fmodules-cache-path=%t.modules -fmodules -fimplicit-module-maps -I %S/Inputs -emit-pch -o %t.pch -x objective-c-header %s -verify
1111
// RUN: not %clang_cc1 -fmodules-cache-path=%t.modules -DIGNORED=1 -fmodules -fimplicit-module-maps -I %S/Inputs -include-pch %t.pch %s > %t.err 2>&1
1212
// RUN: FileCheck -check-prefix=CHECK-CONFLICT %s < %t.err
13-
// CHECK-CONFLICT: AST file '{{.*}}' was compiled with module cache path
13+
// CHECK-CONFLICT: precompiled file '{{.*}}' was compiled with module cache path
1414

1515
// Third trial: pass -DIGNORED=1 only to the second invocation, but
1616
// make it ignored. There should be no failure, IGNORED is defined in

‎clang/test/Modules/load_failure.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// RUN: FileCheck -check-prefix=CHECK-FAILURE %s < %t.out
1616

1717
// FIXME: Clean up diagnostic text below and give it a location
18-
// CHECK-FAILURE: error: C99 was disabled in AST file '{{.*}}load_failure.pcm' but is currently enabled
18+
// CHECK-FAILURE: error: C99 was disabled in precompiled file '{{.*}}load_failure.pcm' but is currently enabled
1919
// FIXME: When we have a syntax for modules in C, use that.
2020

2121

‎clang/test/Modules/merge-target-features.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
// RUN: -target-cpu i386 \
2121
// RUN: -fsyntax-only merge-target-features.cpp 2>&1 \
2222
// RUN: | FileCheck --check-prefix=SUBSET --implicit-check-not=error: %s
23-
// SUBSET: error: AST file '{{.*}}foo.pcm' was compiled with the target feature '+sse2' but the current translation unit is not
23+
// SUBSET: error: precompiled file '{{.*}}foo.pcm' was compiled with the target feature '+sse2' but the current translation unit is not
2424
// SUBSET: error: {{.*}} configuration mismatch
2525
//
2626
// RUN: %clang_cc1 -fmodules -x c++ -fmodules-cache-path=%t \
@@ -57,8 +57,8 @@
5757
// RUN: -target-cpu i386 -target-feature +cx16 \
5858
// RUN: -fsyntax-only merge-target-features.cpp 2>&1 \
5959
// RUN: | FileCheck --check-prefix=MISMATCH --implicit-check-not=error: %s
60-
// MISMATCH: error: AST file '{{.*}}foo.pcm' was compiled with the target feature '+sse2' but the current translation unit is not
61-
// MISMATCH: error: current translation unit is compiled with the target feature '+cx16' but the AST file '{{.*}}foo.pcm' was not
60+
// MISMATCH: error: precompiled file '{{.*}}foo.pcm' was compiled with the target feature '+sse2' but the current translation unit is not
61+
// MISMATCH: error: current translation unit is compiled with the target feature '+cx16' but the precompiled file '{{.*}}foo.pcm' was not
6262
// MISMATCH: error: {{.*}} configuration mismatch
6363

6464
#include "foo.h"

‎clang/test/Modules/mismatch-diagnostics.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ export module mismatching_module;
2929

3030
//--- use.cpp
3131
import mismatching_module;
32-
// CHECK: error: POSIX thread support was enabled in AST file '{{.*[/|\\\\]}}mismatching_module.pcm' but is currently disabled
32+
// CHECK: error: POSIX thread support was enabled in precompiled file '{{.*[/|\\\\]}}mismatching_module.pcm' but is currently disabled
3333
// CHECK-NEXT: module file {{.*[/|\\\\]}}mismatching_module.pcm cannot be loaded due to a configuration mismatch with the current compilation

‎clang/test/Modules/module-imported-by-pch-path.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ void test() {
1212
(void)MyModuleVersion; // should be found by implicit import
1313
}
1414

15-
// CHECK: module 'MyModule' in AST file '{{.*MyModule.*pcm}}' (imported by AST file '[[PCH:.*header.pch]]') is not defined in any loaded module map file; maybe you need to load '[[PATH:.*folder-with-modulemap]]
15+
// CHECK: module 'MyModule' in precompiled file '{{.*MyModule.*pcm}}' (imported by precompiled file '[[PCH:.*header.pch]]') is not defined in any loaded module map file; maybe you need to load '[[PATH:.*folder-with-modulemap]]
1616
// CHECK: consider adding '[[PATH]]' to the header search path
1717
// CHECK: imported by '[[PCH]]'

‎clang/test/Modules/module-pch-different-cache-path.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414

1515
pch_int x = 0;
1616

17-
// CHECK-ERROR: AST file '{{.*}}' was compiled with module cache path '{{.*}}', but the path is currently '{{.*}}'
18-
// CHECK-SUCCESS-NOT: AST file '{{.*}}' was compiled with module cache path '{{.*}}', but the path is currently '{{.*}}'
17+
// CHECK-ERROR: precompiled file '{{.*}}' was compiled with module cache path '{{.*}}', but the path is currently '{{.*}}'
18+
// CHECK-SUCCESS-NOT: precompiled file '{{.*}}' was compiled with module cache path '{{.*}}', but the path is currently '{{.*}}'

‎clang/test/Modules/pr62359.cppm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ int use() {
4343
return 0;
4444
}
4545

46-
// CHECK: OpenMP{{.*}}differs in AST file '{{.*}}Hello.pcm' vs. current file
46+
// CHECK: OpenMP{{.*}}differs in precompiled file '{{.*}}Hello.pcm' vs. current file
4747

4848
//--- use2.cpp
4949
// expected-no-diagnostics
@@ -55,5 +55,5 @@ int use2() {
5555
return 0;
5656
}
5757

58-
// CHECK: OpenMP{{.*}}differs in AST file '{{.*}}Hello.pcm' vs. current file
58+
// CHECK: OpenMP{{.*}}differs in precompiled file '{{.*}}Hello.pcm' vs. current file
5959
// CHECK: use of undeclared identifier 'pragma'

‎clang/test/Modules/resolution-change.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111

1212
// Use the PCH with no way to resolve DependsOnA
1313
// RUN: not %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -include-pch %t-A.pch %s -fsyntax-only 2>&1 | FileCheck -check-prefix=CHECK-NODOA %s
14-
// CHECK-NODOA: module 'DependsOnA' in AST file '{{.*DependsOnA.*pcm}}' (imported by AST file '{{.*A.pch}}') is not defined in any loaded module map
14+
// CHECK-NODOA: module 'DependsOnA' in precompiled file '{{.*DependsOnA.*pcm}}' (imported by precompiled file '{{.*A.pch}}') is not defined in any loaded module map
1515

1616
// Use the PCH with no way to resolve A
1717
// RUN: not %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -I %S/Inputs/modules-with-same-name/DependsOnA -include-pch %t-A.pch %s -fsyntax-only 2>&1 | FileCheck -check-prefix=CHECK-NOA %s
18-
// CHECK-NOA: module 'A' in AST file '{{.*A.*pcm}}' (imported by AST file '{{.*DependsOnA.*pcm}}') is not defined in any loaded module map
18+
// CHECK-NOA: module 'A' in precompiled file '{{.*A.*pcm}}' (imported by precompiled file '{{.*DependsOnA.*pcm}}') is not defined in any loaded module map
1919

2020
// Use the PCH and have it resolve to the other A
2121
// RUN: not %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -I %S/Inputs/modules-with-same-name/DependsOnA -I %S/Inputs/modules-with-same-name/path2/A -include-pch %t-A.pch %s -fsyntax-only 2>&1 | FileCheck -check-prefix=CHECK-WRONGA %s

‎clang/test/PCH/arc.m

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// REQUIRES: x86-registered-target
22
// Test this without pch.
3+
34
// RUN: %clang_cc1 -fblocks -triple x86_64-apple-darwin11 -fobjc-arc -include %S/Inputs/arc.h -emit-llvm-only %s
45

56
// Test with pch.
@@ -14,5 +15,5 @@
1415
array0 a0;
1516
array1 a1;
1617

17-
// CHECK-ERR1: Objective-C automated reference counting was enabled in AST file '{{.*}}' but is currently disabled
18-
// CHECK-ERR2: Objective-C automated reference counting was disabled in AST file '{{.*}}' but is currently enabled
18+
// CHECK-ERR1: Objective-C automated reference counting was enabled in precompiled file '{{.*}}' but is currently disabled
19+
// CHECK-ERR2: Objective-C automated reference counting was disabled in precompiled file '{{.*}}' but is currently enabled

‎clang/test/PCH/fuzzy-pch.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ BAR bar = 17;
2424
# error BAR was not defined
2525
#endif
2626

27-
// CHECK-FOO: definition of macro 'FOO' differs between the AST file '{{.*}}' ('1') and the command line ('blah')
28-
// CHECK-NOFOO: macro 'FOO' was defined in the AST file '{{.*}}' but undef'd on the command line
27+
// CHECK-FOO: definition of macro 'FOO' differs between the precompiled file '{{.*}}' ('1') and the command line ('blah')
28+
// CHECK-NOFOO: macro 'FOO' was defined in the precompiled file '{{.*}}' but undef'd on the command line
2929

30-
// CHECK-UNDEF: command line contains '-undef' but AST file '{{.*}}' was not built with it
30+
// CHECK-UNDEF: command line contains '-undef' but precompiled file '{{.*}}' was not built with it
3131

‎clang/test/PCH/module-hash-difference.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
// RUN: not %clang_cc1 -fsyntax-only -include-pch %t.pch %s -I %S/Inputs/modules -fmodules -fimplicit-module-maps -fmodules-cache-path=%t.mcp -fdisable-module-hash 2> %t.err
55
// RUN: FileCheck -input-file=%t.err %s
66

7-
// CHECK: error: AST file '{{.*}}' was compiled with module cache path {{.*}}, but the path is currently {{.*}}
7+
// CHECK: error: precompiled file '{{.*}}' was compiled with module cache path {{.*}}, but the path is currently {{.*}}
88
@import Foo;

‎clang/test/PCH/ms-pch-macro.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ BAR bar = 17;
3333
# error BAR was not defined
3434
#endif
3535

36-
// CHECK-FOO: definition of macro 'FOO' differs between the AST file '{{.*}}1.pch' ('1') and the command line ('blah')
37-
// CHECK-NOFOO: macro 'FOO' was defined in the AST file '{{.*}}1.pch' but undef'd on the command line
36+
// CHECK-FOO: definition of macro 'FOO' differs between the precompiled file '{{.*}}1.pch' ('1') and the command line ('blah')
37+
// CHECK-NOFOO: macro 'FOO' was defined in the precompiled file '{{.*}}1.pch' but undef'd on the command line
3838

3939
// expected-warning@2 {{definition of macro 'BAR' does not match definition in precompiled header}}

0 commit comments

Comments
 (0)