diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2017-05-29 16:25:46 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2017-05-29 16:25:46 +0000 |
| commit | b5aee35cc5d62f11d98539f62e4fe63f0ac9edc6 (patch) | |
| tree | 3e6ab962dbc73cfe1445a60d2eb4dfba7c939a22 /utils/TableGen | |
| parent | aa803409c3bd3930126db630c29f63d42f255153 (diff) | |
| download | src-b5aee35cc5d62f11d98539f62e4fe63f0ac9edc6.tar.gz src-b5aee35cc5d62f11d98539f62e4fe63f0ac9edc6.zip | |
Vendor import of clang trunk r304149:vendor/clang/clang-trunk-r304149
Notes
Notes:
svn path=/vendor/clang/dist/; revision=319142
svn path=/vendor/clang/clang-trunk-r304149/; revision=319143; tag=vendor/clang/clang-trunk-r304149
Diffstat (limited to 'utils/TableGen')
| -rw-r--r-- | utils/TableGen/ClangAttrEmitter.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/utils/TableGen/ClangAttrEmitter.cpp b/utils/TableGen/ClangAttrEmitter.cpp index 7efc9bccdc5c..edd3e38471be 100644 --- a/utils/TableGen/ClangAttrEmitter.cpp +++ b/utils/TableGen/ClangAttrEmitter.cpp @@ -312,7 +312,7 @@ namespace { } void writeDump(raw_ostream &OS) const override { - if (type == "FunctionDecl *") { + if (type == "FunctionDecl *" || type == "NamedDecl *") { OS << " OS << \" \";\n"; OS << " dumpBareDeclRef(SA->get" << getUpperName() << "());\n"; } else if (type == "IdentifierInfo *") { @@ -1181,6 +1181,8 @@ createArgument(const Record &Arg, StringRef Attr, Ptr = llvm::make_unique<ExprArgument>(Arg, Attr); else if (ArgName == "FunctionArgument") Ptr = llvm::make_unique<SimpleArgument>(Arg, Attr, "FunctionDecl *"); + else if (ArgName == "NamedArgument") + Ptr = llvm::make_unique<SimpleArgument>(Arg, Attr, "NamedDecl *"); else if (ArgName == "IdentifierArgument") Ptr = llvm::make_unique<SimpleArgument>(Arg, Attr, "IdentifierInfo *"); else if (ArgName == "DefaultBoolArgument") @@ -3103,6 +3105,8 @@ static std::string CalculateDiagnostic(const Record &S) { " : ExpectedVariableOrFunction))"; case ObjCMethod | ObjCProp: return "ExpectedMethodOrProperty"; + case Func | ObjCMethod | ObjCProp: + return "ExpectedFunctionOrMethodOrProperty"; case ObjCProtocol | ObjCInterface: return "ExpectedObjectiveCInterfaceOrProtocol"; case Field | Var: return "ExpectedFieldOrGlobalVar"; |