[clang][Diagnostic] Clarify error message for auto

[jdoe3945]

Show line and file for auto template error in -std=c++20 or -std=c++23
Fixes #147324

[github-actions]

Thank you for submitting a Pull Request (PR) to the LLVM Project!

This PR will be automatically labeled and the relevant teams will be notified.

If you wish to, you can add reviewers by using the "Reviewers" section on this page.

If this is not working for you, it is probably because you do not have write permissions for the repository. In which case you can instead tag reviewers by name in a comment by using @ followed by their GitHub username.

If you have received no comments on your PR for a week, you can request a review by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate is once a week. Please remember that you are asking for valuable time from other developers.

If you have further questions, they may be answered by the LLVM GitHub User Guide.

You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums.

[llvmbot]

@llvm/pr-subscribers-clang

Author: Emily Dror (emily-dror)

Changes

Show line and file for auto template error in -std=c++20 or -std=c++23

---

Full diff: https://github.com/llvm/llvm-project/pull/149781.diff

1 Files Affected:

• (modified) clang/lib/Sema/SemaTemplate.cpp (+18-6)

diff --git a/clang/lib/Sema/SemaTemplate.cpp b/clang/lib/Sema/SemaTemplate.cpp
index b76619fc50268..4505d5f7f2226 100644
--- a/clang/lib/Sema/SemaTemplate.cpp
+++ b/clang/lib/Sema/SemaTemplate.cpp
@@ -8238,12 +8238,24 @@ Sema::CheckTemplateDeclScope(Scope *S, TemplateParameterList *TemplateParams) {
     if (CXXRecordDecl *RD = dyn_cast<CXXRecordDecl>(Ctx)) {
       // C++ [temp.mem]p2:
       //   A local class shall not have member templates.
-      if (RD->isLocalClass())
-        return Diag(TemplateParams->getTemplateLoc(),
-                    diag::err_template_inside_local_class)
-          << TemplateParams->getSourceRange();
-      else
-        return false;
+      if (RD->isLocalClass()) {
+        SourceLocation DiagLoc = TemplateParams->getTemplateLoc();
+        if (DiagLoc.isInvalid()) {
+          for (const NamedDecl *Param : *TemplateParams) {
+            if (Param && Param->getLocation().isValid()) {
+              DiagLoc = Param->getLocation();
+              break;
+            }
+          }
+        }
+        if (DiagLoc.isInvalid()) {
+          // Still no good location? Fall back to the class declaration itself
+          DiagLoc = RD->getLocation();
+        }
+        return Diag(DiagLoc, diag::err_template_inside_local_class)
+               << TemplateParams->getSourceRange();
+      }
+      return false;
     }
   }
 

[jdoe3945]

Fixes #147324

[vbvictor]

Hi, thank you for your contribution!
Please add comprehensive test-cases for your change to make sure everything work as expected and continue to do so in the future.
Please add an entry in clang/docs/ReleaseNotes.rst to let everyone know about your fix.
Please add "Fixes #147324" into PR description (not standalone comment) to automatically link issue to this PR.

[erichkeane]

I think we'd want to extract the determination of a dialog location into a separate function (lambda?) to help calculate it, in both of the diag cases, including hte err_template_outside_namespace_or_class_scope diag.

Also: we need a test for this. A simple reproducer that uses //expected-error lines that point to a line instead of 'in general' i think will work.

[erichkeane]

We need to cover 8261 as well.

[jdoe3945]

Good catch, thanks for the review. Would you direct me to the documentation for writing test cases?

Also: we need a test for this. A simple reproducer that uses //expected-error lines that point to a line instead of 'in general' i think will work.

[ojhunt]

minor style nits, but needs some more tests added

[zwuis]

LGTM modulo comments and tests. I'm not sure if tests are enough.

[zwuis]

Please reference the issue fixed by this patch like other entries.

[zwuis]

Please move the declaration so that the comment above and the corresponding code are not separated.

[zyn0217]

Ping @emily-dror are you still working on this issue?