[clang] NFC: Robustify test regex

[urnathan]

Summary

You know what they say about solving a problem with regexs?

These tests are checking for 'sret' markers, and just searching for 'sret' sans deliminters. But that also finds the source file names so then explicitly excludes them. But there are other ways other instances of 'sret' can get there. In my case it was in the version string, because my usual set up is to make a local branch in a 'me/feature-desc' subdirectory, whose upstream is my trunk. And this ends up with the pathname in the version string. And guess what I'm fiddling with :)

ISTM that a better regexp would be making sure the 'sret' is preceded by a space. I also check it terminates with '<maybe-spaces>(', but we could also with something else.

[rnk]

Thanks! These tests must be quite old to still be using grep. For bonus points you could convert these to FileCheck, but this is also good as is.

[urnathan]

Ah, it didn't occur to me that grep was a sign of old test harness. Here's a FileCheckified version. I took the opportunity to combine the two testcases, as there didn't seem a need to keep them separate any more.

[rnk]

Thanks!

clang/test/CodeGen/sret.c

-// RUN: %clang_cc1 %s -Wno-strict-prototypes -emit-llvm -o - | grep sret | grep -v 'sret.c' | count 4
+// RUN: %clang_cc1 %s -Wno-strict-prototypes -emit-llvm -o - | FileCheck %s
 
 struct abc {
  long a;
  long b;
  long c;
  long d;
  long e;
 };
- 
 struct abc foo1(void);
+// CHECK-DAG: declare {{.*}} @foo1(ptr sret(%struct.abc)
 struct abc foo2();
+// CHECK-DAG: declare {{.*}} @foo2(ptr sret(%struct.abc)
+struct abc foo3(void){}
+// CHECK-DAG: define {{.*}} @foo3(ptr noalias sret(%struct.abc)
 
 void bar(void) {
   struct abc dummy1 = foo1();
+  // CHECK-DAG: call {{.*}} @foo1(ptr sret(%struct.abc)
   struct abc dummy2 = foo2();
+  // CHECK-DAG: call {{.*}} @foo2(ptr sret(%struct.abc)
 }

clang/test/CodeGen/sret2.c

-// RUN: %clang_cc1 %s -emit-llvm -o - | grep sret | grep -v 'sret2.c' | count 1
-
-struct abc {
- long a;
- long b;
- long c;
- long d;
- long e;
-};
- 
-struct abc foo2(void){}