Fix regular expression to guard against a repeating version string

[wolfy1961]

A recent change d6c2cbbc651 causes the test clang/test/utils/update_cc_test_checks/generated-funcs.test to fail for compilers with version strings that repeat the sequence "version", such as clang version 19.0.0 (myvendor clang version 4.0.0).

Making the expression preceding "\w+ version" non-greedy fix this.

Unfortunately there is no simple way to generate a test case, since it would require a change in the clang version string.

[llvmbot]

@llvm/pr-subscribers-testing-tools

Author: Wolfgang Pieb (wolfy1961)

Changes

A recent change d6c2cbbc651 causes the test clang/test/utils/update_cc_test_checks/generated-funcs.test to fail for compilers with version strings that repeat the sequence "version", such as clang version 19.0.0 (myvendor clang version 4.0.0).

Making the expression preceding "\w+ version" non-greedy fix this.

Unfortunately there is no simple way to generate a test case, since it would require a change in the clang version string.

---

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

1 Files Affected:

• (modified) llvm/utils/UpdateTestChecks/common.py (+1-1)

diff --git a/llvm/utils/UpdateTestChecks/common.py b/llvm/utils/UpdateTestChecks/common.py
index ecb19d233a8d1a..85b4bdd2c6dc7a 100644
--- a/llvm/utils/UpdateTestChecks/common.py
+++ b/llvm/utils/UpdateTestChecks/common.py
@@ -2189,7 +2189,7 @@ def add(var):
 
 METADATA_FILTERS = [
     (
-        r"(?<=\")(.+ )?(\w+ version )[\d.]+(?:[^\" ]*)(?: \([^)]+\))?",
+        r"(?<=\")(.+ )??(\w+ version )[\d.]+(?:[^\" ]*)(?: \([^)]+\))?",
         r"{{.*}}\2{{.*}}",
     ),  # preface with glob also, to capture optional CLANG_VENDOR
     (r'(!DIFile\(filename: ".+", directory: )".+"', r"\1{{.*}}"),

[arichardson]

Would it be possible to write a LLVM IR test for update_test_checks.py with pre-existing metadata? Or do we only scrub it for update_cc_test_checks.py?

[wolfy1961]

Sorry for the long delay.
I added a test for the currently failing case to demonstrate the fix. It was easier than I thought.

[wolfy1961]

Rebased.

Ping ...