[Clang] Fix : More Detailed "No expected directives found" #78338

Sh0g0-1758 · 2024-01-16T19:59:16Z

PR SUMMARY: "Updated the error message to use the proper prefix when no expected directives are found by changing the hard coded expected in the message to a dynamic value in two error messages"

github-actions · 2024-01-16T19:59:32Z

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 · 2024-01-16T19:59:58Z

@llvm/pr-subscribers-clang

Author: Shourya Goel (Sh0g0-1758)

Changes

This pull request aims to solve the issue mentioned here
I have made the necessary changes to the best of my knowledge and updated tests for the same.
Please do suggest changes in it.

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

9 Files Affected:

(modified) clang-tools-extra/clangd/test/indexer.test (+1-1)
(modified) clang/include/clang/Basic/Diagnostic.h (+3-1)
(modified) clang/include/clang/Basic/DiagnosticFrontendKinds.td (+1-1)
(modified) clang/lib/AST/ASTContext.cpp (+1-1)
(modified) clang/lib/Frontend/VerifyDiagnosticConsumer.cpp (+4-1)
(modified) clang/test/ARCMT/verify.m (+1-1)
(modified) clang/test/Frontend/verify.c (+1-1)
(modified) clang/test/Frontend/verify2.c (+1-1)
(modified) clang/test/Frontend/verify3.c (+2-2)

diff --git a/clang-tools-extra/clangd/test/indexer.test b/clang-tools-extra/clangd/test/indexer.test
index 2f01f6c557a7de..213d33f8e2d6a5 100644
--- a/clang-tools-extra/clangd/test/indexer.test
+++ b/clang-tools-extra/clangd/test/indexer.test
@@ -5,5 +5,5 @@
 # `.ii` file and `-verify` triggers extra diagnostics generation. Clangd should
 # strip those.
 # RUN: clangd-indexer %t.cpp -- -Xclang -verify --save-temps -- 2>&1 | FileCheck %s
-# CHECK-NOT: error: no expected directives found: consider use of 'expected-no-diagnostics'
+# CHECK-NOT: error: no expected directives found: consider use of {{.*}}-no-diagnostics
 # RUN: not ls %t.ii
diff --git a/clang/include/clang/Basic/Diagnostic.h b/clang/include/clang/Basic/Diagnostic.h
index 0c7836c2ea569c..a185c75e418b58 100644
--- a/clang/include/clang/Basic/Diagnostic.h
+++ b/clang/include/clang/Basic/Diagnostic.h
@@ -9,7 +9,9 @@
 /// \file
 /// Defines the Diagnostic-related interfaces.
 //
-//===----------------------------------------------------------------------===//
+//===----------------------------------------------------------------------===//]
+
+// look into this file as well
 
 #ifndef LLVM_CLANG_BASIC_DIAGNOSTIC_H
 #define LLVM_CLANG_BASIC_DIAGNOSTIC_H
diff --git a/clang/include/clang/Basic/DiagnosticFrontendKinds.td b/clang/include/clang/Basic/DiagnosticFrontendKinds.td
index 568000106a84dc..42d2767af6b708 100644
--- a/clang/include/clang/Basic/DiagnosticFrontendKinds.td
+++ b/clang/include/clang/Basic/DiagnosticFrontendKinds.td
@@ -179,7 +179,7 @@ def err_verify_invalid_no_diags : Error<
     "%select{expected|'expected-no-diagnostics'}0 directive cannot follow "
     "%select{'expected-no-diagnostics' directive|other expected directives}0">;
 def err_verify_no_directives : Error<
-    "no expected directives found: consider use of 'expected-no-diagnostics'">;
+    "no expected directives found: consider use of '%0'-no-diagnostics">;
 def err_verify_nonconst_addrspace : Error<
   "qualifier 'const' is needed for variables in address space '%0'">;
 
diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index b60dcfaabfd1a4..e3b2f1f48ed1e2 100644
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/lib/AST/ASTContext.cpp
@@ -1404,7 +1404,7 @@ void ASTContext::InitBuiltinTypes(const TargetInfo &Target,
     getTranslationUnitDecl()->addDecl(MSGuidTagDecl);
   }
 }
-
+// maybe change here also.
 DiagnosticsEngine &ASTContext::getDiagnostics() const {
   return SourceMgr.getDiagnostics();
 }
diff --git a/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp b/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp
index 8a3d2286cd168c..30cd7f47a21c1f 100644
--- a/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp
+++ b/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp
@@ -1098,7 +1098,10 @@ void VerifyDiagnosticConsumer::CheckDiagnostics() {
     // Produce an error if no expected-* directives could be found in the
     // source file(s) processed.
     if (Status == HasNoDirectives) {
-      Diags.Report(diag::err_verify_no_directives).setForceEmit();
+      // change here
+      std::string directives =
+          *Diags.getDiagnosticOptions().VerifyPrefixes.begin();
+      Diags.Report(diag::err_verify_no_directives).setForceEmit() << directives;
       ++NumErrors;
       Status = HasNoDirectivesReported;
     }
diff --git a/clang/test/ARCMT/verify.m b/clang/test/ARCMT/verify.m
index 7d245fe80575e5..13fd599f530fbe 100644
--- a/clang/test/ARCMT/verify.m
+++ b/clang/test/ARCMT/verify.m
@@ -11,7 +11,7 @@
 #error
 // expected-error@-1 {{}}
 
-//      CHECK: error: no expected directives found: consider use of 'expected-no-diagnostics'
+//      CHECK: error: no expected directives found: consider use of {{.*}}-no-diagnostics
 // CHECK-NEXT: error: 'expected-error' diagnostics seen but not expected:
 // CHECK-NEXT:   (frontend): error reading '{{.*}}verify.m.tmp.invalid'
 // CHECK-NEXT: 2 errors generated.
diff --git a/clang/test/Frontend/verify.c b/clang/test/Frontend/verify.c
index 221b715c19e416..657a9d3f2bf6bb 100644
--- a/clang/test/Frontend/verify.c
+++ b/clang/test/Frontend/verify.c
@@ -111,7 +111,7 @@ unexpected b; // expected-error@33 1-1 {{unknown type}}
 #if 0
 // RUN: not %clang_cc1 -verify %t.invalid 2>&1 | FileCheck -check-prefix=CHECK6 %s
 
-//      CHECK6: error: no expected directives found: consider use of 'expected-no-diagnostics'
+//      CHECK6: error: no expected directives found: consider use of {{.*}}-no-diagnostics
 // CHECK6-NEXT: error: 'expected-error' diagnostics seen but not expected:
 // CHECK6-NEXT:   (frontend): error reading '{{.*}}verify.c.tmp.invalid'
 // CHECK6-NEXT: 2 errors generated.
diff --git a/clang/test/Frontend/verify2.c b/clang/test/Frontend/verify2.c
index debaeb6b498678..77510c8d9b4940 100644
--- a/clang/test/Frontend/verify2.c
+++ b/clang/test/Frontend/verify2.c
@@ -12,7 +12,7 @@
 #if 0
 // expected-error {{should be ignored}}
 
-//      CHECK: error: no expected directives found: consider use of 'expected-no-diagnostics'
+//      CHECK: error: no expected directives found: consider use of {{.*}}-no-diagnostics
 // CHECK-NEXT: error: 'expected-error' diagnostics seen but not expected:
 // CHECK-NEXT:   Line 5: header
 // CHECK-NEXT:   Line 10: source
diff --git a/clang/test/Frontend/verify3.c b/clang/test/Frontend/verify3.c
index e414c7370fad77..8924619592f583 100644
--- a/clang/test/Frontend/verify3.c
+++ b/clang/test/Frontend/verify3.c
@@ -28,7 +28,7 @@
 #ifdef TEST3
 // no directives
 
-//      CHECK3: error: no expected directives found: consider use of 'expected-no-diagnostics'
+//      CHECK3: error: no expected directives found: consider use of {{.*}}-no-diagnostics
 // CHECK3-NEXT: 1 error generated.
 #endif
 
@@ -37,5 +37,5 @@
 #warning X
 // expected-warning@-1 {{X}}
 
-// CHECK4-NOT: error: no expected directives found: consider use of 'expected-no-diagnostics'
+// CHECK4-NOT: error: no expected directives found: consider use of {{.*}}-no-diagnostics
 #endif

llvmbot · 2024-01-16T19:59:59Z

@llvm/pr-subscribers-clangd

Author: Shourya Goel (Sh0g0-1758)

Changes

This pull request aims to solve the issue mentioned here
I have made the necessary changes to the best of my knowledge and updated tests for the same.
Please do suggest changes in it.

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

9 Files Affected:

(modified) clang-tools-extra/clangd/test/indexer.test (+1-1)
(modified) clang/include/clang/Basic/Diagnostic.h (+3-1)
(modified) clang/include/clang/Basic/DiagnosticFrontendKinds.td (+1-1)
(modified) clang/lib/AST/ASTContext.cpp (+1-1)
(modified) clang/lib/Frontend/VerifyDiagnosticConsumer.cpp (+4-1)
(modified) clang/test/ARCMT/verify.m (+1-1)
(modified) clang/test/Frontend/verify.c (+1-1)
(modified) clang/test/Frontend/verify2.c (+1-1)
(modified) clang/test/Frontend/verify3.c (+2-2)

diff --git a/clang-tools-extra/clangd/test/indexer.test b/clang-tools-extra/clangd/test/indexer.test
index 2f01f6c557a7de..213d33f8e2d6a5 100644
--- a/clang-tools-extra/clangd/test/indexer.test
+++ b/clang-tools-extra/clangd/test/indexer.test
@@ -5,5 +5,5 @@
 # `.ii` file and `-verify` triggers extra diagnostics generation. Clangd should
 # strip those.
 # RUN: clangd-indexer %t.cpp -- -Xclang -verify --save-temps -- 2>&1 | FileCheck %s
-# CHECK-NOT: error: no expected directives found: consider use of 'expected-no-diagnostics'
+# CHECK-NOT: error: no expected directives found: consider use of {{.*}}-no-diagnostics
 # RUN: not ls %t.ii
diff --git a/clang/include/clang/Basic/Diagnostic.h b/clang/include/clang/Basic/Diagnostic.h
index 0c7836c2ea569c..a185c75e418b58 100644
--- a/clang/include/clang/Basic/Diagnostic.h
+++ b/clang/include/clang/Basic/Diagnostic.h
@@ -9,7 +9,9 @@
 /// \file
 /// Defines the Diagnostic-related interfaces.
 //
-//===----------------------------------------------------------------------===//
+//===----------------------------------------------------------------------===//]
+
+// look into this file as well
 
 #ifndef LLVM_CLANG_BASIC_DIAGNOSTIC_H
 #define LLVM_CLANG_BASIC_DIAGNOSTIC_H
diff --git a/clang/include/clang/Basic/DiagnosticFrontendKinds.td b/clang/include/clang/Basic/DiagnosticFrontendKinds.td
index 568000106a84dc..42d2767af6b708 100644
--- a/clang/include/clang/Basic/DiagnosticFrontendKinds.td
+++ b/clang/include/clang/Basic/DiagnosticFrontendKinds.td
@@ -179,7 +179,7 @@ def err_verify_invalid_no_diags : Error<
     "%select{expected|'expected-no-diagnostics'}0 directive cannot follow "
     "%select{'expected-no-diagnostics' directive|other expected directives}0">;
 def err_verify_no_directives : Error<
-    "no expected directives found: consider use of 'expected-no-diagnostics'">;
+    "no expected directives found: consider use of '%0'-no-diagnostics">;
 def err_verify_nonconst_addrspace : Error<
   "qualifier 'const' is needed for variables in address space '%0'">;
 
diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index b60dcfaabfd1a4..e3b2f1f48ed1e2 100644
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/lib/AST/ASTContext.cpp
@@ -1404,7 +1404,7 @@ void ASTContext::InitBuiltinTypes(const TargetInfo &Target,
     getTranslationUnitDecl()->addDecl(MSGuidTagDecl);
   }
 }
-
+// maybe change here also.
 DiagnosticsEngine &ASTContext::getDiagnostics() const {
   return SourceMgr.getDiagnostics();
 }
diff --git a/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp b/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp
index 8a3d2286cd168c..30cd7f47a21c1f 100644
--- a/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp
+++ b/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp
@@ -1098,7 +1098,10 @@ void VerifyDiagnosticConsumer::CheckDiagnostics() {
     // Produce an error if no expected-* directives could be found in the
     // source file(s) processed.
     if (Status == HasNoDirectives) {
-      Diags.Report(diag::err_verify_no_directives).setForceEmit();
+      // change here
+      std::string directives =
+          *Diags.getDiagnosticOptions().VerifyPrefixes.begin();
+      Diags.Report(diag::err_verify_no_directives).setForceEmit() << directives;
       ++NumErrors;
       Status = HasNoDirectivesReported;
     }
diff --git a/clang/test/ARCMT/verify.m b/clang/test/ARCMT/verify.m
index 7d245fe80575e5..13fd599f530fbe 100644
--- a/clang/test/ARCMT/verify.m
+++ b/clang/test/ARCMT/verify.m
@@ -11,7 +11,7 @@
 #error
 // expected-error@-1 {{}}
 
-//      CHECK: error: no expected directives found: consider use of 'expected-no-diagnostics'
+//      CHECK: error: no expected directives found: consider use of {{.*}}-no-diagnostics
 // CHECK-NEXT: error: 'expected-error' diagnostics seen but not expected:
 // CHECK-NEXT:   (frontend): error reading '{{.*}}verify.m.tmp.invalid'
 // CHECK-NEXT: 2 errors generated.
diff --git a/clang/test/Frontend/verify.c b/clang/test/Frontend/verify.c
index 221b715c19e416..657a9d3f2bf6bb 100644
--- a/clang/test/Frontend/verify.c
+++ b/clang/test/Frontend/verify.c
@@ -111,7 +111,7 @@ unexpected b; // expected-error@33 1-1 {{unknown type}}
 #if 0
 // RUN: not %clang_cc1 -verify %t.invalid 2>&1 | FileCheck -check-prefix=CHECK6 %s
 
-//      CHECK6: error: no expected directives found: consider use of 'expected-no-diagnostics'
+//      CHECK6: error: no expected directives found: consider use of {{.*}}-no-diagnostics
 // CHECK6-NEXT: error: 'expected-error' diagnostics seen but not expected:
 // CHECK6-NEXT:   (frontend): error reading '{{.*}}verify.c.tmp.invalid'
 // CHECK6-NEXT: 2 errors generated.
diff --git a/clang/test/Frontend/verify2.c b/clang/test/Frontend/verify2.c
index debaeb6b498678..77510c8d9b4940 100644
--- a/clang/test/Frontend/verify2.c
+++ b/clang/test/Frontend/verify2.c
@@ -12,7 +12,7 @@
 #if 0
 // expected-error {{should be ignored}}
 
-//      CHECK: error: no expected directives found: consider use of 'expected-no-diagnostics'
+//      CHECK: error: no expected directives found: consider use of {{.*}}-no-diagnostics
 // CHECK-NEXT: error: 'expected-error' diagnostics seen but not expected:
 // CHECK-NEXT:   Line 5: header
 // CHECK-NEXT:   Line 10: source
diff --git a/clang/test/Frontend/verify3.c b/clang/test/Frontend/verify3.c
index e414c7370fad77..8924619592f583 100644
--- a/clang/test/Frontend/verify3.c
+++ b/clang/test/Frontend/verify3.c
@@ -28,7 +28,7 @@
 #ifdef TEST3
 // no directives
 
-//      CHECK3: error: no expected directives found: consider use of 'expected-no-diagnostics'
+//      CHECK3: error: no expected directives found: consider use of {{.*}}-no-diagnostics
 // CHECK3-NEXT: 1 error generated.
 #endif
 
@@ -37,5 +37,5 @@
 #warning X
 // expected-warning@-1 {{X}}
 
-// CHECK4-NOT: error: no expected directives found: consider use of 'expected-no-diagnostics'
+// CHECK4-NOT: error: no expected directives found: consider use of {{.*}}-no-diagnostics
 #endif

…ck and /branch

Sh0g0-1758 · 2024-01-16T21:10:25Z

Here you can see a working implementation of the asked feature.

Sh0g0-1758 · 2024-01-16T21:13:14Z

I have pushed code in this PR that aims to solve this issue also.

Sh0g0-1758 · 2024-01-16T21:18:44Z

Here is a working implementation of the second issue that I aim to solve.

clang/include/clang/Basic/Diagnostic.h

asl

Ensure that PR does not contain unrelated things. See https://llvm.org/docs/Contributing.html#how-to-submit-a-patch for more information

clang/lib/AST/ASTContext.cpp

clang/lib/Frontend/VerifyDiagnosticConsumer.cpp

llvm/utils/git/github-automation.py

Sh0g0-1758 · 2024-01-17T06:34:41Z

I have removed the unnecessary comments. @asl please do let me know whether I should submit different PRs for the issues. But I think that @tbaederr can review them both in this PR only. Also @asl , do let me know any other required changes.

clang/include/clang/Basic/Diagnostic.h

Sh0g0-1758 · 2024-01-17T11:12:21Z

@asl, I have checked all the files I changed and I have removed the unrelated changes and the changes related to another issue. Really sorry for this, I hope you can overlook it since this is my very first PR in LLVM.

clang-tools-extra/clangd/test/indexer.test

clang/include/clang/Basic/DiagnosticFrontendKinds.td

Sh0g0-1758 · 2024-01-17T14:37:24Z

@tbaederr, please review the changes.

clang/test/ARCMT/verify.m

…ert changes in only -verify= test cases in verify files

github-actions · 2024-01-19T18:54:56Z

✅ With the latest revision this PR passed the C/C++ code formatter.

Sh0g0-1758 · 2024-01-19T18:56:18Z

Please see the desired behavior in this screenshot :

With -verify= we get expected-no-diagnostics and with -verify=foo we get foo-no-diagnostics

@tbaederr and @asl please see the updated changes and suggest improvements in it if any.

Sh0g0-1758 · 2024-01-26T09:02:26Z

@asl @tbaederr @AaronBallman, can you please review this PR and merge it if everything seems fine.

clang/include/clang/Basic/DiagnosticFrontendKinds.td

jrtc27 · 2024-01-26T23:40:11Z

clang/include/clang/Basic/DiagnosticFrontendKinds.td

@@ -179,7 +179,7 @@ def err_verify_invalid_no_diags : Error<
    "%select{expected|'expected-no-diagnostics'}0 directive cannot follow "
    "%select{'expected-no-diagnostics' directive|other expected directives}0">;


This looks like it needs templating?

Can you please elaborate on this.

I think @jrtc27 is saying that this diagnostic should also change to use %0 similar to what you've done for err_verify_no_directives because it has the same issue with saying 'expected-no-diagnostics'.

I see, that can be done easily but I think according to LLVM PR standards, its best to limit one PR for one issue. Maybe you can start it as a different issue and then I will submit a PR for the same.

I think this is the same issue -- in both cases, it's a hard-coded expected-no-diagnostics that is incorrect in the presence of a different prefix being used. Because of that, I'd still recommend doing it as part of this PR instead of as a separate one.

Ah really sorry about that. Since this was pending for a few days and I wanted to push more PRs for the other issues without making a separate branch and rebasing them, I got a little impatient. Will surely keep this thing in mind from now on.

I definitely sympathize with you wanting to push more than one PR at a time, but the way to do it is to follow GitHub flow, specifically a part of it that says you should work in branches, and create your PRs from then: https://docs.github.com/en/get-started/using-github/github-flow#create-a-branch. This way PRs that touch different code can go through as many rounds of review as needed, without blocking other PRs.

Nagging reviewers won't get you anywhere, or even worse, deter reviewers from your PRs.

Yes I understand. I made a beginners mistake of not making a branch for the changes in this PR. Will surely keep that in mind from now on. Also I hope you can overlook my enthu, was not trying to nag any reviewers.

No worries about the extra pings (we'd rather see people "too" enthusiastic than disengaged!), just something to keep in mind for the future. :-)

The reason I think this diagnostic also needs to be updated is because of: https://godbolt.org/z/sEf4o8YY9 and https://godbolt.org/z/8oMWffoxY where it says 'expected-no-diagnostics' in the diagnostic message. I think those should also say 'foo-no-diagnostics' similar to how you've fixed it for the no expected directives found warning.

Thanks a lot for looking over it.

I have made the required changes and added more tests for the same. Please take a look and suggest changes.

Sh0g0-1758 · 2024-01-29T09:26:44Z

gentle ping.

AaronBallman

Thank you for the fix! Can you please add more description to what is being fixed and how to the PR summary (as that becomes the commit message when we land the changes)?

I don't think a release note is necessary because this isn't really a user-facing feature (it's a feature for developers of Clang), but the changes should come with some test coverage, probably in clang/test/Frontend/verify.c or a new test similar to it.

clang/include/clang/Basic/DiagnosticFrontendKinds.td

AaronBallman · 2024-01-30T13:48:53Z

clang/include/clang/Basic/DiagnosticFrontendKinds.td

@@ -179,7 +179,7 @@ def err_verify_invalid_no_diags : Error<
    "%select{expected|'expected-no-diagnostics'}0 directive cannot follow "
    "%select{'expected-no-diagnostics' directive|other expected directives}0">;


I think @jrtc27 is saying that this diagnostic should also change to use %0 similar to what you've done for err_verify_no_directives because it has the same issue with saying 'expected-no-diagnostics'.

AaronBallman · 2024-01-30T13:49:53Z

clang/lib/Frontend/VerifyDiagnosticConsumer.cpp

+      std::string Err_Directive;
+      if (Diags.getDiagnosticOptions().VerifyPrefixes.empty()) {
+        Err_Directive = "expected";
+      } else {
+        Err_Directive = *Diags.getDiagnosticOptions().VerifyPrefixes.begin();
+      }
+      Diags.Report(diag::err_verify_no_directives).setForceEmit()
+          << Err_Directive;


Suggested change

std::string Err_Directive;

if (Diags.getDiagnosticOptions().VerifyPrefixes.empty()) {

Err_Directive = "expected";

} else {

Err_Directive = *Diags.getDiagnosticOptions().VerifyPrefixes.begin();

}

Diags.Report(diag::err_verify_no_directives).setForceEmit()

<< Err_Directive;

std::string ErrDirective;

if (Diags.getDiagnosticOptions().VerifyPrefixes.empty())

ErrDirective = "expected";

else

ErrDirective = *Diags.getDiagnosticOptions().VerifyPrefixes.begin();

Diags.Report(diag::err_verify_no_directives).setForceEmit()

<< ErrDirective;

We might want to split this logic out into a helper function if we're also updating err_verify_invalid_no_diags at the same time.

Please let me know if we are doing this also in this PR. I think its best to raise a separate issue for the same as LLVM PR standards imply.

Sh0g0-1758 · 2024-01-31T19:22:29Z

Hey @AaronBallman, I have added a test for the same in clang/test/Frontend/verify.c and made the necessary changes as well. I have added a short PR SUMMARY to the top-level comment as you instructed. As for changes in other error messages, I don't think they come under this PR.

Sh0g0-1758 · 2024-02-04T13:30:06Z

gentle ping. Please check the mergeability of this PR.

Endilll · 2024-02-05T07:45:59Z

gentle ping. Please check the mergeability of this PR.

Friendly reminder of one ping per week policy.

AaronBallman

Thank you, aside from some small suggestions, this LGTM

clang/lib/Frontend/VerifyDiagnosticConsumer.cpp

AaronBallman

LGTM, thank you!

AaronBallman · 2024-02-06T22:21:54Z

I believe the concerns from @asl and @tbaederr have been addressed and we're fine to land this, but I'll land it tomorrow to give them both a chance to weigh-in and to give precommit CI a chance to finish.

Sh0g0-1758 added 2 commits January 17, 2024 01:24

Fix : more detailed no expected directive message

b98f02d

ran git clang formatter

6074d28

llvmbot added clang Clang issues not falling into any other category clangd clang:frontend Language frontend issues, e.g. anything involving "Sema" labels Jan 16, 2024

[Github Automation] : Add support for optional colon after /cherry-pi…

ab3c0f7

…ck and /branch

asl reviewed Jan 16, 2024

View reviewed changes

clang/include/clang/Basic/Diagnostic.h Outdated Show resolved Hide resolved

asl requested changes Jan 16, 2024

View reviewed changes

clang/lib/AST/ASTContext.cpp Outdated Show resolved Hide resolved

clang/lib/Frontend/VerifyDiagnosticConsumer.cpp Outdated Show resolved Hide resolved

llvm/utils/git/github-automation.py Outdated Show resolved Hide resolved

Removed Unnecesary Comments

53a25bf

asl reviewed Jan 17, 2024

View reviewed changes

clang/include/clang/Basic/Diagnostic.h Outdated Show resolved Hide resolved

Removed Unrelated Changes

727b479

tbaederr requested changes Jan 17, 2024

View reviewed changes

clang-tools-extra/clangd/test/indexer.test Outdated Show resolved Hide resolved

clang/include/clang/Basic/DiagnosticFrontendKinds.td Outdated Show resolved Hide resolved

refactor : Change position of '' and revert tests in indexer.test

56a4212

Sh0g0-1758 requested review from tbaederr and asl January 17, 2024 20:05

tbaederr reviewed Jan 18, 2024

View reviewed changes

clang/test/ARCMT/verify.m Outdated Show resolved Hide resolved

Sh0g0-1758 requested a review from tbaederr January 18, 2024 16:22

Fix : Added Support for -verify= and -verify={multi diagnostics}, rev…

75c02db

…ert changes in only -verify= test cases in verify files

Ran clang formatter

b8fd4ab

Sh0g0-1758 requested a review from tbaederr January 24, 2024 12:35

retrigger checks

bd5b580

Sh0g0-1758 added 4 commits January 27, 2024 00:47

Reformat Directive to Err_Directive to get checks passed

c192bdd

Revert

ed752f6

Revert back to original change

7380990

Ran clang formatter

55d8f40

jrtc27 reviewed Jan 26, 2024

View reviewed changes

clang/include/clang/Basic/DiagnosticFrontendKinds.td Show resolved Hide resolved

jrtc27 reviewed Jan 26, 2024

View reviewed changes

AaronBallman reviewed Jan 30, 2024

View reviewed changes

Sh0g0-1758 and others added 3 commits January 31, 2024 23:37

Merge branch 'llvm:main' into main

23158f2

Removed {} in the logic builder

d52d433

Added test for changes

cadac6c

Sh0g0-1758 requested a review from AaronBallman January 31, 2024 19:22

Refactored Tests

a938283

asl removed their request for review February 3, 2024 00:36

Sh0g0-1758 added 2 commits February 6, 2024 22:18

Templated the error message err_verify_invalid_no_diags

36e8691

Ran clang formatter

2f5789d

AaronBallman reviewed Feb 6, 2024

View reviewed changes

clang/lib/Frontend/VerifyDiagnosticConsumer.cpp Outdated Show resolved Hide resolved

Sh0g0-1758 added 2 commits February 7, 2024 02:11

Refactored DetailedErrorString Function

0ab2604

Retrigger Checks

ba13ca9

AaronBallman approved these changes Feb 6, 2024

View reviewed changes

AaronBallman merged commit 4e58f03 into llvm:main Feb 7, 2024

		@@ -179,7 +179,7 @@ def err_verify_invalid_no_diags : Error<
		"%select{expected\|'expected-no-diagnostics'}0 directive cannot follow "
		"%select{'expected-no-diagnostics' directive\|other expected directives}0">;

[Clang] Fix : More Detailed "No expected directives found" #78338

[Clang] Fix : More Detailed "No expected directives found" #78338

Uh oh!

Conversation

Sh0g0-1758 commented Jan 16, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Jan 16, 2024

Uh oh!

llvmbot commented Jan 16, 2024

Uh oh!

llvmbot commented Jan 16, 2024

Uh oh!

Sh0g0-1758 commented Jan 16, 2024

Uh oh!

Sh0g0-1758 commented Jan 16, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Sh0g0-1758 commented Jan 16, 2024

Uh oh!

Uh oh!

asl left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Sh0g0-1758 commented Jan 17, 2024

Uh oh!

Uh oh!

Sh0g0-1758 commented Jan 17, 2024

Uh oh!

Uh oh!

Uh oh!

Sh0g0-1758 commented Jan 17, 2024

Uh oh!

Uh oh!

github-actions bot commented Jan 19, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Sh0g0-1758 commented Jan 19, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Sh0g0-1758 commented Jan 26, 2024

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Sh0g0-1758 commented Jan 29, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

AaronBallman left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Sh0g0-1758 commented Jan 31, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Sh0g0-1758 commented Jan 16, 2024 •

edited

Loading

Sh0g0-1758 commented Jan 16, 2024 •

edited

Loading

github-actions bot commented Jan 19, 2024 •

edited

Loading

Sh0g0-1758 commented Jan 19, 2024 •

edited

Loading

Sh0g0-1758 commented Jan 29, 2024 •

edited

Loading

Sh0g0-1758 commented Jan 31, 2024 •

edited

Loading