diff options
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/include/llvm/IR/Attributes.h | 20 | ||||
| -rw-r--r-- | llvm/test/Analysis/BasicAA/intrinsics.ll | 4 | ||||
| -rw-r--r-- | llvm/test/Analysis/TypeBasedAliasAnalysis/intrinsics.ll | 4 | ||||
| -rw-r--r-- | llvm/test/Bitcode/compatibility-3.6.ll | 4 | ||||
| -rw-r--r-- | llvm/test/Bitcode/compatibility-3.7.ll | 4 | ||||
| -rw-r--r-- | llvm/test/Bitcode/compatibility.ll | 4 | ||||
| -rw-r--r-- | llvm/test/Transforms/Inline/inline_invoke.ll | 2 | ||||
| -rw-r--r-- | llvm/test/Transforms/MemCpyOpt/memcpy.ll | 2 | ||||
| -rw-r--r-- | llvm/test/Transforms/ObjCARC/nested.ll | 2 |
9 files changed, 23 insertions, 23 deletions
diff --git a/llvm/include/llvm/IR/Attributes.h b/llvm/include/llvm/IR/Attributes.h index b3984330b17..1e95e908dba 100644 --- a/llvm/include/llvm/IR/Attributes.h +++ b/llvm/include/llvm/IR/Attributes.h @@ -68,12 +68,16 @@ public: ///< stored as log2 of alignment with +1 bias ///< 0 means unaligned (different from align(1)) AlwaysInline, ///< inline=always + ArgMemOnly, ///< Funciton can access memory only using pointers + ///< based on its arguments. Builtin, ///< Callee is recognized as a builtin, despite ///< nobuiltin attribute on its declaration. ByVal, ///< Pass structure by value - InAlloca, ///< Pass structure in an alloca Cold, ///< Marks function as being in a cold path. Convergent, ///< Can only be moved to control-equivalent blocks + Dereferenceable, ///< Pointer is known to be dereferenceable + DereferenceableOrNull, ///< Pointer is either null or dereferenceable + InAlloca, ///< Pass structure in an alloca InlineHint, ///< Source said inlining was desirable InReg, ///< Force argument to be passed in register JumpTable, ///< Build jump-instruction tables and replace refs. @@ -86,12 +90,10 @@ public: NoDuplicate, ///< Call cannot be duplicated NoImplicitFloat, ///< Disable implicit floating point insts NoInline, ///< inline=never - NoRecurse, ///< The function does not recurse NonLazyBind, ///< Function is called early and/or ///< often, so lazy binding isn't worthwhile NonNull, ///< Pointer is known to be not null - Dereferenceable, ///< Pointer is known to be dereferenceable - DereferenceableOrNull, ///< Pointer is either null or dereferenceable + NoRecurse, ///< The function does not recurse NoRedZone, ///< Disable redzone NoReturn, ///< Mark the function as not returning NoUnwind, ///< Function doesn't unwind stack @@ -99,10 +101,12 @@ public: OptimizeNone, ///< Function must not be optimized. ReadNone, ///< Function does not access memory ReadOnly, ///< Function only reads from memory - ArgMemOnly, ///< Funciton can access memory only using pointers - ///< based on its arguments. Returned, ///< Return value is always equal to this argument ReturnsTwice, ///< Function can return twice + SafeStack, ///< Safe Stack protection. + SanitizeAddress, ///< AddressSanitizer is on. + SanitizeMemory, ///< MemorySanitizer is on. + SanitizeThread, ///< ThreadSanitizer is on. SExt, ///< Sign extended before/after call StackAlignment, ///< Alignment of stack for function (3 bits) ///< stored as log2 of alignment with +1 bias 0 @@ -111,11 +115,7 @@ public: StackProtect, ///< Stack protection. StackProtectReq, ///< Stack protection required. StackProtectStrong, ///< Strong Stack protection. - SafeStack, ///< Safe Stack protection. StructRet, ///< Hidden pointer to structure to return - SanitizeAddress, ///< AddressSanitizer is on. - SanitizeThread, ///< ThreadSanitizer is on. - SanitizeMemory, ///< MemorySanitizer is on. UWTable, ///< Function must be in a unwind table ZExt, ///< Zero extended before/after call diff --git a/llvm/test/Analysis/BasicAA/intrinsics.ll b/llvm/test/Analysis/BasicAA/intrinsics.ll index 50ddadd46b1..526a039ef7a 100644 --- a/llvm/test/Analysis/BasicAA/intrinsics.ll +++ b/llvm/test/Analysis/BasicAA/intrinsics.ll @@ -38,6 +38,6 @@ entry: declare <8 x i16> @llvm.arm.neon.vld1.v8i16.p0i8(i8*, i32) nounwind readonly declare void @llvm.arm.neon.vst1.p0i8.v8i16(i8*, <8 x i16>, i32) nounwind -; CHECK: attributes #0 = { nounwind readonly argmemonly } -; CHECK: attributes #1 = { nounwind argmemonly } +; CHECK: attributes #0 = { argmemonly nounwind readonly } +; CHECK: attributes #1 = { argmemonly nounwind } ; CHECK: attributes [[ATTR]] = { nounwind } diff --git a/llvm/test/Analysis/TypeBasedAliasAnalysis/intrinsics.ll b/llvm/test/Analysis/TypeBasedAliasAnalysis/intrinsics.ll index 2292e3917ff..197ef7e5196 100644 --- a/llvm/test/Analysis/TypeBasedAliasAnalysis/intrinsics.ll +++ b/llvm/test/Analysis/TypeBasedAliasAnalysis/intrinsics.ll @@ -22,8 +22,8 @@ entry: declare <8 x i16> @llvm.arm.neon.vld1.v8i16.p0i8(i8*, i32) nounwind readonly declare void @llvm.arm.neon.vst1.p0i8.v8i16(i8*, <8 x i16>, i32) nounwind -; CHECK: attributes #0 = { nounwind readonly argmemonly } -; CHECK: attributes #1 = { nounwind argmemonly } +; CHECK: attributes #0 = { argmemonly nounwind readonly } +; CHECK: attributes #1 = { argmemonly nounwind } ; CHECK: attributes [[NUW]] = { nounwind } !0 = !{!"tbaa root", null} diff --git a/llvm/test/Bitcode/compatibility-3.6.ll b/llvm/test/Bitcode/compatibility-3.6.ll index 1c2cf5124d1..87958fc3418 100644 --- a/llvm/test/Bitcode/compatibility-3.6.ll +++ b/llvm/test/Bitcode/compatibility-3.6.ll @@ -1180,8 +1180,8 @@ define void @intrinsics.codegen() { ; CHECK: attributes #27 = { uwtable } ; CHECK: attributes #28 = { "cpu"="cortex-a8" } ; CHECK: attributes #29 = { nounwind readnone } -; CHECK: attributes #30 = { nounwind readonly argmemonly } -; CHECK: attributes #31 = { nounwind argmemonly } +; CHECK: attributes #30 = { argmemonly nounwind readonly } +; CHECK: attributes #31 = { argmemonly nounwind } ; CHECK: attributes #32 = { nounwind readonly } ; CHECK: attributes #33 = { builtin } diff --git a/llvm/test/Bitcode/compatibility-3.7.ll b/llvm/test/Bitcode/compatibility-3.7.ll index 662f916c7bc..4ae0aed2018 100644 --- a/llvm/test/Bitcode/compatibility-3.7.ll +++ b/llvm/test/Bitcode/compatibility-3.7.ll @@ -1243,8 +1243,8 @@ define void @misc.metadata() { ; CHECK: attributes #30 = { uwtable } ; CHECK: attributes #31 = { "cpu"="cortex-a8" } ; CHECK: attributes #32 = { nounwind readnone } -; CHECK: attributes #33 = { nounwind readonly argmemonly } -; CHECK: attributes #34 = { nounwind argmemonly } +; CHECK: attributes #33 = { argmemonly nounwind readonly } +; CHECK: attributes #34 = { argmemonly nounwind } ; CHECK: attributes #35 = { nounwind readonly } ; CHECK: attributes #36 = { builtin } diff --git a/llvm/test/Bitcode/compatibility.ll b/llvm/test/Bitcode/compatibility.ll index 49689a99237..6c08a930209 100644 --- a/llvm/test/Bitcode/compatibility.ll +++ b/llvm/test/Bitcode/compatibility.ll @@ -1508,8 +1508,8 @@ normal: ; CHECK: attributes #31 = { "cpu"="cortex-a8" } ; CHECK: attributes #32 = { norecurse } ; CHECK: attributes #33 = { nounwind readnone } -; CHECK: attributes #34 = { nounwind readonly argmemonly } -; CHECK: attributes #35 = { nounwind argmemonly } +; CHECK: attributes #34 = { argmemonly nounwind readonly } +; CHECK: attributes #35 = { argmemonly nounwind } ; CHECK: attributes #36 = { nounwind readonly } ; CHECK: attributes #37 = { builtin } diff --git a/llvm/test/Transforms/Inline/inline_invoke.ll b/llvm/test/Transforms/Inline/inline_invoke.ll index 8b666956c91..6784e16b1d8 100644 --- a/llvm/test/Transforms/Inline/inline_invoke.ll +++ b/llvm/test/Transforms/Inline/inline_invoke.ll @@ -344,5 +344,5 @@ terminate: ; CHECK: attributes [[NUW]] = { nounwind } ; CHECK: attributes #1 = { nounwind readnone } ; CHECK: attributes #2 = { ssp uwtable } -; CHECK: attributes #3 = { nounwind argmemonly } +; CHECK: attributes #3 = { argmemonly nounwind } ; CHECK: attributes #4 = { noreturn nounwind } diff --git a/llvm/test/Transforms/MemCpyOpt/memcpy.ll b/llvm/test/Transforms/MemCpyOpt/memcpy.ll index c091073db84..6181543cfc6 100644 --- a/llvm/test/Transforms/MemCpyOpt/memcpy.ll +++ b/llvm/test/Transforms/MemCpyOpt/memcpy.ll @@ -206,6 +206,6 @@ declare void @f1(%struct.big* nocapture sret) declare void @f2(%struct.big*) ; CHECK: attributes [[NUW]] = { nounwind } -; CHECK: attributes #1 = { nounwind argmemonly } +; CHECK: attributes #1 = { argmemonly nounwind } ; CHECK: attributes #2 = { nounwind ssp } ; CHECK: attributes #3 = { nounwind ssp uwtable } diff --git a/llvm/test/Transforms/ObjCARC/nested.ll b/llvm/test/Transforms/ObjCARC/nested.ll index 58cac76d1e6..cf14a1f9a66 100644 --- a/llvm/test/Transforms/ObjCARC/nested.ll +++ b/llvm/test/Transforms/ObjCARC/nested.ll @@ -820,6 +820,6 @@ entry: } -; CHECK: attributes #0 = { nounwind argmemonly } +; CHECK: attributes #0 = { argmemonly nounwind } ; CHECK: attributes #1 = { nonlazybind } ; CHECK: attributes [[NUW]] = { nounwind } |
