cf9b25e0ad
Tests where the RUN-lines/CHECK-ed output refer to line numbers in the test
file are a maintenance burden, as inserting text in the appropriate place
invalidates all the subsequent line numbers.
Lit supports %(line+n) for this, and FileCheck supports [[@LINE+N]].
But many existing tests don't make use of it and still need to be modified.
This commit adds a script that can find line numbers in tests according to a
regex and replace them with the appropriate relative-line reference.
It contains some options to avoid inappropriately rewriting tests where absolute
numbers are appropriate: a "nearby" threshold and a refusal by default to
replace only some matched line numbers.
I've applied it to CodeComplete tests, this proves the concept but also are the
single worst group of tests I've seen in this respect.
These changes are likely to hit merge conflicts, but can be regenerated with:
```
find ../clang/test/CodeCompletion/ -type f | grep -v /Inputs/ | xargs ../llvm/utils/relative_lines.py --verbose --near=20 --pattern='-code-completion-at[ =]%s:(\\d+):' --pattern='requires fix-it: {(\d+):\d+-(\d+):\d+}'
````
As requested in https://reviews.llvm.org/D140044
Fixes https://github.com/llvm/llvm-project/issues/59553
Differential Revision: https://reviews.llvm.org/D140217
71 lines
3.3 KiB
C++
71 lines
3.3 KiB
C++
template <typename T>
|
|
struct Foo {};
|
|
template <typename T>
|
|
struct Foo<T *> { Foo(T); };
|
|
|
|
void foo() {
|
|
Foo<int>();
|
|
// RUN: %clang_cc1 -fsyntax-only -code-completion-at=%s:%(line-1):12 %s -o - | FileCheck -check-prefix=CHECK-CC1 %s
|
|
// CHECK-CC1: OVERLOAD: Foo()
|
|
// CHECK-CC1: OVERLOAD: Foo(<#const Foo<int> &#>)
|
|
// CHECK-CC1: OVERLOAD: Foo(<#Foo<int> &&#>
|
|
Foo<int *>(3);
|
|
// RUN: %clang_cc1 -fsyntax-only -code-completion-at=%s:%(line-1):14 %s -o - | FileCheck -check-prefix=CHECK-CC2 %s
|
|
// CHECK-CC2: OVERLOAD: Foo(<#int#>)
|
|
// CHECK-CC2: OVERLOAD: Foo(<#const Foo<int *> &#>)
|
|
// CHECK-CC2: OVERLOAD: Foo(<#Foo<int *> &&#>
|
|
}
|
|
|
|
namespace std {
|
|
template <typename> struct initializer_list {};
|
|
} // namespace std
|
|
|
|
struct Bar {
|
|
// CHECK-BRACED: OVERLOAD: Bar{<#int#>}
|
|
Bar(int);
|
|
// CHECK-BRACED: OVERLOAD: Bar{<#double#>, double}
|
|
Bar(double, double);
|
|
// FIXME: no support for init-list constructors yet.
|
|
// CHECK-BRACED-NOT: OVERLOAD: {{.*}}char
|
|
Bar(std::initializer_list<char> C);
|
|
// CHECK-BRACED: OVERLOAD: Bar{<#const Bar &#>}
|
|
// CHECK-BRACED: OVERLOAD: Bar{<#T *Pointer#>}
|
|
template <typename T> Bar(T *Pointer);
|
|
};
|
|
|
|
auto b1 = Bar{};
|
|
// RUN: %clang_cc1 -fsyntax-only -code-completion-at=%s:%(line-1):15 %s | FileCheck -check-prefix=CHECK-BRACED %s
|
|
Bar b2{};
|
|
// RUN: %clang_cc1 -fsyntax-only -code-completion-at=%s:%(line-1):8 %s | FileCheck -check-prefix=CHECK-BRACED %s
|
|
static int consumeBar(Bar) { return 0; }
|
|
int b3 = consumeBar({});
|
|
// RUN: %clang_cc1 -fsyntax-only -code-completion-at=%s:%(line-1):22 %s | FileCheck -check-prefix=CHECK-BRACED %s
|
|
|
|
struct Aggregate {
|
|
int first;
|
|
int second;
|
|
int third;
|
|
};
|
|
|
|
Aggregate a{1, 2, 3};
|
|
// RUN: %clang_cc1 -fsyntax-only -code-completion-at=%s:%(line-1):13 %s | FileCheck -check-prefix=CHECK-AGGREGATE-1 %s
|
|
// CHECK-AGGREGATE-1: OVERLOAD: Aggregate{<#int first#>, int second, int third}
|
|
// CHECK-AGGREGATE-1: OVERLOAD: Aggregate{<#const Aggregate &#>}
|
|
// RUN: %clang_cc1 -fsyntax-only -code-completion-at=%s:%(line-4):16 %s | FileCheck -check-prefix=CHECK-AGGREGATE-2 %s
|
|
// CHECK-AGGREGATE-2: OVERLOAD: Aggregate{int first, <#int second#>, int third}
|
|
// RUN: %clang_cc1 -fsyntax-only -code-completion-at=%s:%(line-6):18 %s | FileCheck -check-prefix=CHECK-AGGREGATE-3 %s
|
|
// CHECK-AGGREGATE-3: OVERLOAD: Aggregate{int first, int second, <#int third#>}
|
|
|
|
Aggregate d{.second=1, .first=2, 3, 4, };
|
|
// RUN: %clang_cc1 -fsyntax-only -code-completion-at=%s:%(line-1):13 %s | FileCheck -check-prefix=CHECK-DESIG-1 %s
|
|
// CHECK-DESIG-1: OVERLOAD: Aggregate{<#int first#>, int second, int third}
|
|
// CHECK-DESIG-1: OVERLOAD: Aggregate{<#const Aggregate &#>}
|
|
// RUN: %clang_cc1 -fsyntax-only -code-completion-at=%s:%(line-4):24 %s | FileCheck -check-prefix=CHECK-DESIG-2 %s
|
|
// CHECK-DESIG-2: OVERLOAD: Aggregate{int first, int second, <#int third#>}
|
|
// RUN: %clang_cc1 -fsyntax-only -code-completion-at=%s:%(line-6):34 %s | FileCheck -check-prefix=CHECK-DESIG-3 %s
|
|
// CHECK-DESIG-3: OVERLOAD: Aggregate{int first, <#int second#>, int third}
|
|
// RUN: %clang_cc1 -fsyntax-only -code-completion-at=%s:%(line-8):37 %s | FileCheck -check-prefix=CHECK-DESIG-4 %s
|
|
// CHECK-DESIG-4: OVERLOAD: Aggregate{int first, int second, <#int third#>}
|
|
// RUN: %clang_cc1 -fsyntax-only -code-completion-at=%s:%(line-10):38 %s | FileCheck -check-prefix=CHECK-DESIG-5 %s --allow-empty
|
|
// CHECK-DESIG-5-NOT: OVERLOAD
|