Skip to content

[clang][timers][modules] Fix a timer being started when it's running #154231

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
alanzhao1 merged 4 commits into from
Aug 20, 2025
Merged

[clang][timers][modules] Fix a timer being started when it's running #154231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9f07859
[clang][timers][modules] Fix a timer being started when it's running
alanzhao1 Aug 18, 2025
686c6c3
fix namespace identifier issue
alanzhao1 Aug 19, 2025
b45ce00
use T instead of ReadTimer
alanzhao1 Aug 19, 2025
6b03a89
use std::optional to enforce ReadTimer
alanzhao1 Aug 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
3 changes: 3 additions & 0 deletions clang/include/clang/Serialization/ASTReader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,6 +526,9 @@ class ASTReader
/// A timer used to track the time spent deserializing.
std::unique_ptr<llvm::Timer> ReadTimer;

// A TimeRegion used to start and stop ReadTimer via RAII.
std::optional<llvm::TimeRegion> ReadTimeRegion;

/// The location where the module file will be considered as
/// imported from. For non-module AST types it should be invalid.
SourceLocation CurrentImportLoc;
Expand Down
8 changes: 4 additions & 4 deletions clang/lib/Serialization/ASTReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11003,8 +11003,9 @@ void ASTReader::diagnoseOdrViolations() {
}

void ASTReader::StartedDeserializing() {
if (++NumCurrentElementsDeserializing == 1 && ReadTimer.get())
ReadTimer->startTimer();
if (llvm::Timer *T = ReadTimer.get();
++NumCurrentElementsDeserializing == 1 && T)
ReadTimeRegion.emplace(T);
}

void ASTReader::FinishedDeserializing() {
Expand Down Expand Up @@ -11062,8 +11063,7 @@ void ASTReader::FinishedDeserializing() {
(void)UndeducedFD->getMostRecentDecl();
}

if (ReadTimer)
ReadTimer->stopTimer();
ReadTimeRegion.reset();

diagnoseOdrViolations();
}
Expand Down