Skip to content

[clang][Dependency Scanning] Canonicalize Defines of a Compiler Invocation As Early As Possible #159620

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
merged 3 commits into from
Sep 18, 2025
Merged

[clang][Dependency Scanning] Canonicalize Defines of a Compiler Invocation As Early As Possible #159620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
250d52d
Making sure the scanning `CompilerInvocation`'s `-D`s are canonicalized.
qiongsiwu Sep 18, 2025
6520631
Adding a test to check number of scanning module variants.
qiongsiwu Sep 18, 2025
ec423db
Update clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp
qiongsiwu Sep 18, 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
8 changes: 6 additions & 2 deletions clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,10 +391,14 @@ class DependencyScanningAction {
IntrusiveRefCntPtr<llvm::vfs::FileSystem> FS,
std::shared_ptr<PCHContainerOperations> PCHContainerOps,
DiagnosticConsumer *DiagConsumer) {
// Making sure that we canonicalize the defines before we create the deep
// copy to avoid unnecessary variants in the scanner and in the resulting
// explicit command lines.
if (any(Service.getOptimizeArgs() & ScanningOptimizations::Macros))
canonicalizeDefines(Invocation->getPreprocessorOpts());

// Make a deep copy of the original Clang invocation.
CompilerInvocation OriginalInvocation(*Invocation);
if (any(Service.getOptimizeArgs() & ScanningOptimizations::Macros))
canonicalizeDefines(OriginalInvocation.getPreprocessorOpts());

if (Scanned) {
// Scanning runs once for the first -cc1 invocation in a chain of driver
Expand Down
3 changes: 3 additions & 0 deletions clang/test/ClangScanDeps/optimize-canonicalize-macros.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
// RUN: -j 1 -format experimental-full -optimize-args=canonicalize-macros > %t/deps.db
// RUN: cat %t/deps.db | FileCheck %s -DPREFIX=%/t

// This tests that we have two scanning module variants.
// RUN: find %t/module-cache -name "*.pcm" | wc -l | grep 2

// Verify that there are only two variants and that the expected merges have
// happened.

Expand Down