https://github.com/zyn0217 updated
https://github.com/llvm/llvm-project/pull/139374
>From 1e359714374418bf51e93d54169557c29bddf7c6 Mon Sep 17 00:00:00 2001
From: Younan Zhang <zyn7...@gmail.com>
Date: Sat, 10 May 2025 18:59:03 +0800
Subject: [PATCH 1/2] [Clang] Don't ditch typo-corrected lookup result
For a member function call like 'foo.bar<int>()', there are two
typo-correction points after parsing the dot. The first occurs in
ParseOptionalCXXScopeSpecifier, which tries to annotate the template
name following any scope specifiers.
If the template name bar is not found within 'foo', the parser was
previously instructed to drop any function templates found outside of
the scope. This was intended to prevent ambiguity in expressions
like 'foo->bar < 7', as explained in commit 50a3cddd. However, it's
unnecessary to discard typo-corrected results that were strictly
resolved within the scope 'foo'.
We won't perform a second typo-correction in ParseUnqualifiedId after
the name being annotated.
---
clang/docs/ReleaseNotes.rst | 5 ++++-
clang/lib/Sema/SemaTemplate.cpp | 3 +++
.../basic/basic.lookup/basic.lookup.classref/p1.cpp | 13 +++++++++++++
3 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst
index 1d0896f585fb4..234c28a143cf1 100644
--- a/clang/docs/ReleaseNotes.rst
+++ b/clang/docs/ReleaseNotes.rst
@@ -517,7 +517,10 @@ Improvements to Clang's diagnostics
- Improved the ``-Wtautological-overlap-compare`` diagnostics to warn about
overlapping and non-overlapping ranges involving character literals and
floating-point literals.
The warning message for non-overlapping cases has also been improved
(#GH13473).
-
+
+- Fixed a duplicate diagnostic when performing typo correction on function
template
+ calls with explicit template arguments. Fixes #GH139226.
+
Improvements to Clang's time-trace
----------------------------------
diff --git a/clang/lib/Sema/SemaTemplate.cpp b/clang/lib/Sema/SemaTemplate.cpp
index 2ba69c87d95e3..a18b545a5feea 100644
--- a/clang/lib/Sema/SemaTemplate.cpp
+++ b/clang/lib/Sema/SemaTemplate.cpp
@@ -523,6 +523,9 @@ bool Sema::LookupTemplateName(LookupResult &Found, Scope
*S, CXXScopeSpec &SS,
if (Found.isAmbiguous()) {
Found.clear();
} else if (!Found.empty()) {
+ // Do not erase the typo-corrected result to avoid duplicating the typo
+ // correction in future.
+ AllowFunctionTemplatesInLookup = true;
Found.setLookupName(Corrected.getCorrection());
if (LookupCtx) {
std::string CorrectedStr(Corrected.getAsString(getLangOpts()));
diff --git a/clang/test/CXX/basic/basic.lookup/basic.lookup.classref/p1.cpp
b/clang/test/CXX/basic/basic.lookup/basic.lookup.classref/p1.cpp
index e3599db18350b..3633ef1c293e2 100644
--- a/clang/test/CXX/basic/basic.lookup/basic.lookup.classref/p1.cpp
+++ b/clang/test/CXX/basic/basic.lookup/basic.lookup.classref/p1.cpp
@@ -98,3 +98,16 @@ namespace PR11856 {
}
}
}
+
+namespace GH139226 {
+
+struct Foo {
+ template <class T> void LookupWithID(); // expected-note {{declared here}}
+};
+
+void test(Foo &f) {
+ f.LookupWithId<int>();
+ // expected-error@-1 {{did you mean 'LookupWithID'}}
+}
+
+}
>From 70f57ea63bf80b9d18d8b7a1334f3042803ab386 Mon Sep 17 00:00:00 2001
From: Younan Zhang <zyn7...@gmail.com>
Date: Sat, 10 May 2025 19:54:40 +0800
Subject: [PATCH 2/2] Address feedback
---
clang/docs/ReleaseNotes.rst | 2 +-
clang/lib/Sema/SemaTemplate.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst
index 234c28a143cf1..e362ec595a3bb 100644
--- a/clang/docs/ReleaseNotes.rst
+++ b/clang/docs/ReleaseNotes.rst
@@ -519,7 +519,7 @@ Improvements to Clang's diagnostics
The warning message for non-overlapping cases has also been improved
(#GH13473).
- Fixed a duplicate diagnostic when performing typo correction on function
template
- calls with explicit template arguments. Fixes #GH139226.
+ calls with explicit template arguments. (#GH139226)
Improvements to Clang's time-trace
----------------------------------
diff --git a/clang/lib/Sema/SemaTemplate.cpp b/clang/lib/Sema/SemaTemplate.cpp
index a18b545a5feea..7940340064eda 100644
--- a/clang/lib/Sema/SemaTemplate.cpp
+++ b/clang/lib/Sema/SemaTemplate.cpp
@@ -523,8 +523,8 @@ bool Sema::LookupTemplateName(LookupResult &Found, Scope
*S, CXXScopeSpec &SS,
if (Found.isAmbiguous()) {
Found.clear();
} else if (!Found.empty()) {
- // Do not erase the typo-corrected result to avoid duplicating the typo
- // correction in future.
+ // Do not erase the typo-corrected result to avoid duplicated
+ // diagnostics.
AllowFunctionTemplatesInLookup = true;
Found.setLookupName(Corrected.getCorrection());
if (LookupCtx) {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
