Skip to content

[clang][modules] print mtime of input files when recorded in "module-file-info" #173120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cyndyishida merged 2 commits into from
Dec 20, 2025
+40 −13
Merged

[clang][modules] print mtime of input files when recorded in "module-file-info" #173120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2335d05
[clang][modules] print mtime of input files when recorded in "module-…
cyndyishida Dec 19, 2025
193d471
Address review comments
cyndyishida Dec 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion clang/include/clang/Serialization/ASTReader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ class ASTReaderListener {
/// \returns true to continue receiving the next input file, false to stop.
virtual bool visitInputFileAsRequested(StringRef FilenameAsRequested,
StringRef Filename, bool isSystem,
bool isOverridden,
bool isOverridden, time_t StoredTime,
bool isExplicitModule) {
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion clang/lib/DependencyScanning/DependencyScannerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ class PrebuiltModuleListener : public ASTReaderListener {
/// considered stable.
bool visitInputFileAsRequested(StringRef FilenameAsRequested,
StringRef Filename, bool isSystem,
bool isOverridden,
bool isOverridden, time_t StoredTime,
bool isExplicitModule) override {
if (StableDirs.empty())
return false;
Expand Down
5 changes: 4 additions & 1 deletion clang/lib/Frontend/FrontendActions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -798,7 +798,7 @@ namespace {
/// \returns true to continue receiving the next input file, false to stop.
bool visitInputFileAsRequested(StringRef FilenameAsRequested,
StringRef Filename, bool isSystem,
bool isOverridden,
bool isOverridden, time_t StoredTime,
bool isExplicitModule) override {

Out.indent(2) << "Input file: " << FilenameAsRequested;
Expand All @@ -823,6 +823,9 @@ namespace {

Out << "\n";

if (StoredTime > 0)
Out.indent(4) << "MTime: " << llvm::itostr(StoredTime) << "\n";

return true;
}

Expand Down
3 changes: 2 additions & 1 deletion clang/lib/Serialization/ASTReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5980,6 +5980,7 @@ bool ASTReader::readASTFileControlBlock(
case INPUT_FILE_HASH:
break;
case INPUT_FILE:
time_t StoredTime = static_cast<time_t>(Record[2]);
bool Overridden = static_cast<bool>(Record[3]);
auto [UnresolvedFilenameAsRequested, UnresolvedFilename] =
getUnresolvedInputFilenames(Record, Blob);
Expand All @@ -5995,7 +5996,7 @@ bool ASTReader::readASTFileControlBlock(
}
shouldContinue = Listener.visitInputFileAsRequested(
*FilenameAsRequestedBuf, Filename, isSystemFile, Overridden,
/*IsExplicitModule=*/false);
StoredTime, /*IsExplicitModule=*/false);
break;
}
if (!shouldContinue)
Expand Down
23 changes: 23 additions & 0 deletions clang/test/Modules/module-file-info-mtime.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Check that mtime from a input file of a pcm is emitted, when it was built from an implicit module invocation.

// RUN: rm -fr %t
// RUN: split-file %s %t
// RUN: %clang_cc1 -fmodules -fmodules-cache-path=%t/cache -fdisable-module-hash -fimplicit-module-maps %t/client.m -fsyntax-only -I%t/BuildDir
// RUN: %clang_cc1 -module-file-info %t/cache/A.pcm | FileCheck %s

// CHECK: Module name: A
// CHECK: Module map file: {{.*}}module.modulemap
// CHECK: Input file: {{.*}}A.h
// CHECK-NEXT: MTime: {{[0-9]+}}


//--- BuildDir/A/module.modulemap
module A [system] {
umbrella "."
}

//--- BuildDir/A/A.h
typedef int local_t;

//--- client.m
#import <A/A.h>
18 changes: 9 additions & 9 deletions clang/test/Modules/module_file_info.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@
// MACROS-NEXT: -DBLARG
// MACROS-NEXT: -DWIBBLE=WOBBLE
// CHECK: Input file: {{.*}}module.modulemap
// CHECK-NEXT: Input file: {{.*}}module.private.modulemap
// CHECK-NEXT: Input file: {{.*}}DependsOnModule.h
// CHECK-NEXT: Input file: {{.*}}module.modulemap
// CHECK-NEXT: Input file: {{.*}}other.h
// CHECK-NEXT: Input file: {{.*}}not_cxx.h
// CHECK-NEXT: Input file: {{.*}}not_coroutines.h
// CHECK-NEXT: Input file: {{.*}}SubFramework.h
// CHECK-NEXT: Input file: {{.*}}Other.h
// CHECK-NEXT: Input file: {{.*}}DependsOnModulePrivate.h
// CHECK: Input file: {{.*}}module.private.modulemap
// CHECK: Input file: {{.*}}DependsOnModule.h
// CHECK: Input file: {{.*}}module.modulemap
// CHECK: Input file: {{.*}}other.h
// CHECK: Input file: {{.*}}not_cxx.h
// CHECK: Input file: {{.*}}not_coroutines.h
// CHECK: Input file: {{.*}}SubFramework.h
// CHECK: Input file: {{.*}}Other.h
// CHECK: Input file: {{.*}}DependsOnModulePrivate.h

// CHECK: Diagnostic options:
// CHECK: IgnoreWarnings: Yes
Expand Down