[clang] [llvm] [clang-tools-extra] [CLANG] Fix : More Detailed "No expected directives found" (PR #78338)
Shourya Goel via llvm-commits
llvm-commits at lists.llvm.org
Fri Jan 19 10:58:45 PST 2024
https://github.com/Sh0g0-1758 updated https://github.com/llvm/llvm-project/pull/78338
>From b98f02d4c155b5be9bd4f5b2e4bf73720a81f39a Mon Sep 17 00:00:00 2001
From: Sh0g0-1758 <shouryagoel10000 at gmail.com>
Date: Wed, 17 Jan 2024 01:24:17 +0530
Subject: [PATCH 1/8] Fix : more detailed no expected directive message
---
clang-tools-extra/clangd/test/indexer.test | 2 +-
clang/include/clang/Basic/Diagnostic.h | 4 +++-
clang/include/clang/Basic/DiagnosticFrontendKinds.td | 2 +-
clang/lib/AST/ASTContext.cpp | 2 +-
clang/lib/Frontend/VerifyDiagnosticConsumer.cpp | 4 +++-
clang/test/ARCMT/verify.m | 2 +-
clang/test/Frontend/verify.c | 2 +-
clang/test/Frontend/verify2.c | 2 +-
clang/test/Frontend/verify3.c | 4 ++--
9 files changed, 14 insertions(+), 10 deletions(-)
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..0997ac9fa7df04 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..9a26905a76d46b 100644
--- a/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp
+++ b/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp
@@ -1098,7 +1098,9 @@ 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 at -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 at 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 at -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
>From 6074d28853f7b7e5c9fffa04300129aef328faa4 Mon Sep 17 00:00:00 2001
From: Sh0g0-1758 <shouryagoel10000 at gmail.com>
Date: Wed, 17 Jan 2024 01:24:44 +0530
Subject: [PATCH 2/8] ran git clang formatter
---
clang/lib/AST/ASTContext.cpp | 2 +-
clang/lib/Frontend/VerifyDiagnosticConsumer.cpp | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index 0997ac9fa7df04..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.
+// 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 9a26905a76d46b..30cd7f47a21c1f 100644
--- a/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp
+++ b/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp
@@ -1099,7 +1099,8 @@ void VerifyDiagnosticConsumer::CheckDiagnostics() {
// source file(s) processed.
if (Status == HasNoDirectives) {
// change here
- std::string directives = *Diags.getDiagnosticOptions().VerifyPrefixes.begin();
+ std::string directives =
+ *Diags.getDiagnosticOptions().VerifyPrefixes.begin();
Diags.Report(diag::err_verify_no_directives).setForceEmit() << directives;
++NumErrors;
Status = HasNoDirectivesReported;
>From ab3c0f7cba57a6d5c0da5c361607b0b61bd42213 Mon Sep 17 00:00:00 2001
From: Sh0g0-1758 <shouryagoel10000 at gmail.com>
Date: Wed, 17 Jan 2024 02:18:46 +0530
Subject: [PATCH 3/8] [Github Automation] : Add support for optional colon
after /cherry-pick and /branch
---
llvm/utils/git/github-automation.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/llvm/utils/git/github-automation.py b/llvm/utils/git/github-automation.py
index c5fcf752310111..419a1c880272c6 100755
--- a/llvm/utils/git/github-automation.py
+++ b/llvm/utils/git/github-automation.py
@@ -635,16 +635,16 @@ def execute_command(self) -> bool:
"""
This function reads lines from STDIN and executes the first command
that it finds. The 2 supported commands are:
- /cherry-pick commit0 <commit1> <commit2> <...>
- /branch <owner>/<repo>/<branch>
+ /cherry-pick<:> commit0 <commit1> <commit2> <...>
+ /branch<:> <owner>/<repo>/<branch>
"""
for line in sys.stdin:
line.rstrip()
- m = re.search(r"/([a-z-]+)\s(.+)", line)
+ m = re.search(r"/([a-z-]+)(:?)(?:\s(.+))?", line)
if not m:
continue
command = m.group(1)
- args = m.group(2)
+ args = m.group(3)
if command == "cherry-pick":
arg_list = args.split()
>From 53a25bfd2d39860c616a7b43fb74d20d4109b0d2 Mon Sep 17 00:00:00 2001
From: Sh0g0-1758 <shouryagoel10000 at gmail.com>
Date: Wed, 17 Jan 2024 12:01:50 +0530
Subject: [PATCH 4/8] Removed Unnecesary Comments
---
clang/include/clang/Basic/Diagnostic.h | 2 --
clang/lib/AST/ASTContext.cpp | 2 +-
clang/lib/Frontend/VerifyDiagnosticConsumer.cpp | 1 -
3 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/clang/include/clang/Basic/Diagnostic.h b/clang/include/clang/Basic/Diagnostic.h
index a185c75e418b58..7354e20bc2ffc4 100644
--- a/clang/include/clang/Basic/Diagnostic.h
+++ b/clang/include/clang/Basic/Diagnostic.h
@@ -11,8 +11,6 @@
//
//===----------------------------------------------------------------------===//]
-// look into this file as well
-
#ifndef LLVM_CLANG_BASIC_DIAGNOSTIC_H
#define LLVM_CLANG_BASIC_DIAGNOSTIC_H
diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index e3b2f1f48ed1e2..b60dcfaabfd1a4 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 30cd7f47a21c1f..6288469eb80b33 100644
--- a/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp
+++ b/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp
@@ -1098,7 +1098,6 @@ void VerifyDiagnosticConsumer::CheckDiagnostics() {
// Produce an error if no expected-* directives could be found in the
// source file(s) processed.
if (Status == HasNoDirectives) {
- // change here
std::string directives =
*Diags.getDiagnosticOptions().VerifyPrefixes.begin();
Diags.Report(diag::err_verify_no_directives).setForceEmit() << directives;
>From 727b479f575fcc5808e2af79becf64a3b2b22ee6 Mon Sep 17 00:00:00 2001
From: Sh0g0-1758 <shouryagoel10000 at gmail.com>
Date: Wed, 17 Jan 2024 16:40:24 +0530
Subject: [PATCH 5/8] Removed Unrelated Changes
---
clang/include/clang/Basic/Diagnostic.h | 2 +-
llvm/utils/git/github-automation.py | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/clang/include/clang/Basic/Diagnostic.h b/clang/include/clang/Basic/Diagnostic.h
index 7354e20bc2ffc4..0c7836c2ea569c 100644
--- a/clang/include/clang/Basic/Diagnostic.h
+++ b/clang/include/clang/Basic/Diagnostic.h
@@ -9,7 +9,7 @@
/// \file
/// Defines the Diagnostic-related interfaces.
//
-//===----------------------------------------------------------------------===//]
+//===----------------------------------------------------------------------===//
#ifndef LLVM_CLANG_BASIC_DIAGNOSTIC_H
#define LLVM_CLANG_BASIC_DIAGNOSTIC_H
diff --git a/llvm/utils/git/github-automation.py b/llvm/utils/git/github-automation.py
index 419a1c880272c6..c5fcf752310111 100755
--- a/llvm/utils/git/github-automation.py
+++ b/llvm/utils/git/github-automation.py
@@ -635,16 +635,16 @@ def execute_command(self) -> bool:
"""
This function reads lines from STDIN and executes the first command
that it finds. The 2 supported commands are:
- /cherry-pick<:> commit0 <commit1> <commit2> <...>
- /branch<:> <owner>/<repo>/<branch>
+ /cherry-pick commit0 <commit1> <commit2> <...>
+ /branch <owner>/<repo>/<branch>
"""
for line in sys.stdin:
line.rstrip()
- m = re.search(r"/([a-z-]+)(:?)(?:\s(.+))?", line)
+ m = re.search(r"/([a-z-]+)\s(.+)", line)
if not m:
continue
command = m.group(1)
- args = m.group(3)
+ args = m.group(2)
if command == "cherry-pick":
arg_list = args.split()
>From 56a4212b8b54bf1146de959b80a340c1149d3d86 Mon Sep 17 00:00:00 2001
From: Sh0g0-1758 <shouryagoel10000 at gmail.com>
Date: Wed, 17 Jan 2024 20:04:09 +0530
Subject: [PATCH 6/8] refactor : Change position of '' and revert tests in
indexer.test
---
clang-tools-extra/clangd/test/indexer.test | 2 +-
clang/include/clang/Basic/DiagnosticFrontendKinds.td | 2 +-
clang/test/ARCMT/verify.m | 2 +-
clang/test/Frontend/verify.c | 2 +-
clang/test/Frontend/verify2.c | 2 +-
clang/test/Frontend/verify3.c | 4 ++--
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/clang-tools-extra/clangd/test/indexer.test b/clang-tools-extra/clangd/test/indexer.test
index 213d33f8e2d6a5..2f01f6c557a7de 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 {{.*}}-no-diagnostics
+# CHECK-NOT: error: no expected directives found: consider use of 'expected-no-diagnostics'
# RUN: not ls %t.ii
diff --git a/clang/include/clang/Basic/DiagnosticFrontendKinds.td b/clang/include/clang/Basic/DiagnosticFrontendKinds.td
index 42d2767af6b708..56a79d7bf42263 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 '%0'-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/test/ARCMT/verify.m b/clang/test/ARCMT/verify.m
index 13fd599f530fbe..06a5a528efd4b9 100644
--- a/clang/test/ARCMT/verify.m
+++ b/clang/test/ARCMT/verify.m
@@ -11,7 +11,7 @@
#error
// expected-error at -1 {{}}
-// CHECK: error: no expected directives found: consider use of {{.*}}-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 657a9d3f2bf6bb..f24ebda29a22ea 100644
--- a/clang/test/Frontend/verify.c
+++ b/clang/test/Frontend/verify.c
@@ -111,7 +111,7 @@ unexpected b; // expected-error at 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 {{.*}}-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 77510c8d9b4940..41ccac4a43fc3e 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 {{.*}}-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 8924619592f583..cf781a93fa8a5b 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 {{.*}}-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 at -1 {{X}}
-// CHECK4-NOT: error: no expected directives found: consider use of {{.*}}-no-diagnostics
+// CHECK4-NOT: error: no expected directives found: consider use of '{{.*}}-no-diagnostics'
#endif
>From 75c02dbdc6ce9ba6a7b9df47ff9540943f543f9f Mon Sep 17 00:00:00 2001
From: Sh0g0-1758 <shouryagoel10000 at gmail.com>
Date: Sat, 20 Jan 2024 00:20:53 +0530
Subject: [PATCH 7/8] Fix : Added Support for -verify= and -verify={multi
diagnostics}, revert changes in only -verify= test cases in verify files
---
clang/lib/Frontend/VerifyDiagnosticConsumer.cpp | 11 +++++++++--
clang/test/ARCMT/verify.m | 2 +-
clang/test/Frontend/verify.c | 2 +-
clang/test/Frontend/verify2.c | 2 +-
clang/test/Frontend/verify3.c | 4 ++--
5 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp b/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp
index 6288469eb80b33..1233ce872ffb0e 100644
--- a/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp
+++ b/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp
@@ -1098,8 +1098,15 @@ void VerifyDiagnosticConsumer::CheckDiagnostics() {
// Produce an error if no expected-* directives could be found in the
// source file(s) processed.
if (Status == HasNoDirectives) {
- std::string directives =
- *Diags.getDiagnosticOptions().VerifyPrefixes.begin();
+ std::string directives;
+ for(auto &Prefix : Diags.getDiagnosticOptions().VerifyPrefixes) {
+ directives = directives + Prefix + ",";
+ }
+ if(directives.empty()) {
+ directives = "expected";
+ } else {
+ directives.pop_back();
+ }
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 06a5a528efd4b9..7d245fe80575e5 100644
--- a/clang/test/ARCMT/verify.m
+++ b/clang/test/ARCMT/verify.m
@@ -11,7 +11,7 @@
#error
// expected-error at -1 {{}}
-// CHECK: error: no expected directives found: consider use of '{{.*}}-no-diagnostics'
+// CHECK: error: no expected directives found: consider use of 'expected-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 f24ebda29a22ea..221b715c19e416 100644
--- a/clang/test/Frontend/verify.c
+++ b/clang/test/Frontend/verify.c
@@ -111,7 +111,7 @@ unexpected b; // expected-error at 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 '{{.*}}-no-diagnostics'
+// CHECK6: error: no expected directives found: consider use of 'expected-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 41ccac4a43fc3e..debaeb6b498678 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 '{{.*}}-no-diagnostics'
+// CHECK: error: no expected directives found: consider use of 'expected-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 cf781a93fa8a5b..e414c7370fad77 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 '{{.*}}-no-diagnostics'
+// CHECK3: error: no expected directives found: consider use of 'expected-no-diagnostics'
// CHECK3-NEXT: 1 error generated.
#endif
@@ -37,5 +37,5 @@
#warning X
// expected-warning at -1 {{X}}
-// CHECK4-NOT: error: no expected directives found: consider use of '{{.*}}-no-diagnostics'
+// CHECK4-NOT: error: no expected directives found: consider use of 'expected-no-diagnostics'
#endif
>From b8fd4abf1173216e838ee7bdf764179378fb8049 Mon Sep 17 00:00:00 2001
From: Sh0g0-1758 <shouryagoel10000 at gmail.com>
Date: Sat, 20 Jan 2024 00:28:28 +0530
Subject: [PATCH 8/8] Ran clang formatter
---
clang/lib/Frontend/VerifyDiagnosticConsumer.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp b/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp
index 1233ce872ffb0e..2c989c15e4e506 100644
--- a/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp
+++ b/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp
@@ -1099,10 +1099,10 @@ void VerifyDiagnosticConsumer::CheckDiagnostics() {
// source file(s) processed.
if (Status == HasNoDirectives) {
std::string directives;
- for(auto &Prefix : Diags.getDiagnosticOptions().VerifyPrefixes) {
+ for (auto &Prefix : Diags.getDiagnosticOptions().VerifyPrefixes) {
directives = directives + Prefix + ",";
}
- if(directives.empty()) {
+ if (directives.empty()) {
directives = "expected";
} else {
directives.pop_back();
More information about the llvm-commits
mailing list