Skip to content

[PATCH] [clang][modules] Fix serialization and de-serialization of PCH module file refs (#105994) #132802

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 2 commits into from
Mar 25, 2025
Merged

[PATCH] [clang][modules] Fix serialization and de-serialization of PCH module file refs (#105994) #132802

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
2d143ca
[PATCH] [clang][modules] Fix serialization and de-serialization of PC…
koplas Mar 24, 2025
5dff7f9
Address comment
koplas Mar 25, 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
6 changes: 3 additions & 3 deletions clang/lib/Serialization/ASTReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9613,9 +9613,9 @@ ModuleFile *ASTReader::getLocalModuleFile(ModuleFile &M, unsigned ID) const {
return I == GlobalSubmoduleMap.end() ? nullptr : I->second;
} else {
// It's a prefix (preamble, PCH, ...). Look it up by index.
unsigned IndexFromEnd = ID >> 1;
int IndexFromEnd = static_cast<int>(ID >> 1);
assert(IndexFromEnd && "got reference to unknown module file");
return getModuleManager().pch_modules().end()[-IndexFromEnd];
return getModuleManager().pch_modules().end()[-static_cast<int>(IndexFromEnd)];
}
}

Expand All @@ -9633,7 +9633,7 @@ unsigned ASTReader::getModuleFileID(ModuleFile *M) {
auto PCHModules = getModuleManager().pch_modules();
auto I = llvm::find(PCHModules, M);
assert(I != PCHModules.end() && "emitting reference to unknown file");
return (I - PCHModules.end()) << 1;
return std::distance(I, PCHModules.end()) << 1;
}

std::optional<ASTSourceDescriptor> ASTReader::getSourceDescriptor(unsigned ID) {
Expand Down
63 changes: 63 additions & 0 deletions clang/test/Modules/MixedModulePrecompile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
// Tests mixed usage of precompiled headers and modules.
//
// RUN: rm -rf %t
// RUN: mkdir -p %t
// RUN: split-file %s %t
//
// RUN: %clang_cc1 -std=c++20 -x c++-header -emit-pch %t/a.hpp \
// RUN: -o %t/a.pch

// RUN: %clang_cc1 -std=c++20 -emit-module-interface %t/Part1.cppm \
// RUN: -include-pch %t/a.pch -o %t/Part1.pcm
// RUN: %clang_cc1 -std=c++20 -emit-module-interface %t/Part2.cppm \
// RUN: -include-pch %t/a.pch -o %t/Part2.pcm
// RUN: %clang_cc1 -std=c++20 -emit-module-interface %t/Part3.cppm \
// RUN: -include-pch %t/a.pch -o %t/Part3.pcm
// RUN: %clang_cc1 -std=c++20 -emit-module-interface %t/Part4.cppm \
// RUN: -include-pch %t/a.pch -o %t/Part4.pcm

// RUN: %clang_cc1 -std=c++20 -emit-module-interface \
// RUN: -fmodule-file=mod:part1=%t/Part1.pcm \
// RUN: -fmodule-file=mod:part2=%t/Part2.pcm \
// RUN: -fmodule-file=mod:part3=%t/Part3.pcm \
// RUN: -fmodule-file=mod:part4=%t/Part4.pcm \
// RUN: %t/Mod.cppm \
// RUN: -include-pch %t/a.pch -o %t/Mod.pcm

// RUN: %clang_cc1 -std=c++20 -emit-obj \
// RUN: -main-file-name Mod.cppm \
// RUN: -fmodule-file=mod:part1=%t/Part1.pcm \
// RUN: -fmodule-file=mod:part2=%t/Part2.pcm \
// RUN: -fmodule-file=mod:part3=%t/Part3.pcm \
// RUN: -fmodule-file=mod:part4=%t/Part4.pcm \
// RUN: -x pcm %t/Mod.pcm \
// RUN: -include-pch %t/a.pch -o %t/Mod.o


//--- a.hpp
#pragma once

class a {
virtual ~a();
a() {}
};

//--- Part1.cppm
export module mod:part1;

//--- Part2.cppm
export module mod:part2;

//--- Part3.cppm
export module mod:part3;

//--- Part4.cppm
export module mod:part4;

//--- Mod.cppm
export module mod;
export import :part1;
export import :part2;
export import :part3;
export import :part4;