diff options
| -rw-r--r-- | llvm/docs/ReleaseNotes.rst | 2 | ||||
| -rw-r--r-- | llvm/include/llvm-c/Core.h | 2 | ||||
| -rw-r--r-- | llvm/lib/IR/Core.cpp | 9 |
3 files changed, 4 insertions, 9 deletions
diff --git a/llvm/docs/ReleaseNotes.rst b/llvm/docs/ReleaseNotes.rst index 1f88ec1048d..47dde2fc858 100644 --- a/llvm/docs/ReleaseNotes.rst +++ b/llvm/docs/ReleaseNotes.rst @@ -55,7 +55,7 @@ Non-comprehensive list of changes in this release in favor of LLVMGetDataLayoutStr. * The C API enum LLVMAttribute is deprecated in favor of - LLVMGetAttrKindID. + LLVMGetAttributeKindForName. * ``TargetFrameLowering::eliminateCallFramePseudoInstr`` now returns an iterator to the next instruction instead of ``void``. Targets that previously diff --git a/llvm/include/llvm-c/Core.h b/llvm/include/llvm-c/Core.h index 7ec8b8cffff..674b93ffd5f 100644 --- a/llvm/include/llvm-c/Core.h +++ b/llvm/include/llvm-c/Core.h @@ -487,7 +487,7 @@ unsigned LLVMGetMDKindID(const char *Name, unsigned SLen); * NB: Attribute names and/or id are subject to change without * going through the C API deprecation cycle. */ -unsigned LLVMGetAttrKindID(const char *Name, size_t SLen); +unsigned LLVMGetAttributeKindForName(const char *Name, size_t SLen); /** * @} diff --git a/llvm/lib/IR/Core.cpp b/llvm/lib/IR/Core.cpp index 0c6c6f5157d..8429ef1a5e0 100644 --- a/llvm/lib/IR/Core.cpp +++ b/llvm/lib/IR/Core.cpp @@ -124,13 +124,8 @@ unsigned LLVMGetMDKindID(const char *Name, unsigned SLen) { #define GET_ATTR_KIND_FROM_NAME #include "AttributesCompatFunc.inc" -unsigned LLVMGetAttrKindID(const char *Name, size_t SLen) { - auto K = getAttrKindFromName(StringRef(Name, SLen)); - if (K == Attribute::None) { - return 0; - } - - return AttributeImpl::getAttrMask(K); +unsigned LLVMGetAttributeKindForName(const char *Name, size_t SLen) { + return getAttrKindFromName(StringRef(Name, SLen)); } char *LLVMGetDiagInfoDescription(LLVMDiagnosticInfoRef DI) { |
