[clang][DepScan] Allow ModuleDep to be const #132968
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Mark the lazy computation of build arguments mutable. As that is not intended to otherwise mutate the state of the object.
cyndyishida
added
the
skip-precommit-approval
|
@llvm/pr-subscribers-clang Author: Cyndy Ishida (cyndyishida) ChangesThis type can be exposed from C APIs, where instantiations of this type are not expected to mutate after creation. To support this, mark the lazy computation of build arguments mutable, as that is not intended to otherwise mutate the state of these objects. This was reviewed separately by @jansvoboda11 Full diff: https://github.com/llvm/llvm-project/pull/132968.diff 2 Files Affected:
diff --git a/clang/include/clang/Tooling/DependencyScanning/ModuleDepCollector.h b/clang/include/clang/Tooling/DependencyScanning/ModuleDepCollector.h
index 422202caddfd4..ed150b467e3a1 100644
--- a/clang/include/clang/Tooling/DependencyScanning/ModuleDepCollector.h
+++ b/clang/include/clang/Tooling/DependencyScanning/ModuleDepCollector.h
@@ -153,7 +153,7 @@ struct ModuleDeps {
/// Get (or compute) the compiler invocation that can be used to build this
/// module. Does not include argv[0].
- const std::vector<std::string> &getBuildArguments();
+ const std::vector<std::string> &getBuildArguments() const;
private:
friend class ModuleDepCollector;
@@ -166,7 +166,8 @@ struct ModuleDeps {
/// including transitive dependencies.
std::vector<std::string> FileDeps;
- std::variant<std::monostate, CowCompilerInvocation, std::vector<std::string>>
+ mutable std::variant<std::monostate, CowCompilerInvocation,
+ std::vector<std::string>>
BuildInfo;
};
diff --git a/clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp b/clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp
index d715ef874e002..364f156566855 100644
--- a/clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp
+++ b/clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp
@@ -31,7 +31,9 @@ void ModuleDeps::forEachFileDep(llvm::function_ref<void(StringRef)> Cb) const {
}
}
-const std::vector<std::string> &ModuleDeps::getBuildArguments() {
+const std::vector<std::string> &ModuleDeps::getBuildArguments() const {
+ // FIXME: this operation is not thread safe and is expected to be called
+ // on a single thread. Otherwise it should be protected with a lock.
assert(!std::holds_alternative<std::monostate>(BuildInfo) &&
"Using uninitialized ModuleDeps");
if (const auto *CI = std::get_if<CowCompilerInvocation>(&BuildInfo))
|
jansvoboda11
approved these changes
Mar 25, 2025
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/59/builds/14918 Here is the relevant piece of the build log for the reference |
cyndyishida
added a commit
to cyndyishida/llvm-project
that referenced
this pull request
Mar 25, 2025
This type can be exposed from C APIs, where instantiations of this type are not expected to mutate after creation. To support this, mark the lazy computation of build arguments mutable, as that is not intended to otherwise mutate the state of these objects. This was reviewed separately by @jansvoboda11 (cherry picked from commit 9aecbdf)
cyndyishida
added a commit
to swiftlang/llvm-project
that referenced
this pull request
Apr 2, 2025
This type can be exposed from C APIs, where instantiations of this type are not expected to mutate after creation. To support this, mark the lazy computation of build arguments mutable, as that is not intended to otherwise mutate the state of these objects. This was reviewed separately by @jansvoboda11 (cherry picked from commit 9aecbdf)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This type can be exposed from C APIs, where instantiations of this type are not expected to mutate after creation. To support this, mark the lazy computation of build arguments mutable, as that is not intended to otherwise mutate the state of these objects.
This was reviewed separately by @jansvoboda11