On Sep 29, 2010, at 11:20 AM, Daniel Dunbar wrote: > Author: ddunbar > Date: Wed Sep 29 13:20:25 2010 > New Revision: 115056 > > URL: http://llvm.org/viewvc/llvm-project?rev=115056&view=rev > Log: > Add support for attribute((naked)), patch by Zoxc on cfe-commits! > - Minor style tweaks by me.
Sema should produce an error for targets that don't support this. A TargetInfo hook is a good way to handle this. -Chris > > Added: > cfe/trunk/test/CodeGen/attr-naked.c > cfe/trunk/test/Sema/attr-naked.c > Modified: > cfe/trunk/include/clang/Basic/Attr.td > cfe/trunk/include/clang/Sema/AttributeList.h > cfe/trunk/lib/CodeGen/CodeGenModule.cpp > cfe/trunk/lib/Sema/AttributeList.cpp > cfe/trunk/lib/Sema/SemaDeclAttr.cpp > > Modified: cfe/trunk/include/clang/Basic/Attr.td > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/Attr.td?rev=115056&r1=115055&r2=115056&view=diff > ============================================================================== > --- cfe/trunk/include/clang/Basic/Attr.td (original) > +++ cfe/trunk/include/clang/Basic/Attr.td Wed Sep 29 13:20:25 2010 > @@ -245,6 +245,10 @@ > let Args = [UnsignedArgument<"Number">]; > } > > +def Naked : Attr { > + let Spellings = ["naked"]; > +} > + > def NoDebug : Attr { > let Spellings = ["nodebug"]; > } > > Modified: cfe/trunk/include/clang/Sema/AttributeList.h > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/AttributeList.h?rev=115056&r1=115055&r2=115056&view=diff > ============================================================================== > --- cfe/trunk/include/clang/Sema/AttributeList.h (original) > +++ cfe/trunk/include/clang/Sema/AttributeList.h Wed Sep 29 13:20:25 2010 > @@ -83,6 +83,7 @@ > AT_hiding, > AT_malloc, > AT_mode, > + AT_naked, > AT_nodebug, > AT_noinline, > AT_no_instrument_function, > > Modified: cfe/trunk/lib/CodeGen/CodeGenModule.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenModule.cpp?rev=115056&r1=115055&r2=115056&view=diff > ============================================================================== > --- cfe/trunk/lib/CodeGen/CodeGenModule.cpp (original) > +++ cfe/trunk/lib/CodeGen/CodeGenModule.cpp Wed Sep 29 13:20:25 2010 > @@ -457,6 +457,9 @@ > if (D->hasAttr<AlwaysInlineAttr>()) > F->addFnAttr(llvm::Attribute::AlwaysInline); > > + if (D->hasAttr<NakedAttr>()) > + F->addFnAttr(llvm::Attribute::Naked); > + > if (D->hasAttr<NoInlineAttr>()) > F->addFnAttr(llvm::Attribute::NoInline); > > > Modified: cfe/trunk/lib/Sema/AttributeList.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/AttributeList.cpp?rev=115056&r1=115055&r2=115056&view=diff > ============================================================================== > --- cfe/trunk/lib/Sema/AttributeList.cpp (original) > +++ cfe/trunk/lib/Sema/AttributeList.cpp Wed Sep 29 13:20:25 2010 > @@ -73,6 +73,7 @@ > .Case("unused", AT_unused) > .Case("aligned", AT_aligned) > .Case("cleanup", AT_cleanup) > + .Case("naked", AT_naked) > .Case("nodebug", AT_nodebug) > .Case("nonnull", AT_nonnull) > .Case("nothrow", AT_nothrow) > > Modified: cfe/trunk/lib/Sema/SemaDeclAttr.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclAttr.cpp?rev=115056&r1=115055&r2=115056&view=diff > ============================================================================== > --- cfe/trunk/lib/Sema/SemaDeclAttr.cpp (original) > +++ cfe/trunk/lib/Sema/SemaDeclAttr.cpp Wed Sep 29 13:20:25 2010 > @@ -650,9 +650,26 @@ > d->addAttr(::new (S.Context) AliasAttr(Attr.getLoc(), S.Context, > Str->getString())); > } > > +static void HandleNakedAttr(Decl *d, const AttributeList &Attr, > + Sema &S) { > + // Check the attribute arguments. > + if (Attr.getNumArgs() != 0) { > + S.Diag(Attr.getLoc(), diag::err_attribute_wrong_number_arguments) << 0; > + return; > + } > + > + if (!isa<FunctionDecl>(d)) { > + S.Diag(Attr.getLoc(), diag::warn_attribute_wrong_decl_type) > + << Attr.getName() << 0 /*function*/; > + return; > + } > + > + d->addAttr(::new (S.Context) NakedAttr(Attr.getLoc(), S.Context)); > +} > + > static void HandleAlwaysInlineAttr(Decl *d, const AttributeList &Attr, > Sema &S) { > - // check the attribute arguments. > + // Check the attribute arguments. > if (Attr.getNumArgs() != 0) { > S.Diag(Attr.getLoc(), diag::err_attribute_wrong_number_arguments) << 0; > return; > @@ -660,7 +677,7 @@ > > if (!isa<FunctionDecl>(d)) { > S.Diag(Attr.getLoc(), diag::warn_attribute_wrong_decl_type) > - << Attr.getName() << 0 /*function*/; > + << Attr.getName() << 0 /*function*/; > return; > } > > @@ -668,7 +685,7 @@ > } > > static void HandleMallocAttr(Decl *d, const AttributeList &Attr, Sema &S) { > - // check the attribute arguments. > + // Check the attribute arguments. > if (Attr.getNumArgs() != 0) { > S.Diag(Attr.getLoc(), diag::err_attribute_wrong_number_arguments) << 0; > return; > @@ -2281,6 +2298,7 @@ > case AttributeList::AT_ownership_takes: > case AttributeList::AT_ownership_holds: > HandleOwnershipAttr (D, Attr, S); break; > + case AttributeList::AT_naked: HandleNakedAttr (D, Attr, S); > break; > case AttributeList::AT_noreturn: HandleNoReturnAttr (D, Attr, S); > break; > case AttributeList::AT_nothrow: HandleNothrowAttr (D, Attr, S); > break; > case AttributeList::AT_override: HandleOverrideAttr (D, Attr, S); > break; > > Added: cfe/trunk/test/CodeGen/attr-naked.c > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/attr-naked.c?rev=115056&view=auto > ============================================================================== > --- cfe/trunk/test/CodeGen/attr-naked.c (added) > +++ cfe/trunk/test/CodeGen/attr-naked.c Wed Sep 29 13:20:25 2010 > @@ -0,0 +1,9 @@ > +// RUN: %clang_cc1 -g -emit-llvm -o %t %s > +// RUN: grep 'naked' %t > + > +void t1() __attribute__((naked)); > + > +void t1() > +{ > +} > + > > Added: cfe/trunk/test/Sema/attr-naked.c > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/attr-naked.c?rev=115056&view=auto > ============================================================================== > --- cfe/trunk/test/Sema/attr-naked.c (added) > +++ cfe/trunk/test/Sema/attr-naked.c Wed Sep 29 13:20:25 2010 > @@ -0,0 +1,8 @@ > +// RUN: %clang_cc1 %s -verify -fsyntax-only > + > +int a __attribute__((naked)); // expected-warning {{'naked' attribute only > applies to function types}} > + > +void t1() __attribute__((naked)); > + > +void t2() __attribute__((naked(2))); // expected-error {{attribute requires > 0 argument(s)}} > + > > > _______________________________________________ > cfe-commits mailing list > [email protected] > http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits _______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
