diff options
| author | Erich Keane <erich.keane@intel.com> | 2019-03-21 13:30:56 +0000 |
|---|---|---|
| committer | Erich Keane <erich.keane@intel.com> | 2019-03-21 13:30:56 +0000 |
| commit | 505427cb2fe4b7d0290eabbf6785c2a3643ef637 (patch) | |
| tree | 6872c3a5969a07c10f291f9b564f53dbd4f7f15f /clang/test/SemaCUDA/cuda-inherits-calling-conv.cu | |
| parent | cbb726d0c5384c029196d4c7160fa91dc3b3f0da (diff) | |
| download | bcm5719-llvm-505427cb2fe4b7d0290eabbf6785c2a3643ef637.tar.gz bcm5719-llvm-505427cb2fe4b7d0290eabbf6785c2a3643ef637.zip | |
Permit redeclarations of a builtin to specify calling convention.
After https://reviews.llvm.org/rL355317 we noticed that quite a decent
amount of code redeclares builtins (memcpy in particular, I believe
reduced from an MSVC header) with a calling convention specified.
This gets particularly troublesome when the user specifies a new
'default' calling convention on the command line.
When looking to add a diagnostic for this case, it was noticed that we
had 3 other diagnostics that differed only slightly. This patch ALSO
unifies those under a 'select'. Unfortunately, the order of words in
ONE of these diagnostics was reversed ("'thiscall' calling convention"
vs "calling convention 'thiscall'"), so this patch also standardizes on
the former.
Differential Revision: https://reviews.llvm.org/D59560
Change-Id: I79f99fe7c2301640755ffdd774b46eb44526bb22
llvm-svn: 356663
Diffstat (limited to 'clang/test/SemaCUDA/cuda-inherits-calling-conv.cu')
| -rw-r--r-- | clang/test/SemaCUDA/cuda-inherits-calling-conv.cu | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/test/SemaCUDA/cuda-inherits-calling-conv.cu b/clang/test/SemaCUDA/cuda-inherits-calling-conv.cu index 67c438fa621..881f2945b1b 100644 --- a/clang/test/SemaCUDA/cuda-inherits-calling-conv.cu +++ b/clang/test/SemaCUDA/cuda-inherits-calling-conv.cu @@ -24,7 +24,7 @@ struct Foo<T()> {}; // expected-no-diagnostics #else // expected-error@+4 {{redefinition of 'Foo}} -// expected-warning@+3 {{calling convention '__fastcall' ignored}} +// expected-warning@+3 {{'__fastcall' calling convention ignored}} #endif template <class T> struct Foo<T __fastcall()> {}; |
