Skip to content

Commit e22fa1d

Browse files
ChuanqiXu9ChuanqiXu9
committed
[C++20] [Modules] Emit a warning if the we load the modules by implicit generated path
A step to address #62707. It is not user friendly enough to drop the implicitly generated path directly. Let's emit the warning first and drop it in the next version.
1 parent ed90cf1 commit e22fa1d

17 files changed

+94
-32
lines changed

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

+5
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,11 @@ def warn_eagerly_load_for_standard_cplusplus_modules : Warning<
133133
"the form '-fmodule-file=<BMI-path>' is deprecated for standard C++ named modules;"
134134
"consider to use '-fmodule-file=<module-name>=<BMI-path>' instead">,
135135
InGroup<DiagGroup<"eager-load-cxx-named-modules">>;
136+
137+
def warn_reading_std_cxx_module_by_implicit_paths : Warning<
138+
"it is deprecated to read module '%0' implcitly; it is going to be removed in clang18; "
139+
"consider to specify the dependencies explicitly">,
140+
InGroup<DiagGroup<"read-modules-implicitly">>;
136141
} // let CategoryName
137142

138143
let CategoryName = "AST Serialization Issue" in {

‎clang/lib/Serialization/ASTReader.cpp

+18-9
Original file line numberDiff line numberDiff line change
@@ -2874,6 +2874,8 @@ ASTReader::ReadControlBlock(ModuleFile &F,
28742874
while (Idx < N) {
28752875
// Read information about the AST file.
28762876
ModuleKind ImportedKind = (ModuleKind)Record[Idx++];
2877+
// Whether we're importing a standard c++ module.
2878+
bool IsImportingStdCXXModule = Record[Idx++];
28772879
// The import location will be the local one for now; we will adjust
28782880
// all import locations of module imports after the global source
28792881
// location info are setup, in ReadAST.
@@ -2891,18 +2893,25 @@ ASTReader::ReadControlBlock(ModuleFile &F,
28912893

28922894
// For prebuilt and explicit modules first consult the file map for
28932895
// an override. Note that here we don't search prebuilt module
2894-
// directories, only the explicit name to file mappings. Also, we will
2895-
// still verify the size/signature making sure it is essentially the
2896-
// same file but perhaps in a different location.
2896+
// directories if we're not importing standard c++ module, only the
2897+
// explicit name to file mappings. Also, we will still verify the
2898+
// size/signature making sure it is essentially the same file but
2899+
// perhaps in a different location.
28972900
if (ImportedKind == MK_PrebuiltModule || ImportedKind == MK_ExplicitModule)
28982901
ImportedFile = PP.getHeaderSearchInfo().getPrebuiltModuleFileName(
2899-
ImportedName, /*FileMapOnly*/ true);
2902+
ImportedName, /*FileMapOnly*/ !IsImportingStdCXXModule);
2903+
2904+
if (ImportedFile.empty()) {
2905+
// It is deprecated for C++20 Named modules to use the implicitly
2906+
// paths.
2907+
if (IsImportingStdCXXModule)
2908+
Diag(clang::diag::warn_reading_std_cxx_module_by_implicit_paths)
2909+
<< ImportedName;
29002910

2901-
if (ImportedFile.empty())
29022911
// Use BaseDirectoryAsWritten to ensure we use the same path in the
29032912
// ModuleCache as when writing.
29042913
ImportedFile = ReadPath(BaseDirectoryAsWritten, Record, Idx);
2905-
else
2914+
} else
29062915
SkipPath(Record, Idx);
29072916

29082917
// If our client can't cope with us being out of date, we can't cope with
@@ -5445,9 +5454,9 @@ bool ASTReader::readASTFileControlBlock(
54455454
unsigned Idx = 0, N = Record.size();
54465455
while (Idx < N) {
54475456
// Read information about the AST file.
5448-
Idx +=
5449-
1 + 1 + 1 + 1 +
5450-
ASTFileSignature::size; // Kind, ImportLoc, Size, ModTime, Signature
5457+
5458+
// Kind, StandardCXXModule, ImportLoc, Size, ModTime, Signature
5459+
Idx += 1 + 1 + 1 + 1 + 1 + ASTFileSignature::size;
54515460
std::string ModuleName = ReadString(Record, Idx);
54525461
std::string Filename = ReadString(Record, Idx);
54535462
ResolveImportedPath(Filename, ModuleDir);

‎clang/lib/Serialization/ASTWriter.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -1352,6 +1352,7 @@ void ASTWriter::WriteControlBlock(Preprocessor &PP, ASTContext &Context,
13521352
continue;
13531353

13541354
Record.push_back((unsigned)M.Kind); // FIXME: Stable encoding
1355+
Record.push_back(M.StandardCXXModule);
13551356
AddSourceLocation(M.ImportLoc, Record);
13561357

13571358
// If we have calculated signature, there is no need to store

‎clang/lib/Serialization/GlobalModuleIndex.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -634,6 +634,9 @@ llvm::Error GlobalModuleIndexBuilder::loadModuleFile(const FileEntry *File) {
634634
// Skip the imported kind
635635
++Idx;
636636

637+
// Skip if it is standard C++ module
638+
++Idx;
639+
637640
// Skip the import location
638641
++Idx;
639642

‎clang/test/CXX/basic/basic.lookup/basic.lookup.argdep/p5-ex2.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// RUN: -fmodule-file=M=M.pcm
99
// RUN: %clang_cc1 -std=c++20 Q.cpp -emit-module-interface -o Q.pcm
1010
// RUN: %clang_cc1 -std=c++20 Q-impl.cpp -fsyntax-only -fmodule-file=Q=Q.pcm \
11-
// RUN: -fmodule-file=N=N.pcm -verify
11+
// RUN: -fmodule-file=N=N.pcm -fmodule-file=M=M.pcm -verify
1212

1313
//--- M.cpp
1414
export module M;

‎clang/test/CXX/module/basic/basic.search/module-import.cppm

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// RUN: %clang_cc1 -std=c++20 -I%t -fmodule-file=x=%t/x.pcm -verify %t/use.cpp \
1111
// RUN: -DMODULE_NAME=x
1212
// RUN: %clang_cc1 -std=c++20 -I%t -fmodule-file=y=%t/y.pcm -verify %t/use.cpp \
13-
// RUN: -DMODULE_NAME=y
13+
// RUN: -DMODULE_NAME=y -fmodule-file=x=%t/x.pcm
1414
//
1515
// RUN: mv %t/x.pcm %t/a.pcm
1616
//

‎clang/test/CXX/module/module.context/p7.cpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@
1212
// RUN: -o stuff.pcm
1313

1414
// RUN: %clang_cc1 -std=c++20 -emit-module-interface std-10-6-ex1-M1.cpp \
15-
// RUN: -fmodule-file=stuff=stuff.pcm -o M1.pcm -fmodule-file=defn.pcm
15+
// RUN: -fmodule-file=stuff=stuff.pcm -o M1.pcm -fmodule-file=defn.pcm
1616

1717
// RUN: %clang_cc1 -std=c++20 -emit-module-interface std-10-6-ex1-M2.cpp \
18-
// RUN: -fmodule-file=stuff=stuff.pcm -o M2.pcm -fmodule-file=decl.pcm
18+
// RUN: -fmodule-file=stuff=stuff.pcm -o M2.pcm -fmodule-file=decl.pcm
1919

2020
// RUN: %clang_cc1 -std=c++20 std-10-6-ex1-use.cpp \
21-
// RUN: -fmodule-file=M1=M1.pcm -fmodule-file=M2=M2.pcm -fsyntax-only -verify
21+
// RUN: -fmodule-file=M1=M1.pcm -fmodule-file=M2=M2.pcm -fmodule-file=stuff=stuff.pcm \
22+
// RUN: -fsyntax-only -verify
2223

2324
//--- std-10-6-ex1-decl.h
2425
struct X;

‎clang/test/CXX/module/module.interface/p2.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
// RUN: %clang_cc1 -std=c++20 %s -DX_INTERFACE -emit-module-interface -o %t/x.pcm
55
// RUN: %clang_cc1 -std=c++20 %s -DY_INTERFACE -emit-module-interface -o %t/y.pcm
66
// RUN: %clang_cc1 -std=c++20 %s -DINTERFACE -fmodule-file=X=%t/x.pcm -fmodule-file=Y=%t/y.pcm -emit-module-interface -o %t/m.pcm
7-
// RUN: %clang_cc1 -std=c++20 %s -DIMPLEMENTATION -I%S/Inputs -fmodule-file=%t/h.pcm -fmodule-file=p2=%t/m.pcm -verify
8-
// RUN: %clang_cc1 -std=c++20 %s -DUSER -I%S/Inputs -fmodule-file=%t/h.pcm -fmodule-file=p2=%t/m.pcm -verify
7+
// RUN: %clang_cc1 -std=c++20 %s -DIMPLEMENTATION -I%S/Inputs -fmodule-file=%t/h.pcm \
8+
// RUN: -fmodule-file=X=%t/x.pcm -fmodule-file=Y=%t/y.pcm -fmodule-file=p2=%t/m.pcm -verify
9+
// RUN: %clang_cc1 -std=c++20 %s -DUSER -I%S/Inputs -fmodule-file=%t/h.pcm -fmodule-file=p2=%t/m.pcm \
10+
// RUN: -fmodule-file=X=%t/x.pcm -fmodule-file=Y=%t/y.pcm -verify
911

1012
#if defined(X_INTERFACE)
1113
export module X;

‎clang/test/Modules/cxx20-10-1-ex2.cpp

+7-6
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,23 @@
77
// RUN: -o %t/B_Y.pcm
88

99
// RUN: %clang_cc1 -std=c++20 -emit-module-interface %t/std10-1-ex2-tu2.cpp \
10-
// RUN: -fmodule-file=B:Y=%t/B_Y.pcm -o %t/B.pcm
10+
// RUN: -fmodule-file=B:Y=%t/B_Y.pcm -o %t/B.pcm
1111

1212
// RUN: %clang_cc1 -std=c++20 -emit-module-interface %t/std10-1-ex2-tu3.cpp \
13-
// RUN: -o %t/B_X1.pcm -verify
13+
// RUN: -o %t/B_X1.pcm -verify
1414

1515
// RUN: %clang_cc1 -std=c++20 -emit-module-interface %t/std10-1-ex2-tu4.cpp \
16-
// RUN:-fmodule-file=B=%t/B.pcm -o %t/B_X2.pcm
16+
// RUN: -fmodule-file=B=%t/B.pcm -fmodule-file=B:Y=%t/B_Y.pcm -o %t/B_X2.pcm
1717

1818
// RUN: %clang_cc1 -std=c++20 -emit-obj %t/std10-1-ex2-tu5.cpp \
19-
// RUN: -fmodule-file=B=%t/B.pcm -o %t/b_tu5.o
19+
// RUN: -fmodule-file=B=%t/B.pcm -fmodule-file=B:Y=%t/B_Y.pcm -o %t/b_tu5.o
2020

2121
// RUN: %clang_cc1 -std=c++20 -S %t/std10-1-ex2-tu6.cpp \
22-
// RUN: -fmodule-file=B=%t/B.pcm -o %t/b_tu6.s -verify
22+
// RUN: -fmodule-file=B=%t/B.pcm -fmodule-file=B:Y=%t/B_Y.pcm -o %t/b_tu6.s -verify
2323

2424
// RUN: %clang_cc1 -std=c++20 -emit-module-interface %t/std10-1-ex2-tu7.cpp \
25-
// RUN: -fmodule-file=B:X2=%t/B_X2.pcm -o %t/B_X3.pcm -verify
25+
// RUN: -fmodule-file=B:X2=%t/B_X2.pcm -fmodule-file=B=%t/B.pcm \
26+
// RUN: -fmodule-file=B:Y=%t/B_Y.pcm -o %t/B_X3.pcm -verify
2627

2728
//--- std10-1-ex2-tu1.cpp
2829
module B:Y;

‎clang/test/Modules/cxx20-import-diagnostics-a.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
// RUN: -fmodule-file=B=%t/B.pcm -fmodule-file=C=%t/C.pcm -o %t/AOK1.pcm
1313

1414
// RUN: %clang_cc1 -std=c++20 -S %t/import-diags-tu4.cpp \
15-
// RUN: -fmodule-file=AOK1=%t/AOK1.pcm -fmodule-file=C=%t/C.pcm -o %t/tu_3.s -verify
15+
// RUN: -fmodule-file=AOK1=%t/AOK1.pcm -fmodule-file=B=%t/B.pcm \
16+
// RUN: -fmodule-file=C=%t/C.pcm -o %t/tu_3.s -verify
1617

1718
// RUN: %clang_cc1 -std=c++20 -emit-module-interface %t/import-diags-tu5.cpp \
1819
// RUN: -fmodule-file=B=%t/B.pcm -fmodule-file=C=%t/C.pcm -o %t/BC.pcm -verify

‎clang/test/Modules/eagerly-load-cxx-named-modules.cppm

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
// RUN: 2>&1 | FileCheck %t/user.cpp
88
// RUN: %clang_cc1 -std=c++20 %t/b.cppm -emit-module-interface -o %t/b.pcm \
99
// RUN: -fprebuilt-module-path=%t
10-
// RUN: %clang_cc1 -std=c++20 %t/b.pcm -S -emit-llvm 2>&1 -o - | FileCheck %t/b.cppm
10+
// RUN: %clang_cc1 -std=c++20 %t/b.pcm -Wno-read-modules-implicitly -S \
11+
// RUN: -emit-llvm 2>&1 -o - | FileCheck %t/b.cppm
1112

1213
//--- a.cppm
1314
export module a;

‎clang/test/Modules/implicit-module-with-missing-path.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// RUN: echo -e "export module B;\nimport C;" >> %t/B.cppm
77
// RUN: %clang_cc1 -std=c++20 -emit-module-interface %t/subdir/C.cppm -o %t/subdir/C.pcm
88
// RUN: %clang_cc1 -std=c++20 -emit-module-interface -fprebuilt-module-path=%t/subdir %t/B.cppm -o %t/B.pcm
9-
// RUN: %clang_cc1 -std=c++20 -fprebuilt-module-path=%t %s -fsyntax-only -verify
9+
// RUN: %clang_cc1 -std=c++20 -fprebuilt-module-path=%t %s -fsyntax-only -verify -Wno-read-modules-implicitly
1010

1111
import B;
1212
import C; // expected-error {{module 'C' is needed but has not been provided, and implicit use of module files is disabled}}

‎clang/test/Modules/named-modules-adl-2.cppm

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//
55
// RUN: %clang_cc1 -std=c++20 %t/a.cppm -emit-module-interface -o %t/a.pcm
66
// RUN: %clang_cc1 -std=c++20 %t/b.cppm -fmodule-file=a=%t/a.pcm -emit-module-interface -o %t/b.pcm
7-
// RUN: %clang_cc1 -std=c++20 %t/c.cppm -fmodule-file=b=%t/b.pcm -fsyntax-only -verify
7+
// RUN: %clang_cc1 -std=c++20 %t/c.cppm -fmodule-file=a=%t/a.pcm -fmodule-file=b=%t/b.pcm -fsyntax-only -verify
88

99
//--- a.cppm
1010
export module a;

‎clang/test/Modules/no-implicit-std-cxx-module.cppm

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
// RUN: rm -rf %t
2+
// RUN: split-file %s %t
3+
// RUN: cd %t
4+
//
5+
// RUN: %clang_cc1 -std=c++20 -emit-module-interface %t/b.cppm -o %t/b.pcm
6+
// RUN: %clang_cc1 -std=c++20 -emit-module-interface %t/a.cppm -fmodule-file=b=%t/b.pcm \
7+
// RUN: -o %t/a.pcm
8+
// RUN: %clang_cc1 -std=c++20 %t/user.cpp -fmodule-file=a=%t/a.pcm -verify -fsyntax-only
9+
// RUN: %clang_cc1 -std=c++20 %t/user.cpp -fmodule-file=a=%t/a.pcm -verify -fsyntax-only \
10+
// RUN: -Wno-read-modules-implicitly -DNO_DIAG
11+
// RUN: %clang_cc1 -std=c++20 %t/user.cpp -fmodule-file=a=%t/a.pcm -fmodule-file=b=%t/b.pcm \
12+
// RUN: -DNO_DIAG -verify -fsyntax-only
13+
14+
//--- b.cppm
15+
export module b;
16+
export int b() {
17+
return 43;
18+
}
19+
20+
//--- a.cppm
21+
export module a;
22+
import b;
23+
export int a() {
24+
return b() + 43;
25+
}
26+
27+
//--- user.cpp
28+
#ifdef NO_DIAG
29+
// expected-no-diagnostics
30+
#else
31+
// expected-warning@+2 {{it is deprecated to read module 'b' implcitly;}}
32+
#endif
33+
import a;
34+
int use() {
35+
return a();
36+
}

‎clang/test/Modules/pr56916.cppm

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
// RUN: %clang_cc1 -std=c++20 %t/B.cppm -emit-module-interface -o %t/M-B.pcm
77
// RUN: %clang_cc1 -std=c++20 %t/M.cppm -emit-module-interface -o %t/M.pcm \
88
// RUN: -fprebuilt-module-path=%t
9-
// RUN: %clang_cc1 -std=c++20 %t/Use.cpp -fmodule-file=M=%t/M.pcm -fsyntax-only \
10-
// RUN: -verify
9+
// RUN: %clang_cc1 -std=c++20 %t/Use.cpp -fsyntax-only -fprebuilt-module-path=%t -verify
1110

1211
//--- foo.h
1312
template <typename T>

‎clang/test/Modules/pr60036.cppm

+5-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,12 @@
1717
// RUN: %clang_cc1 -std=c++20 %t/b.cppm -emit-module-interface -fmodule-file=a=%t/a.pcm -o %t/b.pcm
1818
// RUN: %clang_cc1 -std=c++20 %t/c.cppm -emit-module-interface -fmodule-file=a=%t/a.pcm -o %t/c.pcm
1919
// RUN: %clang_cc1 -std=c++20 %t/d.cppm -emit-module-interface -o %t/d.pcm
20-
// RUN: %clang_cc1 -std=c++20 %t/e.cppm -emit-module-interface -fmodule-file=d=%t/d.pcm -o %t/e.pcm
20+
// RUN: %clang_cc1 -std=c++20 %t/e.cppm -emit-module-interface -fmodule-file=a=%t/a.pcm -fmodule-file=b=%t/b.pcm \
21+
// RUN: -fmodule-file=c=%t/c.pcm -fmodule-file=d=%t/d.pcm -o %t/e.pcm
2122
// RUN: %clang_cc1 -std=c++20 %t/f.cppm -emit-module-interface -fmodule-file=a=%t/a.pcm -fmodule-file=b=%t/b.pcm -fmodule-file=c=%t/c.pcm -fmodule-file=d=%t/d.pcm -o %t/f.pcm
22-
// RUN: %clang_cc1 -std=c++20 %t/g.cppm -fmodule-file=e=%t/e.pcm -fmodule-file=f=%t/f.pcm -verify -fsyntax-only
23+
// RUN: %clang_cc1 -std=c++20 %t/g.cppm -fmodule-file=a=%t/a.pcm -fmodule-file=b=%t/b.pcm \
24+
// RUN: -fmodule-file=c=%t/c.pcm -fmodule-file=d=%t/d.pcm -fmodule-file=e=%t/e.pcm \
25+
// RUN: -fmodule-file=f=%t/f.pcm -verify -fsyntax-only
2326

2427
//--- a.cppm
2528
export module a;

‎clang/test/Modules/pr60775.cppm

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
// RUN: %clang_cc1 -std=c++20 %t/b.cpp -fmodule-file=a=%t/a.pcm -verify -fsyntax-only
99
// RUN: %clang_cc1 -std=c++20 %t/c.cppm -I%t -emit-module-interface -o %t/c.pcm
1010
// RUN: %clang_cc1 -std=c++20 %t/d.cppm -emit-module-interface -fmodule-file=c=%t/c.pcm -o %t/d.pcm
11-
// RUN: %clang_cc1 -std=c++20 %t/e.cpp -fmodule-file=d=%t/d.pcm -verify -fsyntax-only
11+
// RUN: %clang_cc1 -std=c++20 %t/e.cpp -fmodule-file=d=%t/d.pcm -fmodule-file=c=%t/c.pcm -verify -fsyntax-only
1212
// RUN: %clang_cc1 -std=c++20 %t/f.cppm -emit-module-interface -fmodule-file=c=%t/c.pcm -o %t/f.pcm
13-
// RUN: %clang_cc1 -std=c++20 %t/g.cpp -fmodule-file=f=%t/f.pcm -verify -fsyntax-only
13+
// RUN: %clang_cc1 -std=c++20 %t/g.cpp -fmodule-file=f=%t/f.pcm -fmodule-file=c=%t/c.pcm -verify -fsyntax-only
1414

1515
//--- initializer_list.h
1616
namespace std {

0 commit comments

Comments
 (0)