diff options
Diffstat (limited to 'test/SemaCUDA')
| -rw-r--r-- | test/SemaCUDA/function-overload.cu | 17 | ||||
| -rw-r--r-- | test/SemaCUDA/implicit-member-target-collision-cxx11.cu | 6 |
2 files changed, 21 insertions, 2 deletions
diff --git a/test/SemaCUDA/function-overload.cu b/test/SemaCUDA/function-overload.cu index 1d78636a70..b9efd1c09e 100644 --- a/test/SemaCUDA/function-overload.cu +++ b/test/SemaCUDA/function-overload.cu @@ -402,3 +402,20 @@ __host__ void test_host_template_overload() { __device__ void test_device_template_overload() { template_overload(1); // OK. Attribute-based overloading picks __device__ variant. } + +// Two classes with `operator-` defined. One of them is device only. +struct C1; +struct C2; +__device__ +int operator-(const C1 &x, const C1 &y); +int operator-(const C2 &x, const C2 &y); + +template <typename T> +__host__ __device__ int constexpr_overload(const T &x, const T &y) { + return x - y; +} + +// Verify that function overloading doesn't prune candidate wrongly. +int test_constexpr_overload(C2 &x, C2 &y) { + return constexpr_overload(x, y); +} diff --git a/test/SemaCUDA/implicit-member-target-collision-cxx11.cu b/test/SemaCUDA/implicit-member-target-collision-cxx11.cu index 7aa1dd3f20..06015ed0d6 100644 --- a/test/SemaCUDA/implicit-member-target-collision-cxx11.cu +++ b/test/SemaCUDA/implicit-member-target-collision-cxx11.cu @@ -74,11 +74,13 @@ struct B4_with_device_copy_ctor { struct C4_with_collision : A4_with_host_copy_ctor, B4_with_device_copy_ctor { }; -// expected-note@-3 {{copy constructor of 'C4_with_collision' is implicitly deleted because base class 'B4_with_device_copy_ctor' has no copy constructor}} +// expected-note@-3 {{candidate constructor (the implicit copy constructor) not viable: call to invalid function from __host__ function}} +// expected-note@-4 {{implicit copy constructor inferred target collision: call to both __host__ and __device__ members}} +// expected-note@-5 {{candidate constructor (the implicit default constructor) not viable: requires 0 arguments, but 1 was provided}} void hostfoo4() { C4_with_collision c; - C4_with_collision c2 = c; // expected-error {{call to implicitly-deleted copy constructor of 'C4_with_collision'}} + C4_with_collision c2 = c; // expected-error {{no matching constructor for initialization of 'C4_with_collision'}} } //------------------------------------------------------------------------------ |