From f3fae3fc58401b1955106ac46249e9aff2749ab2 Mon Sep 17 00:00:00 2001 From: Erich Keane Date: Thu, 21 Mar 2019 13:30:56 +0000 Subject: 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 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@356663 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/SemaCUDA/cuda-inherits-calling-conv.cu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/SemaCUDA/cuda-inherits-calling-conv.cu') diff --git a/test/SemaCUDA/cuda-inherits-calling-conv.cu b/test/SemaCUDA/cuda-inherits-calling-conv.cu index 67c438fa62..881f2945b1 100644 --- a/test/SemaCUDA/cuda-inherits-calling-conv.cu +++ b/test/SemaCUDA/cuda-inherits-calling-conv.cu @@ -24,7 +24,7 @@ struct Foo {}; // 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 struct Foo {}; -- cgit v1.2.1