diff options
| -rw-r--r-- | lib/Sema/TargetAttributesSema.cpp | 3 | ||||
| -rw-r--r-- | test/Sema/x86-attr-force-align-arg-pointer.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/Sema/TargetAttributesSema.cpp b/lib/Sema/TargetAttributesSema.cpp index 1ea0299103..35e42fb696 100644 --- a/lib/Sema/TargetAttributesSema.cpp +++ b/lib/Sema/TargetAttributesSema.cpp @@ -87,7 +87,8 @@ static void HandleX86ForceAlignArgPointerAttr(Decl *D, return; // Also don't warn on function pointer typedefs. TypedefDecl *TD = dyn_cast<TypedefDecl>(D); - if (TD && TD->getUnderlyingType()->isFunctionPointerType()) + if (TD && (TD->getUnderlyingType()->isFunctionPointerType() || + TD->getUnderlyingType()->isFunctionType())) return; // Attribute can only be applied to function types. if (!isa<FunctionDecl>(D)) { diff --git a/test/Sema/x86-attr-force-align-arg-pointer.c b/test/Sema/x86-attr-force-align-arg-pointer.c index 5c7582fe0f..b406a77e04 100644 --- a/test/Sema/x86-attr-force-align-arg-pointer.c +++ b/test/Sema/x86-attr-force-align-arg-pointer.c @@ -16,4 +16,6 @@ void __attribute__((force_align_arg_pointer)) d(void) {} // Attribute is ignored on function pointer types. void (__attribute__((force_align_arg_pointer)) *p)(); typedef void (__attribute__((__force_align_arg_pointer__)) *p2)(); +// Attribute is also ignored on function typedefs. +typedef void __attribute__((force_align_arg_pointer)) e(void); |