Fix pragma-comment.c test failing on false match

[dbartol]

Sometimes the forbidden text foo or bar could appear in the Clang version string metadata. Treating the version string as a CHECK-LABEL: prevents this.

Fixes #145453

[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: Dave Bartolomeo (dbartol)

Changes

Sometimes the forbidden text foo or bar could appear in the Clang version string metadata. Treating the version string as a CHECK-LABEL: prevents this.

Fixes #145453

---

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

1 Files Affected:

• (modified) clang/test/CodeGen/pragma-comment.c (+3)

diff --git a/clang/test/CodeGen/pragma-comment.c b/clang/test/CodeGen/pragma-comment.c
index a966840f7c26f..861fba9aece3b 100644
--- a/clang/test/CodeGen/pragma-comment.c
+++ b/clang/test/CodeGen/pragma-comment.c
@@ -32,3 +32,6 @@
 // ELF: ![[space]] = !{!"with space"}
 // ELF-NOT: bar
 // ELF-NOT: foo
+// This following match prevents the clang version metadata from matching the forbidden 'foo' and 'bar' tokens.
+// This can happen if the clang version string contains a Git repo URL that includes one of those substrings.
+// ELF-LABEL: !"clang version

[AaronBallman]

Thank you for the fix! I think this approach works, but there may be a slightly improved approach that uses regex word boundaries worth considering.

[AaronBallman]

LGTM! Thank you!

I'll land the changes on your behalf once precommit CI comes back green.

[github-actions]

@dbartol Congratulations on having your first Pull Request (PR) merged into the LLVM Project!

Your changes will be combined with recent changes from other authors, then tested by our build bots. If there is a problem with a build, you may receive a report in an email or a comment on this PR.

Please check whether problems have been caused by your change specifically, as the builds can include changes from many authors. It is not uncommon for your change to be included in a build that fails due to someone else's changes, or infrastructure issues.

How to do this, and the rest of the post-merge process, is covered in detail here.

If your change does cause a problem, it may be reverted, or you can revert it yourself. This is a normal part of LLVM development. You can fix your changes and open a new PR to merge them again.

If you don't get any reports, no action is required from you. Your changes are working as expected, well done!

[dbartol]

This caused a buildbot failure because I forgot to take the vendor string into account. Working on a fix now.

[Sharjeel-Khan]

This PR also broke Android's buildbots too. In Android, it will appear as !"Android (13563557, +pgo, +bolt, +lto, +mlgo, based on r563880) clang... so try to keep this in account too in your fix

[dbartol]

Opened #145612 with the fix