diff options
| -rw-r--r-- | clang/lib/Sema/SemaType.cpp | 7 | ||||
| -rw-r--r-- | clang/test/CodeGen/pr25786.c | 11 | ||||
| -rw-r--r-- | clang/test/Sema/pr25786.c | 12 |
3 files changed, 30 insertions, 0 deletions
diff --git a/clang/lib/Sema/SemaType.cpp b/clang/lib/Sema/SemaType.cpp index c51255c934d..cabb5bc0e0a 100644 --- a/clang/lib/Sema/SemaType.cpp +++ b/clang/lib/Sema/SemaType.cpp @@ -5370,6 +5370,7 @@ namespace { struct FunctionTypeUnwrapper { enum WrapKind { Desugar, + Attributed, Parens, Pointer, BlockPointer, @@ -5402,6 +5403,9 @@ namespace { } else if (isa<ReferenceType>(Ty)) { T = cast<ReferenceType>(Ty)->getPointeeType(); Stack.push_back(Reference); + } else if (isa<AttributedType>(Ty)) { + T = cast<AttributedType>(Ty)->getEquivalentType(); + Stack.push_back(Attributed); } else { const Type *DTy = Ty->getUnqualifiedDesugaredType(); if (Ty == DTy) { @@ -5450,6 +5454,9 @@ namespace { // information. return wrap(C, Old->getUnqualifiedDesugaredType(), I); + case Attributed: + return wrap(C, cast<AttributedType>(Old)->getEquivalentType(), I); + case Parens: { QualType New = wrap(C, cast<ParenType>(Old)->getInnerType(), I); return C.getParenType(New); diff --git a/clang/test/CodeGen/pr25786.c b/clang/test/CodeGen/pr25786.c new file mode 100644 index 00000000000..612da7e8a36 --- /dev/null +++ b/clang/test/CodeGen/pr25786.c @@ -0,0 +1,11 @@ +// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -emit-llvm -o - %s | FileCheck %s +// RUN: %clang_cc1 -triple i686-unknown-linux-gnu -emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-OK + +void (__attribute__((regparm(3), stdcall)) *pf) (); +void (__attribute__((regparm(2), stdcall)) foo)(int a) { +} +// CHECK: @pf = common global void (...)* null +// CHECK: define void @foo(i32 %a) + +// CHECK-OK: @pf = common global void (...)* null +// CHECK-OK: define x86_stdcallcc void @foo(i32 inreg %a) diff --git a/clang/test/Sema/pr25786.c b/clang/test/Sema/pr25786.c new file mode 100644 index 00000000000..2ce65311a24 --- /dev/null +++ b/clang/test/Sema/pr25786.c @@ -0,0 +1,12 @@ +// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -DTEST -fsyntax-only -verify %s +// RUN: %clang_cc1 -triple i686-unknown-linux-gnu -fsyntax-only -verify %s + +#if TEST +void (__attribute__((regparm(3), stdcall)) *pf) (); //expected-warning {{calling convention 'stdcall' ignored for this target}} +void (__attribute__((regparm(2), stdcall)) foo)(int a) { //expected-warning {{calling convention 'stdcall' ignored for this target}} +} +#else +//expected-no-diagnostics +void (__attribute__((regparm(3), stdcall)) *pf) (); +void (__attribute__((regparm(2), stdcall)) foo)(int a) {} +#endif |
