Skip to content

Commit 2cde5be

Browse files
naveen-sethnaveen-seth
committed
"module-name" -> "named-module"
The corresponding variable name is also updated as it was also introduced in this PR.
1 parent 1b4e90e commit 2cde5be

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

‎clang/test/ClangScanDeps/modules-full-named-modules.cppm‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// This check that clang-scan-deps properly outputs named module dependencies
1+
// This checks that clang-scan-deps properly outputs named module dependencies
22
// when using the the scanning output format 'experimental-full'.
33
//
44
// See commit 72304.
@@ -81,7 +81,7 @@ export void Hello();
8181
// CHECK-NEXT: {
8282
// CHECK: "commands": [
8383
// CHECK-NEXT: {
84-
// CHECK: "module-name": "M"
84+
// CHECK: "named-module": "M"
8585
// CHECK-NEXT: "named-module-deps": [
8686
// CHECK-NEXT: "M:interface_part",
8787
// CHECK-NEXT: "M:impl_part"
@@ -118,7 +118,7 @@ void Hello() {
118118
// CHECK-NEXT: {
119119
// CHECK: "commands": [
120120
// CHECK-NEXT: {
121-
// CHECK-NOT: "module-name":
121+
// CHECK-NOT: "named-module":
122122
// CHECK: "named-module-deps": [
123123
// CHECK-NEXT: "M"
124124
// CHECK-NEXT: ]
@@ -150,7 +150,7 @@ void World() {
150150
// CHECK-NEXT: {
151151
// CHECK: "commands": [
152152
// CHECK-NEXT: {
153-
// CHECK: "module-name": "M:impl_part"
153+
// CHECK: "named-module": "M:impl_part"
154154
// CHECK-NEXT: "named-module-deps": [
155155
// CHECK-NEXT: "M:interface_part"
156156
// CHECK-NEXT: ]
@@ -161,7 +161,7 @@ void World() {
161161
// CHECK: "input-file": "[[PREFIX]]/impl_part.cppm"
162162
// CHECK: },
163163
// CHECK-NEXT: {
164-
// CHECK: "module-name": "M:impl_part"
164+
// CHECK: "named-module": "M:impl_part"
165165
// CHECK-NEXT: "named-module-deps": [
166166
// CHECK-NEXT: "M:interface_part"
167167
// CHECK-NEXT: ]
@@ -186,7 +186,7 @@ export void World();
186186
// CHECK-NEXT: {
187187
// CHECK: "commands": [
188188
// CHECK-NEXT: {
189-
// CHECK: "module-name": "M:interface_part"
189+
// CHECK: "named-module": "M:interface_part"
190190
// CHECK-NOT: "named-module-deps": []
191191
// CHECK: "command-line": [
192192
// CHECK: "-o",
@@ -195,7 +195,7 @@ export void World();
195195
// CHECK: "input-file": "[[PREFIX]]/interface_part.cppm"
196196
// CHECK: },
197197
// CHECK-NEXT: {
198-
// CHECK: "module-name": "M:interface_part"
198+
// CHECK: "named-module": "M:interface_part"
199199
// CHECK-NOT: "named-module-deps": []
200200
// CHECK: "command-line": [
201201
// CHECK: "-o",
@@ -223,7 +223,7 @@ int main() {
223223
// CHECK-NEXT: {
224224
// CHECK-NEXT: "commands": [
225225
// CHECK-NEXT: {
226-
// CHECK-NOT: "module-name":
226+
// CHECK-NOT: "named-module":
227227
// CHECK: "named-module-deps": [
228228
// CHECK-NEXT: "M"
229229
// CHECK-NEXT: "third_party_module"
@@ -248,7 +248,7 @@ int main() {
248248
// CHECK-NEXT: {
249249
// CHECK: "commands": [
250250
// CHECK-NEXT: {
251-
// CHECK: "module-name": "M"
251+
// CHECK: "named-module": "M"
252252
// CHECK-NEXT: "named-module-deps": [
253253
// CHECK-NEXT: "M:interface_part",
254254
// CHECK-NEXT: "M:impl_part"
@@ -267,7 +267,7 @@ int main() {
267267
// CHECK: "input-file": "[[PREFIX]]/M.cppm"
268268
// CHECK: },
269269
// CHECK: {
270-
// CHECK-NOT: "module-name":
270+
// CHECK-NOT: "named-module":
271271
// CHECK: "named-module-deps": [
272272
// CHECK-NEXT: "M"
273273
// CHECK-NEXT: ]
@@ -282,7 +282,7 @@ int main() {
282282
// CHECK-NEXT: {
283283
// CHECK: "commands": [
284284
// CHECK-NEXT: {
285-
// CHECK: "module-name": "M:impl_part"
285+
// CHECK: "named-module": "M:impl_part"
286286
// CHECK-NEXT: "named-module-deps": [
287287
// CHECK-NEXT: "M:interface_part"
288288
// CHECK-NEXT: ]
@@ -293,7 +293,7 @@ int main() {
293293
// CHECK: "input-file": "[[PREFIX]]/impl_part.cppm"
294294
// CHECK: },
295295
// CHECK-NEXT: {
296-
// CHECK: "module-name": "M:impl_part"
296+
// CHECK: "named-module": "M:impl_part"
297297
// CHECK-NEXT: "named-module-deps": [
298298
// CHECK-NEXT: "M:interface_part"
299299
// CHECK-NEXT: ]
@@ -308,7 +308,7 @@ int main() {
308308
// CHECK-NEXT: {
309309
// CHECK: "commands": [
310310
// CHECK-NEXT: {
311-
// CHECK: "module-name": "M:interface_part"
311+
// CHECK: "named-module": "M:interface_part"
312312
// CHECK-NOT: "named-module-deps": []
313313
// CHECK: "command-line": [
314314
// CHECK: "-o",
@@ -317,7 +317,7 @@ int main() {
317317
// CHECK: "input-file": "[[PREFIX]]/interface_part.cppm"
318318
// CHECK: },
319319
// CHECK-NEXT: {
320-
// CHECK: "module-name": "M:interface_part"
320+
// CHECK: "named-module": "M:interface_part"
321321
// CHECK-NOT: "named-module-deps": []
322322
// CHECK: "command-line": [
323323
// CHECK: "-o",
@@ -330,7 +330,7 @@ int main() {
330330
// CHECK-NEXT: {
331331
// CHECK: "commands": [
332332
// CHECK-NEXT: {
333-
// CHECK-NOT: "module-name":
333+
// CHECK-NOT: "named-module":
334334
// CHECK: "named-module-deps": [
335335
// CHECK-NEXT: "M"
336336
// CHECK-NEXT: "third_party_module"

‎clang/tools/clang-scan-deps/ClangScanDeps.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ class FullDeps {
393393
ID.FileName = std::string(Input);
394394
ID.ContextHash = std::move(TUDeps.ID.ContextHash);
395395
ID.FileDeps = std::move(TUDeps.FileDeps);
396-
ID.ModuleName = std::move(TUDeps.ID.ModuleName);
396+
ID.NamedModule = std::move(TUDeps.ID.ModuleName);
397397
ID.NamedModuleDeps = std::move(TUDeps.NamedModuleDeps);
398398
ID.ClangModuleDeps = std::move(TUDeps.ClangModuleDeps);
399399
ID.DriverCommandLine = std::move(TUDeps.DriverCommandLine);
@@ -510,8 +510,8 @@ class FullDeps {
510510
JOS.object([&] {
511511
JOS.attribute("clang-context-hash",
512512
StringRef(I.ContextHash));
513-
if (!I.ModuleName.empty())
514-
JOS.attribute("module-name", (I.ModuleName));
513+
if (!I.NamedModule.empty())
514+
JOS.attribute("named-module", (I.NamedModule));
515515
if (!I.NamedModuleDeps.empty())
516516
JOS.attributeArray("named-module-deps", [&] {
517517
for (const auto &Dep : I.NamedModuleDeps)
@@ -530,8 +530,8 @@ class FullDeps {
530530
} else {
531531
JOS.object([&] {
532532
JOS.attribute("clang-context-hash", StringRef(I.ContextHash));
533-
if (!I.ModuleName.empty())
534-
JOS.attribute("module-name", (I.ModuleName));
533+
if (!I.NamedModule.empty())
534+
JOS.attribute("named-module", (I.NamedModule));
535535
if (!I.NamedModuleDeps.empty())
536536
JOS.attributeArray("named-module-deps", [&] {
537537
for (const auto &Dep : I.NamedModuleDeps)
@@ -593,7 +593,7 @@ class FullDeps {
593593
std::string FileName;
594594
std::string ContextHash;
595595
std::vector<std::string> FileDeps;
596-
std::string ModuleName;
596+
std::string NamedModule;
597597
std::vector<std::string> NamedModuleDeps;
598598
std::vector<ModuleID> ClangModuleDeps;
599599
std::vector<std::string> DriverCommandLine;

0 commit comments

Comments
 (0)