diff options
| -rw-r--r-- | lib/Sema/TargetAttributesSema.cpp | 9 | ||||
| -rw-r--r-- | test/Sema/x86-attr-force-align-arg-pointer.c | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lib/Sema/TargetAttributesSema.cpp b/lib/Sema/TargetAttributesSema.cpp index 76cff1f315..1ea0299103 100644 --- a/lib/Sema/TargetAttributesSema.cpp +++ b/lib/Sema/TargetAttributesSema.cpp @@ -82,9 +82,13 @@ static void HandleX86ForceAlignArgPointerAttr(Decl *D, // If we try to apply it to a function pointer, don't warn, but don't // do anything, either. It doesn't matter anyway, because there's nothing // special about calling a force_align_arg_pointer function. - ValueDecl* VD = dyn_cast<ValueDecl>(D); + ValueDecl *VD = dyn_cast<ValueDecl>(D); if (VD && VD->getType()->isFunctionPointerType()) return; + // Also don't warn on function pointer typedefs. + TypedefDecl *TD = dyn_cast<TypedefDecl>(D); + if (TD && TD->getUnderlyingType()->isFunctionPointerType()) + return; // Attribute can only be applied to function types. if (!isa<FunctionDecl>(D)) { S.Diag(Attr.getLoc(), diag::warn_attribute_wrong_decl_type) @@ -189,7 +193,8 @@ namespace { default: break; } } - if (Attr.getName()->getName() == "force_align_arg_pointer") { + if (Attr.getName()->getName() == "force_align_arg_pointer" || + Attr.getName()->getName() == "__force_align_arg_pointer__") { HandleX86ForceAlignArgPointerAttr(D, Attr, S); return true; } diff --git a/test/Sema/x86-attr-force-align-arg-pointer.c b/test/Sema/x86-attr-force-align-arg-pointer.c index 1470544a69..5c7582fe0f 100644 --- a/test/Sema/x86-attr-force-align-arg-pointer.c +++ b/test/Sema/x86-attr-force-align-arg-pointer.c @@ -15,4 +15,5 @@ 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)(); |