[clang][analyzer] Add location to CTU failure diagnostics#188795
Merged
Conversation
Report CTU import failures at the place where the imported symbol would be used. This helps to quicker understand why CSA might miss a certain expected CTU bug. -- CPP-7804
llvmbot
added
clang
Member
|
@llvm/pr-subscribers-clang Author: Arseniy Zaostrovnykh (necto) ChangesReport CTU import failures at the place where the imported symbol would be used. This helps to quicker understand why CSA might miss a certain expected CTU bug. -- Full diff: https://github.com/llvm/llvm-project/pull/188795.diff 7 Files Affected:
diff --git a/clang/include/clang/CrossTU/CrossTranslationUnit.h b/clang/include/clang/CrossTU/CrossTranslationUnit.h
index 9e0721edfc323..145bc8df27de6 100644
--- a/clang/include/clang/CrossTU/CrossTranslationUnit.h
+++ b/clang/include/clang/CrossTU/CrossTranslationUnit.h
@@ -184,7 +184,7 @@ class CrossTranslationUnitContext {
static std::optional<std::string> getLookupName(const Decl *D);
/// Emit diagnostics for the user for potential configuration errors.
- void emitCrossTUDiagnostics(const IndexError &IE);
+ void emitCrossTUDiagnostics(const IndexError &IE, SourceLocation Loc);
/// Returns the MacroExpansionContext for the imported TU to which the given
/// source-location corresponds.
diff --git a/clang/lib/CrossTU/CrossTranslationUnit.cpp b/clang/lib/CrossTU/CrossTranslationUnit.cpp
index ef25ad454da2e..8dd0ef13123d1 100644
--- a/clang/lib/CrossTU/CrossTranslationUnit.cpp
+++ b/clang/lib/CrossTU/CrossTranslationUnit.cpp
@@ -379,22 +379,23 @@ CrossTranslationUnitContext::getCrossTUDefinition(const VarDecl *VD,
DisplayCTUProgress);
}
-void CrossTranslationUnitContext::emitCrossTUDiagnostics(const IndexError &IE) {
+void CrossTranslationUnitContext::emitCrossTUDiagnostics(const IndexError &IE,
+ SourceLocation Loc) {
switch (IE.getCode()) {
case index_error_code::missing_index_file:
- Context.getDiagnostics().Report(diag::err_ctu_error_opening)
+ Context.getDiagnostics().Report(Loc, diag::err_ctu_error_opening)
<< IE.getFileName();
return;
case index_error_code::invalid_index_format:
- Context.getDiagnostics().Report(diag::err_extdefmap_parsing)
+ Context.getDiagnostics().Report(Loc, diag::err_extdefmap_parsing)
<< IE.getFileName() << IE.getLineNum();
return;
case index_error_code::multiple_definitions:
- Context.getDiagnostics().Report(diag::err_multiple_def_index)
+ Context.getDiagnostics().Report(Loc, diag::err_multiple_def_index)
<< IE.getLineNum();
return;
case index_error_code::triple_mismatch:
- Context.getDiagnostics().Report(diag::warn_ctu_incompat_triple)
+ Context.getDiagnostics().Report(Loc, diag::warn_ctu_incompat_triple)
<< IE.getFileName() << IE.getTripleToName() << IE.getTripleFromName();
return;
case index_error_code::success:
diff --git a/clang/lib/StaticAnalyzer/Core/CallEvent.cpp b/clang/lib/StaticAnalyzer/Core/CallEvent.cpp
index cd52083a278ae..e23f9fff4533a 100644
--- a/clang/lib/StaticAnalyzer/Core/CallEvent.cpp
+++ b/clang/lib/StaticAnalyzer/Core/CallEvent.cpp
@@ -623,7 +623,9 @@ RuntimeDefinition AnyFunctionCall::getRuntimeDefinition() const {
if (!CTUDeclOrError) {
handleAllErrors(CTUDeclOrError.takeError(),
[&](const cross_tu::IndexError &IE) {
- CTUCtx.emitCrossTUDiagnostics(IE);
+ auto Loc = getOriginExpr() ? getOriginExpr()->getExprLoc()
+ : FD->getLocation();
+ CTUCtx.emitCrossTUDiagnostics(IE, Loc);
});
return {};
}
diff --git a/clang/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp b/clang/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp
index 1cc2b8dfb9bee..4f435b70013ec 100644
--- a/clang/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp
+++ b/clang/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp
@@ -309,7 +309,7 @@ class AnalysisConsumer : public AnalysisASTConsumer,
if (!CTUDeclOrError) {
handleAllErrors(CTUDeclOrError.takeError(),
[&](const cross_tu::IndexError &IE) {
- CTU.emitCrossTUDiagnostics(IE);
+ CTU.emitCrossTUDiagnostics(IE, VD->getLocation());
});
}
diff --git a/clang/test/Analysis/ctu/diag/invalid-index.cpp b/clang/test/Analysis/ctu/diag/invalid-index.cpp
index 640e6ceee654c..f8cc98c346fa1 100644
--- a/clang/test/Analysis/ctu/diag/invalid-index.cpp
+++ b/clang/test/Analysis/ctu/diag/invalid-index.cpp
@@ -8,11 +8,8 @@
// RUN: -analyzer-config ctu-dir=%t \
// RUN: -verify %s
-// We expect an error in this file, but without a location.
-// expected-error-re@./invalid-index.cpp:*{{error parsing index file: '{{.+}}externalDefMap.txt' line: 1 '<USR-Length>:<USR> <File-Path>' format expected}}
-
int foo(int);
void test() {
- foo(1);
+ foo(1); // expected-error-re{{error parsing index file: '{{.+}}externalDefMap.txt' line: 1 '<USR-Length>:<USR> <File-Path>' format expected}}
}
diff --git a/clang/test/Analysis/ctu/diag/missing-index.cpp b/clang/test/Analysis/ctu/diag/missing-index.cpp
index e09042f9538f7..351537165a466 100644
--- a/clang/test/Analysis/ctu/diag/missing-index.cpp
+++ b/clang/test/Analysis/ctu/diag/missing-index.cpp
@@ -8,11 +8,8 @@
// RUN: -analyzer-config ctu-index-name=non-existing.txt \
// RUN: -verify %s
-// We expect an error in this file, but without a location.
-// expected-error-re@./missing-index.cpp:*{{error opening '{{.+}}non-existing.txt': required by the CrossTU functionality}}
-
int foo(int);
void test() {
- foo(1);
+ foo(1); // expected-error-re{{error opening '{{.+}}non-existing.txt': required by the CrossTU functionality}}
}
diff --git a/clang/test/Analysis/ctu/different-triples.cpp b/clang/test/Analysis/ctu/different-triples.cpp
index 95b7f8d4c3fed..17170772c0207 100644
--- a/clang/test/Analysis/ctu/different-triples.cpp
+++ b/clang/test/Analysis/ctu/different-triples.cpp
@@ -10,11 +10,8 @@
// RUN: -Werror=ctu \
// RUN: -verify %s
-// We expect an error in this file, but without a location.
-// expected-error-re@./different-triples.cpp:*{{imported AST from {{.*}} had been generated for a different target, current: powerpc64-montavista-linux-gnu, imported: x86_64-pc-linux-gnu}}
-
int f(int);
int main() {
- return f(5);
+ return f(5); // expected-error-re{{imported AST from '{{.*}}' had been generated for a different target, current: powerpc64-montavista-linux-gnu, imported: x86_64-pc-linux-gnu}}
}
|
Member
|
@llvm/pr-subscribers-clang-static-analyzer-1 Author: Arseniy Zaostrovnykh (necto) ChangesReport CTU import failures at the place where the imported symbol would be used. This helps to quicker understand why CSA might miss a certain expected CTU bug. -- Full diff: https://github.com/llvm/llvm-project/pull/188795.diff 7 Files Affected:
diff --git a/clang/include/clang/CrossTU/CrossTranslationUnit.h b/clang/include/clang/CrossTU/CrossTranslationUnit.h
index 9e0721edfc323..145bc8df27de6 100644
--- a/clang/include/clang/CrossTU/CrossTranslationUnit.h
+++ b/clang/include/clang/CrossTU/CrossTranslationUnit.h
@@ -184,7 +184,7 @@ class CrossTranslationUnitContext {
static std::optional<std::string> getLookupName(const Decl *D);
/// Emit diagnostics for the user for potential configuration errors.
- void emitCrossTUDiagnostics(const IndexError &IE);
+ void emitCrossTUDiagnostics(const IndexError &IE, SourceLocation Loc);
/// Returns the MacroExpansionContext for the imported TU to which the given
/// source-location corresponds.
diff --git a/clang/lib/CrossTU/CrossTranslationUnit.cpp b/clang/lib/CrossTU/CrossTranslationUnit.cpp
index ef25ad454da2e..8dd0ef13123d1 100644
--- a/clang/lib/CrossTU/CrossTranslationUnit.cpp
+++ b/clang/lib/CrossTU/CrossTranslationUnit.cpp
@@ -379,22 +379,23 @@ CrossTranslationUnitContext::getCrossTUDefinition(const VarDecl *VD,
DisplayCTUProgress);
}
-void CrossTranslationUnitContext::emitCrossTUDiagnostics(const IndexError &IE) {
+void CrossTranslationUnitContext::emitCrossTUDiagnostics(const IndexError &IE,
+ SourceLocation Loc) {
switch (IE.getCode()) {
case index_error_code::missing_index_file:
- Context.getDiagnostics().Report(diag::err_ctu_error_opening)
+ Context.getDiagnostics().Report(Loc, diag::err_ctu_error_opening)
<< IE.getFileName();
return;
case index_error_code::invalid_index_format:
- Context.getDiagnostics().Report(diag::err_extdefmap_parsing)
+ Context.getDiagnostics().Report(Loc, diag::err_extdefmap_parsing)
<< IE.getFileName() << IE.getLineNum();
return;
case index_error_code::multiple_definitions:
- Context.getDiagnostics().Report(diag::err_multiple_def_index)
+ Context.getDiagnostics().Report(Loc, diag::err_multiple_def_index)
<< IE.getLineNum();
return;
case index_error_code::triple_mismatch:
- Context.getDiagnostics().Report(diag::warn_ctu_incompat_triple)
+ Context.getDiagnostics().Report(Loc, diag::warn_ctu_incompat_triple)
<< IE.getFileName() << IE.getTripleToName() << IE.getTripleFromName();
return;
case index_error_code::success:
diff --git a/clang/lib/StaticAnalyzer/Core/CallEvent.cpp b/clang/lib/StaticAnalyzer/Core/CallEvent.cpp
index cd52083a278ae..e23f9fff4533a 100644
--- a/clang/lib/StaticAnalyzer/Core/CallEvent.cpp
+++ b/clang/lib/StaticAnalyzer/Core/CallEvent.cpp
@@ -623,7 +623,9 @@ RuntimeDefinition AnyFunctionCall::getRuntimeDefinition() const {
if (!CTUDeclOrError) {
handleAllErrors(CTUDeclOrError.takeError(),
[&](const cross_tu::IndexError &IE) {
- CTUCtx.emitCrossTUDiagnostics(IE);
+ auto Loc = getOriginExpr() ? getOriginExpr()->getExprLoc()
+ : FD->getLocation();
+ CTUCtx.emitCrossTUDiagnostics(IE, Loc);
});
return {};
}
diff --git a/clang/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp b/clang/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp
index 1cc2b8dfb9bee..4f435b70013ec 100644
--- a/clang/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp
+++ b/clang/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp
@@ -309,7 +309,7 @@ class AnalysisConsumer : public AnalysisASTConsumer,
if (!CTUDeclOrError) {
handleAllErrors(CTUDeclOrError.takeError(),
[&](const cross_tu::IndexError &IE) {
- CTU.emitCrossTUDiagnostics(IE);
+ CTU.emitCrossTUDiagnostics(IE, VD->getLocation());
});
}
diff --git a/clang/test/Analysis/ctu/diag/invalid-index.cpp b/clang/test/Analysis/ctu/diag/invalid-index.cpp
index 640e6ceee654c..f8cc98c346fa1 100644
--- a/clang/test/Analysis/ctu/diag/invalid-index.cpp
+++ b/clang/test/Analysis/ctu/diag/invalid-index.cpp
@@ -8,11 +8,8 @@
// RUN: -analyzer-config ctu-dir=%t \
// RUN: -verify %s
-// We expect an error in this file, but without a location.
-// expected-error-re@./invalid-index.cpp:*{{error parsing index file: '{{.+}}externalDefMap.txt' line: 1 '<USR-Length>:<USR> <File-Path>' format expected}}
-
int foo(int);
void test() {
- foo(1);
+ foo(1); // expected-error-re{{error parsing index file: '{{.+}}externalDefMap.txt' line: 1 '<USR-Length>:<USR> <File-Path>' format expected}}
}
diff --git a/clang/test/Analysis/ctu/diag/missing-index.cpp b/clang/test/Analysis/ctu/diag/missing-index.cpp
index e09042f9538f7..351537165a466 100644
--- a/clang/test/Analysis/ctu/diag/missing-index.cpp
+++ b/clang/test/Analysis/ctu/diag/missing-index.cpp
@@ -8,11 +8,8 @@
// RUN: -analyzer-config ctu-index-name=non-existing.txt \
// RUN: -verify %s
-// We expect an error in this file, but without a location.
-// expected-error-re@./missing-index.cpp:*{{error opening '{{.+}}non-existing.txt': required by the CrossTU functionality}}
-
int foo(int);
void test() {
- foo(1);
+ foo(1); // expected-error-re{{error opening '{{.+}}non-existing.txt': required by the CrossTU functionality}}
}
diff --git a/clang/test/Analysis/ctu/different-triples.cpp b/clang/test/Analysis/ctu/different-triples.cpp
index 95b7f8d4c3fed..17170772c0207 100644
--- a/clang/test/Analysis/ctu/different-triples.cpp
+++ b/clang/test/Analysis/ctu/different-triples.cpp
@@ -10,11 +10,8 @@
// RUN: -Werror=ctu \
// RUN: -verify %s
-// We expect an error in this file, but without a location.
-// expected-error-re@./different-triples.cpp:*{{imported AST from {{.*}} had been generated for a different target, current: powerpc64-montavista-linux-gnu, imported: x86_64-pc-linux-gnu}}
-
int f(int);
int main() {
- return f(5);
+ return f(5); // expected-error-re{{imported AST from '{{.*}}' had been generated for a different target, current: powerpc64-montavista-linux-gnu, imported: x86_64-pc-linux-gnu}}
}
|
Contributor
Author
|
@balazske @NagyDonat @steakhal |
steakhal
approved these changes
Mar 26, 2026
necto
changed the title
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Report CTU import failures at the place where the imported symbol would be used. This helps to quicker understand why CSA might miss a certain expected CTU bug.
--
CPP-7804