Index: include/clang/Basic/Attr.td =================================================================== --- include/clang/Basic/Attr.td (revision 151056) +++ include/clang/Basic/Attr.td (working copy) @@ -95,6 +95,8 @@ bit LateParsed = 0; // Set to true for attributes which must be instantiated within templates bit TemplateDependent = 0; + // Set to true for attributes which have handler in Sema. + bit SemaHandler = 1; // Any additional text that should be included verbatim in the class. code AdditionalMembers = [{}]; } @@ -124,6 +126,7 @@ def AlignMac68k : InheritableAttr { let Spellings = []; + let SemaHandler = 0; } def AlwaysInline : InheritableAttr { @@ -142,6 +145,7 @@ def AsmLabel : InheritableAttr { let Spellings = []; let Args = [StringArgument<"Label">]; + let SemaHandler = 0; } def Availability : InheritableAttr { @@ -276,6 +280,7 @@ def Final : InheritableAttr { let Spellings = []; + let SemaHandler = 0; } def MsStruct : InheritableAttr { @@ -317,6 +322,7 @@ def MaxFieldAlignment : InheritableAttr { let Spellings = []; let Args = [UnsignedArgument<"Alignment">]; + let SemaHandler = 0; } def MayAlias : InheritableAttr { @@ -326,14 +332,17 @@ def MSP430Interrupt : InheritableAttr { let Spellings = []; let Args = [UnsignedArgument<"Number">]; + let SemaHandler = 0; } def MBlazeInterruptHandler : InheritableAttr { let Spellings = []; + let SemaHandler = 0; } def MBlazeSaveVolatiles : InheritableAttr { let Spellings = []; + let SemaHandler = 0; } def Naked : InheritableAttr { @@ -449,6 +458,7 @@ def Override : InheritableAttr { let Spellings = []; + let SemaHandler = 0; } def Ownership : InheritableAttr { Index: include/clang/Sema/AttributeList.h =================================================================== --- include/clang/Sema/AttributeList.h (revision 151056) +++ include/clang/Sema/AttributeList.h (working copy) @@ -159,124 +159,21 @@ friend class AttributeFactory; public: - enum Kind { // Please keep this list alphabetized. - AT_acquired_after, - AT_acquired_before, - AT_address_space, - AT_alias, - AT_aligned, - AT_always_inline, - AT_analyzer_noreturn, - AT_annotate, - AT_arc_weakref_unavailable, - AT_objc_requires_property_definitions, - AT_availability, // Clang-specific - AT_base_check, - AT_blocks, - AT_carries_dependency, - AT_cdecl, - AT_cf_audited_transfer, // Clang-specific. - AT_cf_consumed, // Clang-specific. - AT_cf_returns_autoreleased, // Clang-specific. - AT_cf_returns_not_retained, // Clang-specific. - AT_cf_returns_retained, // Clang-specific. - AT_cf_unknown_transfer, // Clang-specific. - AT_cleanup, - AT_common, - AT_const, - AT_constant, - AT_constructor, - AT_deprecated, - AT_destructor, - AT_device, - AT_dllexport, - AT_dllimport, - AT_exclusive_lock_function, - AT_exclusive_locks_required, - AT_exclusive_trylock_function, - AT_ext_vector_type, - AT_fastcall, - AT_format, - AT_format_arg, - AT_global, - AT_gnu_inline, - AT_guarded_by, - AT_guarded_var, - AT_host, - AT_IBAction, // Clang-specific. - AT_IBOutlet, // Clang-specific. - AT_IBOutletCollection, // Clang-specific. - AT_init_priority, - AT_launch_bounds, - AT_lock_returned, - AT_lockable, - AT_locks_excluded, - AT_malloc, - AT_may_alias, - AT_mode, - AT_MsStruct, - AT_naked, - AT_neon_polyvector_type, // Clang-specific. - AT_neon_vector_type, // Clang-specific. - AT_no_address_safety_analysis, - AT_no_instrument_function, - AT_no_thread_safety_analysis, - AT_nocommon, - AT_nodebug, - AT_noinline, - AT_nonnull, - AT_noreturn, - AT_nothrow, - AT_ns_bridged, // Clang-specific. - AT_ns_consumed, // Clang-specific. - AT_ns_consumes_self, // Clang-specific. - AT_ns_returns_autoreleased, // Clang-specific. - AT_ns_returns_not_retained, // Clang-specific. - AT_ns_returns_retained, // Clang-specific. - AT_nsobject, - AT_objc_exception, - AT_objc_gc, - AT_objc_method_family, - AT_objc_ownership, // Clang-specific. - AT_objc_precise_lifetime, // Clang-specific. - AT_objc_returns_inner_pointer, // Clang-specific. - AT_opencl_image_access, // OpenCL-specific. - AT_opencl_kernel_function, // OpenCL-specific. - AT_overloadable, // Clang-specific. - AT_ownership_holds, // Clang-specific. - AT_ownership_returns, // Clang-specific. - AT_ownership_takes, // Clang-specific. - AT_packed, - AT_pascal, - AT_pcs, // ARM specific - AT_pt_guarded_by, - AT_pt_guarded_var, - AT_pure, - AT_regparm, - AT_reqd_wg_size, - AT_scoped_lockable, - AT_section, - AT_sentinel, - AT_shared, - AT_shared_lock_function, - AT_shared_locks_required, - AT_shared_trylock_function, - AT_stdcall, - AT_thiscall, - AT_transparent_union, - AT_unavailable, - AT_unlock_function, - AT_unused, - AT_used, - AT_uuid, - AT_vecreturn, // PS3 PPU-specific. - AT_vector_size, - AT_visibility, - AT_warn_unused_result, - AT_weak, - AT_weak_import, - AT_weakref, - AT_returns_twice, + enum Kind { + #define PARSED_ATTR(NAME) AT_##NAME, + #include "clang/Sema/AttrParsedAttrList.inc" + PARSED_ATTR(address_space) + PARSED_ATTR(base_check) + PARSED_ATTR(cf_returns_autoreleased) + PARSED_ATTR(ext_vector_type) + PARSED_ATTR(mode) + PARSED_ATTR(neon_polyvector_type) + PARSED_ATTR(neon_vector_type) + PARSED_ATTR(objc_gc) + PARSED_ATTR(objc_ownership) + PARSED_ATTR(opencl_image_access) + PARSED_ATTR(vector_size) + #undef PARSED_ATTR IgnoredAttribute, UnknownAttribute }; Index: include/clang/Sema/Makefile =================================================================== --- include/clang/Sema/Makefile (revision 151056) +++ include/clang/Sema/Makefile (working copy) @@ -1,6 +1,6 @@ CLANG_LEVEL := ../../.. TD_SRC_DIR = $(PROJ_SRC_DIR)/../Basic -BUILT_SOURCES = AttrTemplateInstantiate.inc +BUILT_SOURCES = AttrTemplateInstantiate.inc AttrParsedAttrList.inc TABLEGEN_INC_FILES_COMMON = 1 @@ -11,4 +11,10 @@ $(Echo) "Building Clang attribute template instantiate code with tablegen" $(Verb) $(ClangTableGen) -gen-clang-attr-template-instantiate -o \ $(call SYSPATH, $@) -I $(PROJ_SRC_DIR)/../../ $< + +$(ObjDir)/AttrParsedAttrList.inc.tmp : $(TD_SRC_DIR)/Attr.td \ + $(CLANG_TBLGEN) $(ObjDir)/.dir + $(Echo) "Building Clang parsed attribute list with tablegen" + $(Verb) $(ClangTableGen) -gen-clang-attr-parsed-attr-list -o \ + $(call SYSPATH, $@) -I $(PROJ_SRC_DIR)/../../ $< Index: include/clang/Sema/CMakeLists.txt =================================================================== --- include/clang/Sema/CMakeLists.txt (revision 151056) +++ include/clang/Sema/CMakeLists.txt (working copy) @@ -2,3 +2,8 @@ -I ${CMAKE_CURRENT_SOURCE_DIR}/../../ SOURCE ../Basic/Attr.td TARGET ClangAttrTemplateInstantiate) + +clang_tablegen(AttrParsedAttrList.inc -gen-clang-attr-parsed-attr-list + -I ${CMAKE_CURRENT_SOURCE_DIR}/../../ + SOURCE ../Basic/Attr.td + TARGET ClangAttrParsedAttrList) \ No newline at end of file Index: include/clang/AST/Attr.h =================================================================== --- include/clang/AST/Attr.h (revision 151056) +++ include/clang/AST/Attr.h (working copy) @@ -149,10 +149,6 @@ typedef SmallVector AttrVec; typedef SmallVector ConstAttrVec; -/// DestroyAttrs - Destroy the contents of an AttrVec. -inline void DestroyAttrs (AttrVec& V, ASTContext &C) { -} - /// specific_attr_iterator - Iterates over a subrange of an AttrVec, only /// providing attributes that are of a specifc type. template Index: utils/TableGen/ClangAttrEmitter.cpp =================================================================== --- utils/TableGen/ClangAttrEmitter.cpp (revision 151056) +++ utils/TableGen/ClangAttrEmitter.cpp (working copy) @@ -999,3 +999,34 @@ << "} // end namespace clang\n"; } +void ClangAttrParsedAttrListEmitter::run(raw_ostream &OS) { + OS << "// This file is generated by TableGen. Do not edit.\n\n"; + + OS << "#ifndef PARSED_ATTR\n"; + OS << "#define PARSED_ATTR(NAME) NAME\n"; + OS << "#endif\n\n"; + + std::vector Attrs = Records.getAllDerivedDefinitions("Attr"); + + for (std::vector::iterator I = Attrs.begin(), E = Attrs.end(); + I != E; ++I) { + Record &Attr = **I; + + bool SemaHandler = Attr.getValueAsBit("SemaHandler"); + + if (SemaHandler) { + std::vector Spellings = + getValueAsListOfStrings(Attr, "Spellings"); + + for (std::vector::const_iterator I = Spellings.begin(), + E = Spellings.end(); I != E; ++I) { + // skip some non normalized attributes name, for example, prefer "cdecl" over + // "__cdecl". There is only one exception for "__ms_struct__" + if ((*I).startswith("__") && !(*I).startswith("__ms")) + continue; + OS << "PARSED_ATTR(" << (*I) << ")\n"; + } + } + } +} + Index: utils/TableGen/ClangAttrEmitter.h =================================================================== --- utils/TableGen/ClangAttrEmitter.h (revision 151056) +++ utils/TableGen/ClangAttrEmitter.h (working copy) @@ -122,6 +122,19 @@ void run(raw_ostream &OS); }; +/// ClangAttrParsedAttrListEmitter emits the list of parsed attributes +/// for clang. +class ClangAttrParsedAttrListEmitter : public TableGenBackend { + RecordKeeper &Records; + +public: + explicit ClangAttrParsedAttrListEmitter(RecordKeeper &R) + : Records(R) + {} + + void run(raw_ostream &OS); +}; + } #endif Index: utils/TableGen/TableGen.cpp =================================================================== --- utils/TableGen/TableGen.cpp (revision 151056) +++ utils/TableGen/TableGen.cpp (working copy) @@ -37,6 +37,7 @@ GenClangAttrSpellingList, GenClangAttrLateParsedList, GenClangAttrTemplateInstantiate, + GenClangAttrParsedAttrList, GenClangDiagsDefs, GenClangDiagGroups, GenClangDiagsIndexName, @@ -75,6 +76,9 @@ clEnumValN(GenClangAttrTemplateInstantiate, "gen-clang-attr-template-instantiate", "Generate a clang template instantiate code"), + clEnumValN(GenClangAttrParsedAttrList, + "gen-clang-attr-parsed-attr-list", + "Generate a clang parsed attribute list"), clEnumValN(GenClangDiagsDefs, "gen-clang-diags-defs", "Generate Clang diagnostics definitions"), clEnumValN(GenClangDiagGroups, "gen-clang-diag-groups", @@ -129,6 +133,9 @@ case GenClangAttrTemplateInstantiate: ClangAttrTemplateInstantiateEmitter(Records).run(OS); break; + case GenClangAttrParsedAttrList: + ClangAttrParsedAttrListEmitter(Records).run(OS); + break; case GenClangDiagsDefs: ClangDiagsDefsEmitter(Records, ClangComponent).run(OS); break; Index: lib/Sema/SemaDeclAttr.cpp =================================================================== --- lib/Sema/SemaDeclAttr.cpp (revision 151056) +++ lib/Sema/SemaDeclAttr.cpp (working copy) @@ -3544,9 +3544,9 @@ static void ProcessInheritableDeclAttr(Sema &S, Scope *scope, Decl *D, const AttributeList &Attr) { switch (Attr.getKind()) { - case AttributeList::AT_IBAction: handleIBAction(S, D, Attr); break; - case AttributeList::AT_IBOutlet: handleIBOutlet(S, D, Attr); break; - case AttributeList::AT_IBOutletCollection: + case AttributeList::AT_ibaction: handleIBAction(S, D, Attr); break; + case AttributeList::AT_iboutlet: handleIBOutlet(S, D, Attr); break; + case AttributeList::AT_iboutletcollection: handleIBOutletCollection(S, D, Attr); break; case AttributeList::AT_address_space: case AttributeList::AT_opencl_image_access: @@ -3631,17 +3631,17 @@ case AttributeList::AT_cf_returns_retained: handleNSReturnsRetainedAttr(S, D, Attr); break; - case AttributeList::AT_reqd_wg_size: + case AttributeList::AT_reqd_work_group_size: handleReqdWorkGroupSize(S, D, Attr); break; case AttributeList::AT_init_priority: handleInitPriorityAttr(S, D, Attr); break; case AttributeList::AT_packed: handlePackedAttr (S, D, Attr); break; - case AttributeList::AT_MsStruct: handleMsStructAttr (S, D, Attr); break; + case AttributeList::AT___ms_struct__: handleMsStructAttr (S, D, Attr); break; case AttributeList::AT_section: handleSectionAttr (S, D, Attr); break; case AttributeList::AT_unavailable: handleUnavailableAttr (S, D, Attr); break; - case AttributeList::AT_arc_weakref_unavailable: + case AttributeList::AT_objc_arc_weak_reference_unavailable: handleArcWeakrefUnavailableAttr (S, D, Attr); break; case AttributeList::AT_objc_requires_property_definitions: @@ -3667,7 +3667,7 @@ case AttributeList::AT_objc_method_family: handleObjCMethodFamilyAttr(S, D, Attr); break; - case AttributeList::AT_nsobject: handleObjCNSObject (S, D, Attr); break; + case AttributeList::AT_NSObject: handleObjCNSObject (S, D, Attr); break; case AttributeList::AT_blocks: handleBlocksAttr (S, D, Attr); break; case AttributeList::AT_sentinel: handleSentinelAttr (S, D, Attr); break; case AttributeList::AT_const: handleConstAttr (S, D, Attr); break; Index: lib/Sema/CMakeLists.txt =================================================================== --- lib/Sema/CMakeLists.txt (revision 151056) +++ lib/Sema/CMakeLists.txt (working copy) @@ -45,4 +45,4 @@ add_dependencies(clangSema ClangARMNeon ClangAttrClasses ClangAttrList ClangDiagnosticSema ClangDeclNodes ClangStmtNodes - ClangAttrTemplateInstantiate) + ClangAttrTemplateInstantiate ClangAttrParsedAttrList) Index: lib/Sema/AttributeList.cpp =================================================================== --- lib/Sema/AttributeList.cpp (revision 151056) +++ lib/Sema/AttributeList.cpp (working copy) @@ -107,7 +107,7 @@ return llvm::StringSwitch(AttrName) .Case("weak", AT_weak) .Case("weakref", AT_weakref) - .Case("objc_arc_weak_reference_unavailable", AT_arc_weakref_unavailable) + .Case("objc_arc_weak_reference_unavailable", AT_objc_arc_weak_reference_unavailable) .Case("objc_requires_property_definitions", AT_objc_requires_property_definitions) .Case("pure", AT_pure) .Case("mode", AT_mode) @@ -134,13 +134,13 @@ .Case("stdcall", AT_stdcall) .Case("annotate", AT_annotate) .Case("fastcall", AT_fastcall) - .Case("ibaction", AT_IBAction) - .Case("iboutlet", AT_IBOutlet) - .Case("iboutletcollection", AT_IBOutletCollection) + .Case("ibaction", AT_ibaction) + .Case("iboutlet", AT_iboutlet) + .Case("iboutletcollection", AT_iboutletcollection) .Case("noreturn", AT_noreturn) .Case("noinline", AT_noinline) .Case("sentinel", AT_sentinel) - .Case("NSObject", AT_nsobject) + .Case("NSObject", AT_NSObject) .Case("dllimport", AT_dllimport) .Case("dllexport", AT_dllexport) .Case("may_alias", AT_may_alias) @@ -191,7 +191,7 @@ .Case("ownership_returns", AT_ownership_returns) .Case("ownership_holds", AT_ownership_holds) .Case("ownership_takes", AT_ownership_takes) - .Case("reqd_work_group_size", AT_reqd_wg_size) + .Case("reqd_work_group_size", AT_reqd_work_group_size) .Case("init_priority", AT_init_priority) .Case("no_instrument_function", AT_no_instrument_function) .Case("thiscall", AT_thiscall) @@ -213,7 +213,7 @@ .Case("opencl_kernel_function", AT_opencl_kernel_function) .Case("uuid", AT_uuid) .Case("pcs", AT_pcs) - .Case("ms_struct", AT_MsStruct) + .Case("ms_struct", AT___ms_struct__) .Case("guarded_var", AT_guarded_var) .Case("pt_guarded_var", AT_pt_guarded_var) .Case("scoped_lockable", AT_scoped_lockable) Index: lib/Parse/ParseDecl.cpp =================================================================== --- lib/Parse/ParseDecl.cpp (revision 151056) +++ lib/Parse/ParseDecl.cpp (working copy) @@ -270,7 +270,7 @@ AttributeList *attr = Attrs.addNew(AttrName, SourceRange(AttrNameLoc, RParen), 0, AttrNameLoc, ParmName, ParmLoc, ArgExprs.take(), ArgExprs.size()); - if (BuiltinType && attr->getKind() == AttributeList::AT_IBOutletCollection) + if (BuiltinType && attr->getKind() == AttributeList::AT_iboutletcollection) Diag(Tok, diag::err_iboutletcollection_builtintype); } }