summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Bolvansky <david.bolvansky@gmail.com>2019-08-13 16:44:16 +0000
committerDavid Bolvansky <david.bolvansky@gmail.com>2019-08-13 16:44:16 +0000
commit90a30fdcc39ebbee04b3d426ea0496179eddc494 (patch)
treefd583809af50ffa40625aec34200af64daf5cffb
parent28215caa60a40dcbee5666c319f251afce86fa72 (diff)
downloadbcm5719-llvm-90a30fdcc39ebbee04b3d426ea0496179eddc494.tar.gz
bcm5719-llvm-90a30fdcc39ebbee04b3d426ea0496179eddc494.zip
[SLC] Improve dereferenceable bytes annotation
llvm-svn: 368715
-rw-r--r--llvm/lib/Transforms/Utils/SimplifyLibCalls.cpp6
-rw-r--r--llvm/test/Transforms/InstCombine/mem-deref-bytes.ll2
2 files changed, 6 insertions, 2 deletions
diff --git a/llvm/lib/Transforms/Utils/SimplifyLibCalls.cpp b/llvm/lib/Transforms/Utils/SimplifyLibCalls.cpp
index 396690e1860..ef4cc227222 100644
--- a/llvm/lib/Transforms/Utils/SimplifyLibCalls.cpp
+++ b/llvm/lib/Transforms/Utils/SimplifyLibCalls.cpp
@@ -188,8 +188,12 @@ static bool canTransformToMemCmp(CallInst *CI, Value *Str, uint64_t Len,
static void annotateDereferenceableBytes(CallInst *CI,
ArrayRef<unsigned> ArgNos,
- uint64_t DerefBytes) {
+ uint64_t DereferenceableBytes) {
for (unsigned ArgNo : ArgNos) {
+ uint64_t DerefBytes = std::max(
+ CI->getDereferenceableOrNullBytes(ArgNo + AttributeList::FirstArgIndex),
+ DereferenceableBytes);
+
if (CI->getDereferenceableBytes(ArgNo + AttributeList::FirstArgIndex) <
DerefBytes) {
CI->removeParamAttr(ArgNo, Attribute::Dereferenceable);
diff --git a/llvm/test/Transforms/InstCombine/mem-deref-bytes.ll b/llvm/test/Transforms/InstCombine/mem-deref-bytes.ll
index a329f9dcdaa..87be8f57795 100644
--- a/llvm/test/Transforms/InstCombine/mem-deref-bytes.ll
+++ b/llvm/test/Transforms/InstCombine/mem-deref-bytes.ll
@@ -48,7 +48,7 @@ define i32 @memcmp_const_size_no_update_deref(i8* nocapture readonly %d, i8* noc
define i32 @memcmp_const_size_no_update_deref2(i8* nocapture readonly %d, i8* nocapture readonly %s) {
; CHECK-LABEL: @memcmp_const_size_no_update_deref2(
-; CHECK-NEXT: [[CALL:%.*]] = tail call i32 @memcmp(i8* dereferenceable(16) [[D:%.*]], i8* dereferenceable(16) [[S:%.*]], i64 16)
+; CHECK-NEXT: [[CALL:%.*]] = tail call i32 @memcmp(i8* dereferenceable(40) [[D:%.*]], i8* dereferenceable(16) [[S:%.*]], i64 16)
; CHECK-NEXT: ret i32 [[CALL]]
;
%call = tail call i32 @memcmp(i8* dereferenceable_or_null(40) %d, i8* %s, i64 16)
OpenPOWER on IntegriCloud