This is an archive of the discontinued LLVM Phabricator instance.

Differential D122005

[instcombine] Support and test __builtin_object_size interaction with __strdup and __strndup
ClosedPublic

Authored by serge-sans-paille on Mar 18 2022, 6:59 AM.

Details

Reviewers
nikic
durin42
george.burgess.iv
dexonsmith
petarj
Commits
rG39b02d49cc5e: [instcombine] Support and test __builtin_object_size interaction with __strdup…
Summary

Nothing fancy there: register function aliases and add an extra test case

Diff Detail

Event Timeline

serge-sans-paille created this revision.Mar 18 2022, 6:59 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 18 2022, 6:59 AM
Herald added a subscriber: hiraditya. · View Herald Transcript
serge-sans-paille requested review of this revision.Mar 18 2022, 6:59 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 18 2022, 6:59 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B155040: Diff 416489.Mar 18 2022, 7:36 AM
nikic accepted this revision.Mar 20 2022, 6:34 AM

LGTM

llvm/test/Transforms/InstCombine/builtin-object-size-strdup-family.ll
2

Please use update_test_checks.py to generate test checks in InstCombine.

This revision is now accepted and ready to land.Mar 20 2022, 6:34 AM
This revision was landed with ongoing or failed builds.Mar 21 2022, 3:31 AM
Closed by commit rG39b02d49cc5e: [instcombine] Support and test __builtin_object_size interaction with __strdup… (authored by serge-sans-paille). · Explain Why
This revision was automatically updated to reflect the committed changes.
serge-sans-paille added a commit: rG39b02d49cc5e: [instcombine] Support and test __builtin_object_size interaction with __strdup….

Revision Contents

PathSize
llvm/
lib/
Analysis/
2 lines
test/
Transforms/
InstCombine/
51 lines

Diff 416881

llvm/lib/Analysis/MemoryBuiltins.cpp

Show First 20 Lines • Show All 143 Lines • ▼ Show 20 Linesstatic const std::pair<LibFunc, AllocFnsTy> AllocationFnData[] = {
{LibFunc_aligned_alloc, {AlignedAllocLike, 2, 1, -1, 0, MallocFamily::Malloc}}, {LibFunc_aligned_alloc, {AlignedAllocLike, 2, 1, -1, 0, MallocFamily::Malloc}},
{LibFunc_memalign, {AlignedAllocLike, 2, 1, -1, 0, MallocFamily::Malloc}}, {LibFunc_memalign, {AlignedAllocLike, 2, 1, -1, 0, MallocFamily::Malloc}},
{LibFunc_calloc, {CallocLike, 2, 0, 1, -1, MallocFamily::Malloc}}, {LibFunc_calloc, {CallocLike, 2, 0, 1, -1, MallocFamily::Malloc}},
{LibFunc_vec_calloc, {CallocLike, 2, 0, 1, -1, MallocFamily::VecMalloc}}, {LibFunc_vec_calloc, {CallocLike, 2, 0, 1, -1, MallocFamily::VecMalloc}},
{LibFunc_realloc, {ReallocLike, 2, 1, -1, -1, MallocFamily::Malloc}}, {LibFunc_realloc, {ReallocLike, 2, 1, -1, -1, MallocFamily::Malloc}},
{LibFunc_vec_realloc, {ReallocLike, 2, 1, -1, -1, MallocFamily::VecMalloc}}, {LibFunc_vec_realloc, {ReallocLike, 2, 1, -1, -1, MallocFamily::VecMalloc}},
{LibFunc_reallocf, {ReallocLike, 2, 1, -1, -1, MallocFamily::Malloc}}, {LibFunc_reallocf, {ReallocLike, 2, 1, -1, -1, MallocFamily::Malloc}},
{LibFunc_strdup, {StrDupLike, 1, -1, -1, -1, MallocFamily::Malloc}}, {LibFunc_strdup, {StrDupLike, 1, -1, -1, -1, MallocFamily::Malloc}},
{LibFunc_dunder_strdup, {StrDupLike, 1, -1, -1, -1, MallocFamily::Malloc}},
{LibFunc_strndup, {StrDupLike, 2, 1, -1, -1, MallocFamily::Malloc}}, {LibFunc_strndup, {StrDupLike, 2, 1, -1, -1, MallocFamily::Malloc}},
{LibFunc_dunder_strndup, {StrDupLike, 2, 1, -1, -1, MallocFamily::Malloc}},
{LibFunc___kmpc_alloc_shared, {MallocLike, 1, 0, -1, -1, MallocFamily::KmpcAllocShared}}, {LibFunc___kmpc_alloc_shared, {MallocLike, 1, 0, -1, -1, MallocFamily::KmpcAllocShared}},
// TODO: Handle "int posix_memalign(void **, size_t, size_t)" // TODO: Handle "int posix_memalign(void **, size_t, size_t)"
}; };
// clang-format on // clang-format on
static const Function *getCalledFunction(const Value *V, static const Function *getCalledFunction(const Value *V,
bool &IsNoBuiltin) { bool &IsNoBuiltin) {
// Don't care about intrinsics in this case. // Don't care about intrinsics in this case.
▲ Show 20 Lines • Show All 924 Lines • Show Last 20 Lines

llvm/test/Transforms/InstCombine/builtin-object-size-strdup-family.ll

  • This file was added.
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
; RUN: opt -instcombine -S < %s | FileCheck %s
nikicUnsubmitted
Not Done
ReplyInline Actions

Please use update_test_checks.py to generate test checks in InstCombine.

nikic: Please use update_test_checks.py to generate test checks in InstCombine.
target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
declare dso_local noalias noundef i8* @malloc(i64 noundef) local_unnamed_addr
declare i64 @llvm.objectsize.i64.p0i8(i8*, i1 immarg, i1 immarg, i1 immarg)
declare noalias i8* @strdup(i8*);
declare noalias i8* @__strdup(i8*);
declare noalias i8* @strndup(i8*, i64);
declare noalias i8* @__strndup(i8*, i64);
@str = dso_local constant [11 x i8] c"toulbroc'h\00"
define dso_local i64 @check_strdup(i32 noundef %n) local_unnamed_addr {
; CHECK-LABEL: @check_strdup(
; CHECK-NEXT: ret i64 11
;
%ptr = call noalias i8* @strdup(i8* noundef getelementptr inbounds ([11 x i8], [11 x i8]* @str, i64 0, i64 0))
%size = call i64 @llvm.objectsize.i64.p0i8(i8* %ptr, i1 false, i1 true, i1 false)
ret i64 %size
}
define dso_local i64 @check_dunder_strdup(i32 noundef %n) local_unnamed_addr {
; CHECK-LABEL: @check_dunder_strdup(
; CHECK-NEXT: ret i64 11
;
%ptr = call noalias i8* @__strdup(i8* noundef getelementptr inbounds ([11 x i8], [11 x i8]* @str, i64 0, i64 0))
%size = call i64 @llvm.objectsize.i64.p0i8(i8* %ptr, i1 false, i1 true, i1 false)
ret i64 %size
}
define dso_local i64 @check_strndup(i32 noundef %n) local_unnamed_addr {
; CHECK-LABEL: @check_strndup(
; CHECK-NEXT: ret i64 5
;
%ptr = call noalias i8* @strndup(i8* noundef getelementptr inbounds ([11 x i8], [11 x i8]* @str, i64 0, i64 0), i64 4)
%size = call i64 @llvm.objectsize.i64.p0i8(i8* %ptr, i1 false, i1 true, i1 false)
ret i64 %size
}
define dso_local i64 @check_dunder_strndup(i32 noundef %n) local_unnamed_addr {
; CHECK-LABEL: @check_dunder_strndup(
; CHECK-NEXT: ret i64 5
;
%ptr = call noalias i8* @__strndup(i8* noundef getelementptr inbounds ([11 x i8], [11 x i8]* @str, i64 0, i64 0), i64 4)
%size = call i64 @llvm.objectsize.i64.p0i8(i8* %ptr, i1 false, i1 true, i1 false)
ret i64 %size
}