summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--docs/LangRef.rst6
-rw-r--r--include/llvm/IR/Attributes.h4
-rw-r--r--lib/AsmParser/LLLexer.cpp2
-rw-r--r--lib/AsmParser/LLParser.cpp6
-rw-r--r--lib/AsmParser/LLToken.h2
-rw-r--r--lib/Bitcode/Reader/BitcodeReader.cpp2
-rw-r--r--lib/Bitcode/Writer/BitcodeWriter.cpp2
-rw-r--r--lib/IR/Attributes.cpp6
-rw-r--r--lib/IR/Verifier.cpp2
-rw-r--r--test/Bitcode/attributes.ll10
-rw-r--r--utils/llvm.grm2
-rw-r--r--utils/vim/llvm.vim1
12 files changed, 42 insertions, 3 deletions
diff --git a/docs/LangRef.rst b/docs/LangRef.rst
index d702cfb02c..f8e22c8d7b 100644
--- a/docs/LangRef.rst
+++ b/docs/LangRef.rst
@@ -909,6 +909,12 @@ example:
If a function that has an ``sspstrong`` attribute is inlined into a
function that doesn't have an ``sspstrong`` attribute, then the
resulting function will have an ``sspstrong`` attribute.
+``thread_safety``
+ This attribute indicates that the thread safety analysis is enabled
+ for this function.
+``uninitialized_checks``
+ This attribute indicates that the checks for uses of uninitialized
+ memory are enabled.
``uwtable``
This attribute indicates that the ABI being targeted requires that
an unwind table entry be produce for this function even if we can
diff --git a/include/llvm/IR/Attributes.h b/include/llvm/IR/Attributes.h
index 2a0363ceb2..d4836ee30e 100644
--- a/include/llvm/IR/Attributes.h
+++ b/include/llvm/IR/Attributes.h
@@ -95,6 +95,8 @@ public:
StackProtectReq, ///< Stack protection required.
StackProtectStrong, ///< Strong Stack protection.
StructRet, ///< Hidden pointer to structure to return
+ ThreadSafety, ///< Thread safety checking is on.
+ UninitializedChecks, ///< Checking for uses of uninitialized memory is on.
UWTable, ///< Function must be in a unwind table
ZExt, ///< Zero extended before/after call
@@ -507,6 +509,8 @@ public:
.removeAttribute(Attribute::NonLazyBind)
.removeAttribute(Attribute::ReturnsTwice)
.removeAttribute(Attribute::AddressSafety)
+ .removeAttribute(Attribute::ThreadSafety)
+ .removeAttribute(Attribute::UninitializedChecks)
.removeAttribute(Attribute::MinSize)
.removeAttribute(Attribute::NoDuplicate);
}
diff --git a/lib/AsmParser/LLLexer.cpp b/lib/AsmParser/LLLexer.cpp
index 2256124043..3b8b0337e5 100644
--- a/lib/AsmParser/LLLexer.cpp
+++ b/lib/AsmParser/LLLexer.cpp
@@ -578,6 +578,8 @@ lltok::Kind LLLexer::LexIdentifier() {
KEYWORD(ssp);
KEYWORD(sspreq);
KEYWORD(sspstrong);
+ KEYWORD(thread_safety);
+ KEYWORD(uninitialized_checks);
KEYWORD(uwtable);
KEYWORD(zeroext);
diff --git a/lib/AsmParser/LLParser.cpp b/lib/AsmParser/LLParser.cpp
index e2f42d8231..e4f8d1fec4 100644
--- a/lib/AsmParser/LLParser.cpp
+++ b/lib/AsmParser/LLParser.cpp
@@ -922,6 +922,8 @@ bool LLParser::ParseFnAttributeValuePairs(AttrBuilder &B,
case lltok::kw_ssp: B.addAttribute(Attribute::StackProtect); break;
case lltok::kw_sspreq: B.addAttribute(Attribute::StackProtectReq); break;
case lltok::kw_sspstrong: B.addAttribute(Attribute::StackProtectStrong); break;
+ case lltok::kw_thread_safety: B.addAttribute(Attribute::ThreadSafety); break;
+ case lltok::kw_uninitialized_checks: B.addAttribute(Attribute::UninitializedChecks); break;
case lltok::kw_uwtable: B.addAttribute(Attribute::UWTable); break;
// Error handling.
@@ -1161,7 +1163,8 @@ bool LLParser::ParseOptionalParamAttrs(AttrBuilder &B) {
case lltok::kw_noredzone: case lltok::kw_noimplicitfloat:
case lltok::kw_naked: case lltok::kw_nonlazybind:
case lltok::kw_address_safety: case lltok::kw_minsize:
- case lltok::kw_alignstack:
+ case lltok::kw_alignstack: case lltok::kw_thread_safety:
+ case lltok::kw_uninitialized_checks:
HaveError |= Error(Lex.getLoc(), "invalid use of function-only attribute");
break;
}
@@ -1203,6 +1206,7 @@ bool LLParser::ParseOptionalReturnAttrs(AttrBuilder &B) {
case lltok::kw_nonlazybind: case lltok::kw_address_safety:
case lltok::kw_minsize: case lltok::kw_alignstack:
case lltok::kw_align: case lltok::kw_noduplicate:
+ case lltok::kw_thread_safety: case lltok::kw_uninitialized_checks:
HaveError |= Error(Lex.getLoc(), "invalid use of function-only attribute");
break;
}
diff --git a/lib/AsmParser/LLToken.h b/lib/AsmParser/LLToken.h
index 8c18a3be60..97429b8ce5 100644
--- a/lib/AsmParser/LLToken.h
+++ b/lib/AsmParser/LLToken.h
@@ -119,6 +119,8 @@ namespace lltok {
kw_sspreq,
kw_sspstrong,
kw_sret,
+ kw_thread_safety,
+ kw_uninitialized_checks,
kw_uwtable,
kw_zeroext,
diff --git a/lib/Bitcode/Reader/BitcodeReader.cpp b/lib/Bitcode/Reader/BitcodeReader.cpp
index 110f47c7d8..30ba85eca6 100644
--- a/lib/Bitcode/Reader/BitcodeReader.cpp
+++ b/lib/Bitcode/Reader/BitcodeReader.cpp
@@ -444,7 +444,7 @@ static void decodeLLVMAttributesForBitcode(AttrBuilder &B,
if (Alignment)
B.addAlignmentAttr(Alignment);
- B.addRawValue(((EncodedAttrs & (0xffffULL << 32)) >> 11) |
+ B.addRawValue(((EncodedAttrs & (0xfffffULL << 32)) >> 11) |
(EncodedAttrs & 0xffff));
}
diff --git a/lib/Bitcode/Writer/BitcodeWriter.cpp b/lib/Bitcode/Writer/BitcodeWriter.cpp
index 37dcb461e3..65c3f7329d 100644
--- a/lib/Bitcode/Writer/BitcodeWriter.cpp
+++ b/lib/Bitcode/Writer/BitcodeWriter.cpp
@@ -181,7 +181,7 @@ static uint64_t encodeLLVMAttributesForBitcode(AttributeSet Attrs,
uint64_t EncodedAttrs = Attrs.Raw(Index) & 0xffff;
if (Attrs.hasAttribute(Index, Attribute::Alignment))
EncodedAttrs |= Attrs.getParamAlignment(Index) << 16;
- EncodedAttrs |= (Attrs.Raw(Index) & (0xffffULL << 21)) << 11;
+ EncodedAttrs |= (Attrs.Raw(Index) & (0xfffffULL << 21)) << 11;
return EncodedAttrs;
}
diff --git a/lib/IR/Attributes.cpp b/lib/IR/Attributes.cpp
index 343f569a11..267c1aa893 100644
--- a/lib/IR/Attributes.cpp
+++ b/lib/IR/Attributes.cpp
@@ -205,6 +205,10 @@ std::string Attribute::getAsString() const {
return "sspstrong";
if (hasAttribute(Attribute::StructRet))
return "sret";
+ if (hasAttribute(Attribute::ThreadSafety))
+ return "thread_safety";
+ if (hasAttribute(Attribute::UninitializedChecks))
+ return "uninitialized_checks";
if (hasAttribute(Attribute::UWTable))
return "uwtable";
if (hasAttribute(Attribute::ZExt))
@@ -382,6 +386,8 @@ uint64_t AttributeImpl::getAttrMask(Attribute::AttrKind Val) {
case Attribute::MinSize: return 1ULL << 33;
case Attribute::NoDuplicate: return 1ULL << 34;
case Attribute::StackProtectStrong: return 1ULL << 35;
+ case Attribute::ThreadSafety: return 1ULL << 36;
+ case Attribute::UninitializedChecks: return 1ULL << 37;
}
llvm_unreachable("Unsupported attribute type");
}
diff --git a/lib/IR/Verifier.cpp b/lib/IR/Verifier.cpp
index 31312dc1c4..02c209660b 100644
--- a/lib/IR/Verifier.cpp
+++ b/lib/IR/Verifier.cpp
@@ -651,6 +651,8 @@ void Verifier::VerifyParameterAttrs(AttributeSet Attrs, uint64_t Idx, Type *Ty,
!Attrs.hasAttribute(Idx, Attribute::NonLazyBind) &&
!Attrs.hasAttribute(Idx, Attribute::ReturnsTwice) &&
!Attrs.hasAttribute(Idx, Attribute::AddressSafety) &&
+ !Attrs.hasAttribute(Idx, Attribute::ThreadSafety) &&
+ !Attrs.hasAttribute(Idx, Attribute::UninitializedChecks) &&
!Attrs.hasAttribute(Idx, Attribute::MinSize),
"Some attributes in '" + Attrs.getAsString(Idx) +
"' only apply to functions!", V);
diff --git a/test/Bitcode/attributes.ll b/test/Bitcode/attributes.ll
index 502e967282..cfb214e792 100644
--- a/test/Bitcode/attributes.ll
+++ b/test/Bitcode/attributes.ll
@@ -162,3 +162,13 @@ define void @f27() address_safety
{
ret void;
}
+define void @f28() thread_safety
+; CHECK: define void @f28() thread_safety
+{
+ ret void;
+}
+define void @f29() uninitialized_checks
+; CHECK: define void @f29() uninitialized_checks
+{
+ ret void;
+}
diff --git a/utils/llvm.grm b/utils/llvm.grm
index 322036b2c2..c550434054 100644
--- a/utils/llvm.grm
+++ b/utils/llvm.grm
@@ -175,6 +175,8 @@ FuncAttr ::= noreturn
| returns_twice
| nonlazybind
| address_safety
+ | thread_safety
+ | uninitialized_checks
;
OptFuncAttrs ::= + _ | OptFuncAttrs FuncAttr ;
diff --git a/utils/vim/llvm.vim b/utils/vim/llvm.vim
index cea86eee5b..256ef150ed 100644
--- a/utils/vim/llvm.vim
+++ b/utils/vim/llvm.vim
@@ -55,6 +55,7 @@ syn keyword llvmKeyword singlethread spir_func spir_kernel sret ssp sspreq
syn keyword llvmKeyword sspstrong tail target thread_local to triple
syn keyword llvmKeyword unnamed_addr unordered uwtable volatile weak weak_odr
syn keyword llvmKeyword x86_fastcallcc x86_stdcallcc x86_thiscallcc zeroext
+syn keyword llvmKeyword thread_safety uninitialized_checks
" Obsolete keywords.
syn keyword llvmError getresult begin end
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 20:27:48 +0000