From: Duncan P. N. Exon Smith Date: Wed, 6 Mar 2019 02:50:46 +0000 (+0000) Subject: Modules: Add -Rmodule-import X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6c5acd1a62ec566ec4f64ecb038bcadba367da7c;p=clang Modules: Add -Rmodule-import Add a remark for importing modules. Depending on whether this is a direct import (into the TU being built by this compiler instance) or transitive import (into an already-imported module), the diagnostic has two forms: importing module 'Foo' from 'path/to/Foo.pcm' importing module 'Foo' into 'Bar' from 'path/to/Foo.pcm' Also drop a redundant FileCheck invocation in Rmodule-build.m that was using -Reverything, since the notes from -Rmodule-import were confusing it. https://reviews.llvm.org/D58891 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@355477 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/clang/Basic/DiagnosticGroups.td b/include/clang/Basic/DiagnosticGroups.td index 5e839691e0..69cec197aa 100644 --- a/include/clang/Basic/DiagnosticGroups.td +++ b/include/clang/Basic/DiagnosticGroups.td @@ -351,6 +351,7 @@ def MismatchedReturnTypes : DiagGroup<"mismatched-return-types">; def MismatchedTags : DiagGroup<"mismatched-tags">; def MissingFieldInitializers : DiagGroup<"missing-field-initializers">; def ModuleBuild : DiagGroup<"module-build">; +def ModuleImport : DiagGroup<"module-import">; def ModuleConflict : DiagGroup<"module-conflict">; def ModuleFileExtension : DiagGroup<"module-file-extension">; def NewlineEOF : DiagGroup<"newline-eof">; diff --git a/include/clang/Basic/DiagnosticSerializationKinds.td b/include/clang/Basic/DiagnosticSerializationKinds.td index 3c5a06acfd..43ba19b585 100644 --- a/include/clang/Basic/DiagnosticSerializationKinds.td +++ b/include/clang/Basic/DiagnosticSerializationKinds.td @@ -72,6 +72,10 @@ def note_module_file_imported_by : Note< def err_module_file_not_module : Error< "AST file '%0' was not built as a module">, DefaultFatal; +def remark_module_import : Remark< + "importing module '%0'%select{| into '%3'}2 from '%1'">, + InGroup; + def err_imported_module_not_found : Error< "module '%0' in AST file '%1' (imported by AST file '%2') " "is not defined in any loaded module map file; " diff --git a/lib/Serialization/ASTReader.cpp b/lib/Serialization/ASTReader.cpp index 5ad21604f4..39df352cb7 100644 --- a/lib/Serialization/ASTReader.cpp +++ b/lib/Serialization/ASTReader.cpp @@ -2610,6 +2610,9 @@ ASTReader::ReadControlBlock(ModuleFile &F, case MODULE_NAME: F.ModuleName = Blob; + Diag(diag::remark_module_import) + << F.ModuleName << F.FileName << (ImportedBy ? true : false) + << (ImportedBy ? StringRef(ImportedBy->ModuleName) : StringRef()); if (Listener) Listener->ReadModuleName(F.ModuleName); @@ -4141,6 +4144,9 @@ ASTReader::ReadASTCore(StringRef FileName, switch (AddResult) { case ModuleManager::AlreadyLoaded: + Diag(diag::remark_module_import) + << M->ModuleName << M->FileName << (ImportedBy ? true : false) + << (ImportedBy ? StringRef(ImportedBy->ModuleName) : StringRef()); return Success; case ModuleManager::NewlyLoaded: diff --git a/test/Modules/Inputs/Rmodule-import/A.h b/test/Modules/Inputs/Rmodule-import/A.h new file mode 100644 index 0000000000..2b9dab8587 --- /dev/null +++ b/test/Modules/Inputs/Rmodule-import/A.h @@ -0,0 +1,2 @@ +// A +#include "B.h" diff --git a/test/Modules/Inputs/Rmodule-import/B.h b/test/Modules/Inputs/Rmodule-import/B.h new file mode 100644 index 0000000000..a2711d4043 --- /dev/null +++ b/test/Modules/Inputs/Rmodule-import/B.h @@ -0,0 +1,2 @@ +// B +#include "C.h" diff --git a/test/Modules/Inputs/Rmodule-import/C.h b/test/Modules/Inputs/Rmodule-import/C.h new file mode 100644 index 0000000000..6f30d4750e --- /dev/null +++ b/test/Modules/Inputs/Rmodule-import/C.h @@ -0,0 +1 @@ +// C diff --git a/test/Modules/Inputs/Rmodule-import/D.h b/test/Modules/Inputs/Rmodule-import/D.h new file mode 100644 index 0000000000..61177ec3a3 --- /dev/null +++ b/test/Modules/Inputs/Rmodule-import/D.h @@ -0,0 +1 @@ +// D diff --git a/test/Modules/Inputs/Rmodule-import/module.modulemap b/test/Modules/Inputs/Rmodule-import/module.modulemap new file mode 100644 index 0000000000..cf7cf1f7e5 --- /dev/null +++ b/test/Modules/Inputs/Rmodule-import/module.modulemap @@ -0,0 +1,4 @@ +module A { header "A.h" } +module B { header "B.h" } +module C { header "C.h" } +module D { header "D.h" } diff --git a/test/Modules/Rmodule-build.m b/test/Modules/Rmodule-build.m index 5c27ec6dfd..e9e2ca964e 100644 --- a/test/Modules/Rmodule-build.m +++ b/test/Modules/Rmodule-build.m @@ -19,10 +19,6 @@ // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -fsyntax-only %s -I %t \ // RUN: -Rmodule-build 2>&1 | FileCheck %s -// RUN: echo ' ' >> %t/C.h -// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -fsyntax-only %s -I %t \ -// RUN: -Reverything 2>&1 | FileCheck %s - // RUN: echo ' ' >> %t/B.h // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -fsyntax-only %s -I %t \ // RUN: 2>&1 | FileCheck -allow-empty -check-prefix=NO-REMARKS %s diff --git a/test/Modules/Rmodule-import.m b/test/Modules/Rmodule-import.m new file mode 100644 index 0000000000..54e2d021f0 --- /dev/null +++ b/test/Modules/Rmodule-import.m @@ -0,0 +1,46 @@ +// RUN: rm -rf %t1 %t2 + +// Run with -verify, which onliy gets remarks from the main TU. +// +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t1 \ +// RUN: -fdisable-module-hash -fsyntax-only -I%S/Inputs/Rmodule-import \ +// RUN: -Rmodule-build -Rmodule-import -verify %s + +// Run again, using FileCheck to check remarks from the module builds. +// +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t2 \ +// RUN: -fdisable-module-hash -fsyntax-only -I%S/Inputs/Rmodule-import \ +// RUN: -Rmodule-build -Rmodule-import %s 2>&1 |\ +// RUN: FileCheck %s -implicit-check-not "remark:" + +#include "A.h" // \ + expected-remark-re{{building module 'A' as '{{.*}}/A.pcm'}} \ + expected-remark{{finished building module 'A'}} \ + expected-remark-re{{importing module 'A' from '{{.*}}/A.pcm'}} \ + expected-remark-re{{importing module 'B' into 'A' from '{{.*}}/B.pcm'}} \ + expected-remark-re{{importing module 'C' into 'B' from '{{.*}}/C.pcm'}} +// CHECK: remark: building module 'A' +// CHECK: remark: building module 'B' +// CHECK: remark: building module 'C' +// CHECK: remark: finished building module 'C' +// CHECK: remark: importing module 'C' from '{{.*}}/C.pcm' +// CHECK: remark: finished building module 'B' +// CHECK: remark: importing module 'B' from '{{.*}}/B.pcm' +// CHECK: remark: importing module 'C' into 'B' from '{{.*}}/C.pcm' +// CHECK: remark: finished building module 'A' +// CHECK: remark: importing module 'A' from '{{.*}}/A.pcm' +// CHECK: remark: importing module 'B' into 'A' from '{{.*}}/B.pcm' +// CHECK: remark: importing module 'C' into 'B' from '{{.*}}/C.pcm' +#include "B.h" // \ + expected-remark-re{{importing module 'B' from '{{.*}}/B.pcm'}} +// CHECK: remark: importing module 'B' from '{{.*}}/B.pcm' +#include "C.h" // \ + expected-remark-re{{importing module 'C' from '{{.*}}/C.pcm'}} +// CHECK: remark: importing module 'C' from '{{.*}}/C.pcm' +@import D; // \ + expected-remark-re{{building module 'D' as '{{.*}}/D.pcm'}} \ + expected-remark{{finished building module 'D'}} \ + expected-remark-re{{importing module 'D' from '{{.*}}/D.pcm'}} +// CHECK: remark: building module 'D' +// CHECK: remark: finished building module 'D' +// CHECK: remark: importing module 'D' from '{{.*}}/D.pcm'