diff options
| -rw-r--r-- | docs/LangRef.html | 5 | ||||
| -rw-r--r-- | include/llvm-c/Core.h | 3 | ||||
| -rw-r--r-- | include/llvm/Attributes.h | 5 | ||||
| -rw-r--r-- | lib/AsmParser/LLLexer.cpp | 1 | ||||
| -rw-r--r-- | lib/AsmParser/LLParser.cpp | 1 | ||||
| -rw-r--r-- | lib/AsmParser/LLToken.h | 1 | ||||
| -rw-r--r-- | lib/Target/CppBackend/CPPBackend.cpp | 1 | ||||
| -rw-r--r-- | lib/VMCore/Attributes.cpp | 2 | ||||
| -rw-r--r-- | utils/llvm.grm | 1 | ||||
| -rw-r--r-- | utils/vim/llvm.vim | 2 |
10 files changed, 18 insertions, 4 deletions
diff --git a/docs/LangRef.html b/docs/LangRef.html index ab86271f33..44ef03b4ef 100644 --- a/docs/LangRef.html +++ b/docs/LangRef.html @@ -1042,6 +1042,11 @@ define void @f() optsize function into callers whenever possible, ignoring any active inlining size threshold for this caller.</dd> + <dt><tt>inlinehint</tt></dt> + <dd>This attribute indicates that the source code contained a hint that inlining + this function is desirable (such as the "inline" keyword in C/C++). It + is just a hint; it imposes no requirements on the inliner.</dd> + <dt><tt>noinline</tt></dt> <dd>This attribute indicates that the inliner should never inline this function in any situation. This attribute may not be used together with diff --git a/include/llvm-c/Core.h b/include/llvm-c/Core.h index b0a9800ce2..e1a99531b5 100644 --- a/include/llvm-c/Core.h +++ b/include/llvm-c/Core.h @@ -109,7 +109,8 @@ typedef enum { LLVMNoCaptureAttribute = 1<<21, LLVMNoRedZoneAttribute = 1<<22, LLVMNoImplicitFloatAttribute = 1<<23, - LLVMNakedAttribute = 1<<24 + LLVMNakedAttribute = 1<<24, + LLVMInlineHintAttribute = 1<<25 } LLVMAttribute; typedef enum { diff --git a/include/llvm/Attributes.h b/include/llvm/Attributes.h index 49f6057f31..0bbdc349b1 100644 --- a/include/llvm/Attributes.h +++ b/include/llvm/Attributes.h @@ -57,7 +57,8 @@ const Attributes NoCapture = 1<<21; ///< Function creates no aliases of pointer const Attributes NoRedZone = 1<<22; /// disable redzone const Attributes NoImplicitFloat = 1<<23; /// disable implicit floating point /// instructions. -const Attributes Naked = 1<<24; ///< Naked function +const Attributes Naked = 1<<24; ///< Naked function +const Attributes InlineHint = 1<<25; ///< source said inlining was desirable /// @brief Attributes that only apply to function parameters. const Attributes ParameterOnly = ByVal | Nest | StructRet | NoCapture; @@ -66,7 +67,7 @@ const Attributes ParameterOnly = ByVal | Nest | StructRet | NoCapture; /// be used on return values or function parameters. const Attributes FunctionOnly = NoReturn | NoUnwind | ReadNone | ReadOnly | NoInline | AlwaysInline | OptimizeForSize | StackProtect | StackProtectReq | - NoRedZone | NoImplicitFloat | Naked; + NoRedZone | NoImplicitFloat | Naked | InlineHint; /// @brief Parameter attributes that do not apply to vararg call arguments. const Attributes VarArgsIncompatible = StructRet; diff --git a/lib/AsmParser/LLLexer.cpp b/lib/AsmParser/LLLexer.cpp index 8d6b5dbb13..23d7f19bbc 100644 --- a/lib/AsmParser/LLLexer.cpp +++ b/lib/AsmParser/LLLexer.cpp @@ -556,6 +556,7 @@ lltok::Kind LLLexer::LexIdentifier() { KEYWORD(readnone); KEYWORD(readonly); + KEYWORD(inlinehint); KEYWORD(noinline); KEYWORD(alwaysinline); KEYWORD(optsize); diff --git a/lib/AsmParser/LLParser.cpp b/lib/AsmParser/LLParser.cpp index 5ac4a82ccb..784672acef 100644 --- a/lib/AsmParser/LLParser.cpp +++ b/lib/AsmParser/LLParser.cpp @@ -907,6 +907,7 @@ bool LLParser::ParseOptionalAttrs(unsigned &Attrs, unsigned AttrKind) { case lltok::kw_noinline: Attrs |= Attribute::NoInline; break; case lltok::kw_readnone: Attrs |= Attribute::ReadNone; break; case lltok::kw_readonly: Attrs |= Attribute::ReadOnly; break; + case lltok::kw_inlinehint: Attrs |= Attribute::InlineHint; break; case lltok::kw_alwaysinline: Attrs |= Attribute::AlwaysInline; break; case lltok::kw_optsize: Attrs |= Attribute::OptimizeForSize; break; case lltok::kw_ssp: Attrs |= Attribute::StackProtect; break; diff --git a/lib/AsmParser/LLToken.h b/lib/AsmParser/LLToken.h index a49d05442b..b053cca18a 100644 --- a/lib/AsmParser/LLToken.h +++ b/lib/AsmParser/LLToken.h @@ -82,6 +82,7 @@ namespace lltok { kw_readnone, kw_readonly, + kw_inlinehint, kw_noinline, kw_alwaysinline, kw_optsize, diff --git a/lib/Target/CppBackend/CPPBackend.cpp b/lib/Target/CppBackend/CPPBackend.cpp index bebad66796..e9b3aa901d 100644 --- a/lib/Target/CppBackend/CPPBackend.cpp +++ b/lib/Target/CppBackend/CPPBackend.cpp @@ -472,6 +472,7 @@ namespace { HANDLE_ATTR(Nest); HANDLE_ATTR(ReadNone); HANDLE_ATTR(ReadOnly); + HANDLE_ATTR(InlineHint); HANDLE_ATTR(NoInline); HANDLE_ATTR(AlwaysInline); HANDLE_ATTR(OptimizeForSize); diff --git a/lib/VMCore/Attributes.cpp b/lib/VMCore/Attributes.cpp index 51fd5f02ac..d68bba3072 100644 --- a/lib/VMCore/Attributes.cpp +++ b/lib/VMCore/Attributes.cpp @@ -55,6 +55,8 @@ std::string Attribute::getAsString(Attributes Attrs) { Result += "optsize "; if (Attrs & Attribute::NoInline) Result += "noinline "; + if (Attrs & Attribute::InlineHint) + Result += "inlinehint "; if (Attrs & Attribute::AlwaysInline) Result += "alwaysinline "; if (Attrs & Attribute::StackProtect) diff --git a/utils/llvm.grm b/utils/llvm.grm index 4499d4b35a..86a707a925 100644 --- a/utils/llvm.grm +++ b/utils/llvm.grm @@ -161,6 +161,7 @@ FuncAttr ::= noreturn | signext | readnone | readonly + | inlinehint | noinline | alwaysinline | optsize diff --git a/utils/vim/llvm.vim b/utils/vim/llvm.vim index b99b04cdd1..2cc266bd27 100644 --- a/utils/vim/llvm.vim +++ b/utils/vim/llvm.vim @@ -51,7 +51,7 @@ syn keyword llvmKeyword volatile fastcc coldcc cc ccc syn keyword llvmKeyword x86_stdcallcc x86_fastcallcc syn keyword llvmKeyword signext zeroext inreg sret nounwind noreturn syn keyword llvmKeyword nocapture byval nest readnone readonly noalias -syn keyword llvmKeyword noinline alwaysinline optsize ssp sspreq +syn keyword llvmKeyword inlinehint noinline alwaysinline optsize ssp sspreq syn keyword llvmKeyword noredzone noimplicitfloat naked syn keyword llvmKeyword module asm align tail to syn keyword llvmKeyword addrspace section alias sideeffect c gc |