summaryrefslogtreecommitdiffstats
path: root/clang/test/Sema/ms_abi-sysv_abi.c
diff options
context:
space:
mode:
authorMichael Kruse <llvm@meinersbur.de>2018-06-25 20:06:13 +0000
committerMichael Kruse <llvm@meinersbur.de>2018-06-25 20:06:13 +0000
commit41dd6ced2c8323aa804c3aed57f120746ab7f3fc (patch)
treebafdc35a26910c8a213596380a4bc25559485804 /clang/test/Sema/ms_abi-sysv_abi.c
parent05f6626fc48b40c332c0f4d082284b39d38e23c7 (diff)
downloadbcm5719-llvm-41dd6ced2c8323aa804c3aed57f120746ab7f3fc.tar.gz
bcm5719-llvm-41dd6ced2c8323aa804c3aed57f120746ab7f3fc.zip
Revert "Append new attributes to the end of an AttributeList."
This reverts commit r335084 as requested by David Jones and Eric Christopher because of differences of emitted warnings. llvm-svn: 335516
Diffstat (limited to 'clang/test/Sema/ms_abi-sysv_abi.c')
-rw-r--r--clang/test/Sema/ms_abi-sysv_abi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/test/Sema/ms_abi-sysv_abi.c b/clang/test/Sema/ms_abi-sysv_abi.c
index e97914d7dd7..35a5fad9ceb 100644
--- a/clang/test/Sema/ms_abi-sysv_abi.c
+++ b/clang/test/Sema/ms_abi-sysv_abi.c
@@ -6,9 +6,9 @@ int __attribute__((sysv_abi)) var2; // expected-warning{{'sysv_abi' only applies
// Different CC qualifiers are not compatible
// FIXME: Should say 'sysv_abi' instead of 'cdecl'
-void __attribute__((ms_abi, sysv_abi)) foo3(void); // expected-error{{ms_abi and cdecl attributes are not compatible}}
+void __attribute__((ms_abi, sysv_abi)) foo3(void); // expected-error{{cdecl and ms_abi attributes are not compatible}}
void __attribute__((ms_abi)) foo4(); // expected-note{{previous declaration is here}}
void __attribute__((sysv_abi)) foo4(void); // expected-error{{function declared 'cdecl' here was previously declared 'ms_abi'}}
-void bar(int i, int j) __attribute__((ms_abi, cdecl)); // expected-error{{ms_abi and cdecl attributes are not compatible}}
+void bar(int i, int j) __attribute__((ms_abi, cdecl)); // expected-error{{cdecl and ms_abi attributes are not compatible}}
void bar2(int i, int j) __attribute__((sysv_abi, cdecl)); // no-error
OpenPOWER on IntegriCloud