This is an archive of the discontinued LLVM Phabricator instance.

Differential D141632

[Module] Respect `-fno-pch-timestamps` when building modules
ClosedPublic

Authored by steven_wu on Jan 12 2023, 1:47 PM.

Details

Reviewers
benlangmuir
akyrtzi
jansvoboda11
Commits
rG5cff68fca0bc: [Module] Respect `-fno-pch-timestamps` when building modules
Summary

Always respect the FrontendOption to not include timestamps in PCH or
Modules when -fno-pch-timestamps is specified.

Diff Detail

Event Timeline

steven_wu created this revision.Jan 12 2023, 1:47 PM
Herald added a project: Restricted Project. · View Herald TranscriptJan 12 2023, 1:47 PM
Herald added a subscriber: ributzka. · View Herald Transcript
steven_wu requested review of this revision.Jan 12 2023, 1:47 PM
Herald added a project: Restricted Project. · View Herald TranscriptJan 12 2023, 1:47 PM
Harbormaster completed remote builds in B207476: Diff 488764.Jan 12 2023, 2:50 PM
benlangmuir accepted this revision.Jan 20 2023, 10:56 AM
This revision is now accepted and ready to land.Jan 20 2023, 10:56 AM
This revision was landed with ongoing or failed builds.Feb 1 2023, 10:34 AM
Closed by commit rG5cff68fca0bc: [Module] Respect `-fno-pch-timestamps` when building modules (authored by steven_wu). · Explain Why
This revision was automatically updated to reflect the committed changes.
steven_wu added a commit: rG5cff68fca0bc: [Module] Respect `-fno-pch-timestamps` when building modules.

Revision Contents

PathSize
clang/
lib/
Frontend/
3 lines
test/
Modules/
30 lines

Diff 494006

clang/lib/Frontend/FrontendActions.cpp

Show First 20 Lines • Show All 196 Lines • ▼ Show 20 LinesGenerateModuleAction::CreateASTConsumer(CompilerInstance &CI,
std::vector<std::unique_ptr<ASTConsumer>> Consumers; std::vector<std::unique_ptr<ASTConsumer>> Consumers;
Consumers.push_back(std::make_unique<PCHGenerator>( Consumers.push_back(std::make_unique<PCHGenerator>(
CI.getPreprocessor(), CI.getModuleCache(), OutputFile, Sysroot, Buffer, CI.getPreprocessor(), CI.getModuleCache(), OutputFile, Sysroot, Buffer,
CI.getFrontendOpts().ModuleFileExtensions, CI.getFrontendOpts().ModuleFileExtensions,
/*AllowASTWithErrors=*/ /*AllowASTWithErrors=*/
+CI.getFrontendOpts().AllowPCMWithCompilerErrors, +CI.getFrontendOpts().AllowPCMWithCompilerErrors,
/*IncludeTimestamps=*/ /*IncludeTimestamps=*/
+CI.getFrontendOpts().BuildingImplicitModule, +CI.getFrontendOpts().BuildingImplicitModule &&
+CI.getFrontendOpts().IncludeTimestamps,
/*ShouldCacheASTInMemory=*/ /*ShouldCacheASTInMemory=*/
+CI.getFrontendOpts().BuildingImplicitModule)); +CI.getFrontendOpts().BuildingImplicitModule));
Consumers.push_back(CI.getPCHContainerWriter().CreatePCHContainerGenerator( Consumers.push_back(CI.getPCHContainerWriter().CreatePCHContainerGenerator(
CI, std::string(InFile), OutputFile, std::move(OS), Buffer)); CI, std::string(InFile), OutputFile, std::move(OS), Buffer));
return std::make_unique<MultiplexConsumer>(std::move(Consumers)); return std::make_unique<MultiplexConsumer>(std::move(Consumers));
} }
bool GenerateModuleAction::shouldEraseOutputFiles() { bool GenerateModuleAction::shouldEraseOutputFiles() {
▲ Show 20 Lines • Show All 934 Lines • Show Last 20 Lines

clang/test/Modules/timestamps.c

  • This file was added.
/// Verify timestamps that gets embedded in the module
#include <c-header.h>
// RUN: rm -rf %t
// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fdisable-module-hash \
// RUN: -fmodules-cache-path=%t -I %S/Inputs %s
// RUN: cp %t/c_library.pcm %t1.pcm
// RUN: llvm-bcanalyzer --dump --disable-histogram %t1.pcm > %t1.dump
// RUN: FileCheck %s --check-prefix=CHECK --check-prefix=TIMESTAMP --input-file %t1.dump
// RUN: rm -rf %t
// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fdisable-module-hash \
// RUN: -fmodules-cache-path=%t -I %S/Inputs -fno-pch-timestamp %s
// RUN: cp %t/c_library.pcm %t2.pcm
// RUN: llvm-bcanalyzer --dump --disable-histogram %t2.pcm > %t2.dump
// RUN: FileCheck %s --check-prefix=CHECK --check-prefix=NOTIMESTAMP --input-file %t2.dump
// RUN: not diff %t1.dump %t2.dump
// CHECK: <INPUT_FILES_BLOCK NumWords=[[#]] BlockCodeSize=[[#]]>
// CHECK-NEXT: <INPUT_FILE abbrevid=4 op0=1 op1=[[#]]
// TIMESTAMP-NOT: op2=0
// NOTIMESTAMP: op2=0
// CHECK-SAME: blob data = 'module.map'
// CHECK-NEXT: <INPUT_FILE_HASH abbrevid=[[#]] op0=[[#]] op1=[[#]]/>
// CHECK-NEXT: <INPUT_FILE abbrevid=4 op0=2 op1=[[#]]
// TIMESTAMP-NOT: op2=0
// NOTIMESTAMP: op2=0
// CHECK-SAME: blob data = 'c-header.h'
// CHECK-NEXT: <INPUT_FILE_HASH abbrevid=[[#]] op0=[[#]] op1=[[#]]/>
// CHECK-NEXT: </INPUT_FILES_BLOCK>