This is an archive of the discontinued LLVM Phabricator instance.

Differential D81853

[TLI] Add four C++17 delete variants.
ClosedPublic

Authored by hjyamauchi on Jun 15 2020, 10:22 AM.

Details

Reviewers
davidxl
EricWF
Commits
rG6bc2b042f4a9: [TLI] Add four C++17 delete variants.
Summary

delete(void*, unsigned int, align_val_t)
delete(void*, unsigned long, align_val_t)
delete[](void*, unsigned int, align_val_t)
delete[](void*, unsigned long, align_val_t)

Diff Detail

Event Timeline

hjyamauchi created this revision.Jun 15 2020, 10:22 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 15 2020, 10:22 AM
Herald added a subscriber: hiraditya. · View Herald Transcript
hjyamauchi added a child revision: D81854: [InstCombine] Don't let an alignment assume prevent new/delete removals..Jun 15 2020, 10:26 AM
Harbormaster failed remote builds in B60322: Diff 270792!Jun 15 2020, 11:31 AM
EricWF accepted this revision.Jun 15 2020, 11:35 AM

LGTM.

This revision is now accepted and ready to land.Jun 15 2020, 11:35 AM
Closed by commit rG6bc2b042f4a9: [TLI] Add four C++17 delete variants. (authored by hjyamauchi). · Explain WhyJun 16 2020, 11:33 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
include/
llvm/
Analysis/
12 lines
lib/
Analysis/
6 lines
8 lines
test/
Transforms/
InstCombine/
17 lines
unittests/
Analysis/
4 lines

Diff 271149

llvm/include/llvm/Analysis/TargetLibraryInfo.def

Show First 20 Lines • Show All 130 Lines • ▼ Show 20 Lines
TLI_DEFINE_ENUM_INTERNAL(ZdaPvSt11align_val_t) TLI_DEFINE_ENUM_INTERNAL(ZdaPvSt11align_val_t)
TLI_DEFINE_STRING_INTERNAL("_ZdaPvSt11align_val_t") TLI_DEFINE_STRING_INTERNAL("_ZdaPvSt11align_val_t")
/// void operator delete[](void*, align_val_t, nothrow) /// void operator delete[](void*, align_val_t, nothrow)
TLI_DEFINE_ENUM_INTERNAL(ZdaPvSt11align_val_tRKSt9nothrow_t) TLI_DEFINE_ENUM_INTERNAL(ZdaPvSt11align_val_tRKSt9nothrow_t)
TLI_DEFINE_STRING_INTERNAL("_ZdaPvSt11align_val_tRKSt9nothrow_t") TLI_DEFINE_STRING_INTERNAL("_ZdaPvSt11align_val_tRKSt9nothrow_t")
/// void operator delete[](void*, unsigned int); /// void operator delete[](void*, unsigned int);
TLI_DEFINE_ENUM_INTERNAL(ZdaPvj) TLI_DEFINE_ENUM_INTERNAL(ZdaPvj)
TLI_DEFINE_STRING_INTERNAL("_ZdaPvj") TLI_DEFINE_STRING_INTERNAL("_ZdaPvj")
/// void operator delete[](void*, unsigned int, align_val_t);
TLI_DEFINE_ENUM_INTERNAL(ZdaPvjSt11align_val_t)
TLI_DEFINE_STRING_INTERNAL("_ZdaPvjSt11align_val_t")
/// void operator delete[](void*, unsigned long); /// void operator delete[](void*, unsigned long);
TLI_DEFINE_ENUM_INTERNAL(ZdaPvm) TLI_DEFINE_ENUM_INTERNAL(ZdaPvm)
TLI_DEFINE_STRING_INTERNAL("_ZdaPvm") TLI_DEFINE_STRING_INTERNAL("_ZdaPvm")
/// void operator delete[](void*, unsigned long, align_val_t);
TLI_DEFINE_ENUM_INTERNAL(ZdaPvmSt11align_val_t)
TLI_DEFINE_STRING_INTERNAL("_ZdaPvmSt11align_val_t")
/// void operator delete(void*); /// void operator delete(void*);
TLI_DEFINE_ENUM_INTERNAL(ZdlPv) TLI_DEFINE_ENUM_INTERNAL(ZdlPv)
TLI_DEFINE_STRING_INTERNAL("_ZdlPv") TLI_DEFINE_STRING_INTERNAL("_ZdlPv")
/// void operator delete(void*, nothrow); /// void operator delete(void*, nothrow);
TLI_DEFINE_ENUM_INTERNAL(ZdlPvRKSt9nothrow_t) TLI_DEFINE_ENUM_INTERNAL(ZdlPvRKSt9nothrow_t)
TLI_DEFINE_STRING_INTERNAL("_ZdlPvRKSt9nothrow_t") TLI_DEFINE_STRING_INTERNAL("_ZdlPvRKSt9nothrow_t")
/// void operator delete(void*, align_val_t) /// void operator delete(void*, align_val_t)
TLI_DEFINE_ENUM_INTERNAL(ZdlPvSt11align_val_t) TLI_DEFINE_ENUM_INTERNAL(ZdlPvSt11align_val_t)
TLI_DEFINE_STRING_INTERNAL("_ZdlPvSt11align_val_t") TLI_DEFINE_STRING_INTERNAL("_ZdlPvSt11align_val_t")
/// void operator delete(void*, align_val_t, nothrow) /// void operator delete(void*, align_val_t, nothrow)
TLI_DEFINE_ENUM_INTERNAL(ZdlPvSt11align_val_tRKSt9nothrow_t) TLI_DEFINE_ENUM_INTERNAL(ZdlPvSt11align_val_tRKSt9nothrow_t)
TLI_DEFINE_STRING_INTERNAL("_ZdlPvSt11align_val_tRKSt9nothrow_t") TLI_DEFINE_STRING_INTERNAL("_ZdlPvSt11align_val_tRKSt9nothrow_t")
/// void operator delete(void*, unsigned int); /// void operator delete(void*, unsigned int);
TLI_DEFINE_ENUM_INTERNAL(ZdlPvj) TLI_DEFINE_ENUM_INTERNAL(ZdlPvj)
TLI_DEFINE_STRING_INTERNAL("_ZdlPvj") TLI_DEFINE_STRING_INTERNAL("_ZdlPvj")
/// void operator delete(void*, unsigned int, align_val_t)
TLI_DEFINE_ENUM_INTERNAL(ZdlPvjSt11align_val_t)
TLI_DEFINE_STRING_INTERNAL("_ZdlPvjSt11align_val_t")
/// void operator delete(void*, unsigned long); /// void operator delete(void*, unsigned long);
TLI_DEFINE_ENUM_INTERNAL(ZdlPvm) TLI_DEFINE_ENUM_INTERNAL(ZdlPvm)
TLI_DEFINE_STRING_INTERNAL("_ZdlPvm") TLI_DEFINE_STRING_INTERNAL("_ZdlPvm")
/// void operator delete(void*, unsigned long, align_val_t)
TLI_DEFINE_ENUM_INTERNAL(ZdlPvmSt11align_val_t)
TLI_DEFINE_STRING_INTERNAL("_ZdlPvmSt11align_val_t")
/// void *new[](unsigned int); /// void *new[](unsigned int);
TLI_DEFINE_ENUM_INTERNAL(Znaj) TLI_DEFINE_ENUM_INTERNAL(Znaj)
TLI_DEFINE_STRING_INTERNAL("_Znaj") TLI_DEFINE_STRING_INTERNAL("_Znaj")
/// void *new[](unsigned int, nothrow); /// void *new[](unsigned int, nothrow);
TLI_DEFINE_ENUM_INTERNAL(ZnajRKSt9nothrow_t) TLI_DEFINE_ENUM_INTERNAL(ZnajRKSt9nothrow_t)
TLI_DEFINE_STRING_INTERNAL("_ZnajRKSt9nothrow_t") TLI_DEFINE_STRING_INTERNAL("_ZnajRKSt9nothrow_t")
/// void *new[](unsigned int, align_val_t) /// void *new[](unsigned int, align_val_t)
TLI_DEFINE_ENUM_INTERNAL(ZnajSt11align_val_t) TLI_DEFINE_ENUM_INTERNAL(ZnajSt11align_val_t)
▲ Show 20 Lines • Show All 1,268 Lines • Show Last 20 Lines

llvm/lib/Analysis/MemoryBuiltins.cpp

Show First 20 Lines • Show All 450 Lines • ▼ Show 20 Lines else if (TLIFn == LibFunc_ZdlPvj || // delete(void*, uint)
TLIFn == LibFunc_msvc_delete_ptr32_nothrow || // delete(void*, nothrow) TLIFn == LibFunc_msvc_delete_ptr32_nothrow || // delete(void*, nothrow)
TLIFn == LibFunc_msvc_delete_ptr64_nothrow || // delete(void*, nothrow) TLIFn == LibFunc_msvc_delete_ptr64_nothrow || // delete(void*, nothrow)
TLIFn == LibFunc_msvc_delete_array_ptr32_int || // delete[](void*, uint) TLIFn == LibFunc_msvc_delete_array_ptr32_int || // delete[](void*, uint)
TLIFn == LibFunc_msvc_delete_array_ptr64_longlong || // delete[](void*, ulonglong) TLIFn == LibFunc_msvc_delete_array_ptr64_longlong || // delete[](void*, ulonglong)
TLIFn == LibFunc_msvc_delete_array_ptr32_nothrow || // delete[](void*, nothrow) TLIFn == LibFunc_msvc_delete_array_ptr32_nothrow || // delete[](void*, nothrow)
TLIFn == LibFunc_msvc_delete_array_ptr64_nothrow) // delete[](void*, nothrow) TLIFn == LibFunc_msvc_delete_array_ptr64_nothrow) // delete[](void*, nothrow)
ExpectedNumParams = 2; ExpectedNumParams = 2;
else if (TLIFn == LibFunc_ZdaPvSt11align_val_tRKSt9nothrow_t || // delete(void*, align_val_t, nothrow) else if (TLIFn == LibFunc_ZdaPvSt11align_val_tRKSt9nothrow_t || // delete(void*, align_val_t, nothrow)
TLIFn == LibFunc_ZdlPvSt11align_val_tRKSt9nothrow_t) // delete[](void*, align_val_t, nothrow) TLIFn == LibFunc_ZdlPvSt11align_val_tRKSt9nothrow_t || // delete[](void*, align_val_t, nothrow)
TLIFn == LibFunc_ZdlPvjSt11align_val_t || // delete(void*, unsigned long, align_val_t)
TLIFn == LibFunc_ZdlPvmSt11align_val_t || // delete(void*, unsigned long, align_val_t)
TLIFn == LibFunc_ZdaPvjSt11align_val_t || // delete[](void*, unsigned int, align_val_t)
TLIFn == LibFunc_ZdaPvmSt11align_val_t) // delete[](void*, unsigned long, align_val_t)
ExpectedNumParams = 3; ExpectedNumParams = 3;
else else
return false; return false;
// Check free prototype. // Check free prototype.
// FIXME: workaround for PR5130, this will be obsolete when a nobuiltin // FIXME: workaround for PR5130, this will be obsolete when a nobuiltin
// attribute will exist. // attribute will exist.
FunctionType *FTy = F->getFunctionType(); FunctionType *FTy = F->getFunctionType();
▲ Show 20 Lines • Show All 605 Lines • Show Last 20 Lines

llvm/lib/Analysis/TargetLibraryInfo.cpp

Show First 20 Lines • Show All 1,212 Lines • ▼ Show 20 Linesbool TargetLibraryInfoImpl::isValidProtoForLibFunc(const FunctionType &FTy,
// void operator delete(void*, nothrow); // void operator delete(void*, nothrow);
case LibFunc_msvc_delete_ptr64_nothrow: case LibFunc_msvc_delete_ptr64_nothrow:
return (NumParams == 2 && FTy.getParamType(0)->isPointerTy()); return (NumParams == 2 && FTy.getParamType(0)->isPointerTy());
// void operator delete(void*, align_val_t, nothrow) // void operator delete(void*, align_val_t, nothrow)
case LibFunc_ZdlPvSt11align_val_tRKSt9nothrow_t: case LibFunc_ZdlPvSt11align_val_tRKSt9nothrow_t:
// void operator delete[](void*, align_val_t, nothrow) // void operator delete[](void*, align_val_t, nothrow)
case LibFunc_ZdaPvSt11align_val_tRKSt9nothrow_t: case LibFunc_ZdaPvSt11align_val_tRKSt9nothrow_t:
// void operator delete(void*, unsigned int, align_val_t)
case LibFunc_ZdlPvjSt11align_val_t:
// void operator delete(void*, unsigned long, align_val_t)
case LibFunc_ZdlPvmSt11align_val_t:
// void operator delete[](void*, unsigned int, align_val_t);
case LibFunc_ZdaPvjSt11align_val_t:
// void operator delete[](void*, unsigned long, align_val_t);
case LibFunc_ZdaPvmSt11align_val_t:
return (NumParams == 3 && FTy.getParamType(0)->isPointerTy()); return (NumParams == 3 && FTy.getParamType(0)->isPointerTy());
case LibFunc_memset_pattern16: case LibFunc_memset_pattern16:
return (!FTy.isVarArg() && NumParams == 3 && return (!FTy.isVarArg() && NumParams == 3 &&
FTy.getParamType(0)->isPointerTy() && FTy.getParamType(0)->isPointerTy() &&
FTy.getParamType(1)->isPointerTy() && FTy.getParamType(1)->isPointerTy() &&
FTy.getParamType(2)->isIntegerTy()); FTy.getParamType(2)->isIntegerTy());
▲ Show 20 Lines • Show All 430 Lines • Show Last 20 Lines

llvm/test/Transforms/InstCombine/malloc-free-delete.ll

Show First 20 Lines • Show All 261 Lines • ▼ Show 20 Lines
; delete(void*, align_val_t) ; delete(void*, align_val_t)
declare void @_ZdlPvSt11align_val_t(i8*, i64) nobuiltin declare void @_ZdlPvSt11align_val_t(i8*, i64) nobuiltin
; delete[](void*, align_val_t) ; delete[](void*, align_val_t)
declare void @_ZdaPvSt11align_val_t(i8*, i64) nobuiltin declare void @_ZdaPvSt11align_val_t(i8*, i64) nobuiltin
; delete(void*, align_val_t, nothrow) ; delete(void*, align_val_t, nothrow)
declare void @_ZdlPvSt11align_val_tRKSt9nothrow_t(i8*, i64, i8*) nobuiltin declare void @_ZdlPvSt11align_val_tRKSt9nothrow_t(i8*, i64, i8*) nobuiltin
; delete[](void*, align_val_t, nothrow) ; delete[](void*, align_val_t, nothrow)
declare void @_ZdaPvSt11align_val_tRKSt9nothrow_t(i8*, i64, i8*) nobuiltin declare void @_ZdaPvSt11align_val_tRKSt9nothrow_t(i8*, i64, i8*) nobuiltin
; delete(void*, unsigned int, align_val_t)
declare void @_ZdlPvjSt11align_val_t(i8*, i32, i32) nobuiltin
; delete(void*, unsigned long, align_val_t)
declare void @_ZdlPvmSt11align_val_t(i8*, i64, i64) nobuiltin
; delete[](void*, unsigned int, align_val_t)
declare void @_ZdaPvjSt11align_val_t(i8*, i32, i32) nobuiltin
; delete[](void*, unsigned long, align_val_t)
declare void @_ZdaPvmSt11align_val_t(i8*, i64, i64) nobuiltin
define void @test8() { define void @test8() {
; CHECK-LABEL: @test8( ; CHECK-LABEL: @test8(
; CHECK-NEXT: ret void ; CHECK-NEXT: ret void
; ;
%nt = alloca i8 %nt = alloca i8
%nw = call i8* @_Znwm(i64 32) builtin %nw = call i8* @_Znwm(i64 32) builtin
call void @_ZdlPv(i8* %nw) builtin call void @_ZdlPv(i8* %nw) builtin
Show All 18 Lines;
%nwat = call i8* @_ZnwmSt11align_val_tRKSt9nothrow_t(i64 32, i64 8, i8* %nt) builtin %nwat = call i8* @_ZnwmSt11align_val_tRKSt9nothrow_t(i64 32, i64 8, i8* %nt) builtin
call void @_ZdlPvSt11align_val_tRKSt9nothrow_t(i8* %nwat, i64 8, i8* %nt) builtin call void @_ZdlPvSt11align_val_tRKSt9nothrow_t(i8* %nwat, i64 8, i8* %nt) builtin
%naat = call i8* @_ZnamSt11align_val_tRKSt9nothrow_t(i64 32, i64 8, i8* %nt) builtin %naat = call i8* @_ZnamSt11align_val_tRKSt9nothrow_t(i64 32, i64 8, i8* %nt) builtin
call void @_ZdaPvSt11align_val_tRKSt9nothrow_t(i8* %naat, i64 8, i8* %nt) builtin call void @_ZdaPvSt11align_val_tRKSt9nothrow_t(i8* %naat, i64 8, i8* %nt) builtin
%nwjat = call i8* @_ZnwjSt11align_val_tRKSt9nothrow_t(i32 32, i32 8, i8* %nt) builtin %nwjat = call i8* @_ZnwjSt11align_val_tRKSt9nothrow_t(i32 32, i32 8, i8* %nt) builtin
call void @_ZdlPvSt11align_val_tRKSt9nothrow_t(i8* %nwjat, i64 8, i8* %nt) builtin call void @_ZdlPvSt11align_val_tRKSt9nothrow_t(i8* %nwjat, i64 8, i8* %nt) builtin
%najat = call i8* @_ZnajSt11align_val_tRKSt9nothrow_t(i32 32, i32 8, i8* %nt) builtin %najat = call i8* @_ZnajSt11align_val_tRKSt9nothrow_t(i32 32, i32 8, i8* %nt) builtin
call void @_ZdaPvSt11align_val_tRKSt9nothrow_t(i8* %najat, i64 8, i8* %nt) builtin call void @_ZdaPvSt11align_val_tRKSt9nothrow_t(i8* %najat, i64 8, i8* %nt) builtin
%nwa2 = call i8* @_ZnwmSt11align_val_t(i64 32, i64 8) builtin
call void @_ZdlPvmSt11align_val_t(i8* %nwa2, i64 32, i64 8) builtin
%nwja2 = call i8* @_ZnwjSt11align_val_t(i32 32, i32 8) builtin
call void @_ZdlPvjSt11align_val_t(i8* %nwa2, i32 32, i32 8) builtin
%naa2 = call i8* @_ZnamSt11align_val_t(i64 32, i64 8) builtin
call void @_ZdaPvmSt11align_val_t(i8* %naa2, i64 32, i64 8) builtin
%naja2 = call i8* @_ZnajSt11align_val_t(i32 32, i32 8) builtin
call void @_ZdaPvjSt11align_val_t(i8* %naja2, i32 32, i32 8) builtin
ret void ret void
} }
declare noalias i8* @"\01??2@YAPEAX_K@Z"(i64) nobuiltin declare noalias i8* @"\01??2@YAPEAX_K@Z"(i64) nobuiltin
declare void @"\01??3@YAXPEAX@Z"(i8*) nobuiltin declare void @"\01??3@YAXPEAX@Z"(i8*) nobuiltin
define void @test9() { define void @test9() {
; CHECK-LABEL: @test9( ; CHECK-LABEL: @test9(
▲ Show 20 Lines • Show All 57 Lines • Show Last 20 Lines

llvm/unittests/Analysis/TargetLibraryInfoTest.cpp

Show First 20 Lines • Show All 409 Lines • ▼ Show 20 Lines parseAssembly(
"declare i32 @fseeko64(%struct*, i64, i32)\n" "declare i32 @fseeko64(%struct*, i64, i32)\n"
"declare i64 @ftello64(%struct*)\n" "declare i64 @ftello64(%struct*)\n"
"declare void @_ZdaPv(i8*)\n" "declare void @_ZdaPv(i8*)\n"
"declare void @_ZdaPvRKSt9nothrow_t(i8*, %struct*)\n" "declare void @_ZdaPvRKSt9nothrow_t(i8*, %struct*)\n"
"declare void @_ZdaPvSt11align_val_t(i8*, i64)\n" "declare void @_ZdaPvSt11align_val_t(i8*, i64)\n"
"declare void @_ZdaPvSt11align_val_tRKSt9nothrow_t(i8*, i64, %struct*)\n" "declare void @_ZdaPvSt11align_val_tRKSt9nothrow_t(i8*, i64, %struct*)\n"
"declare void @_ZdaPvj(i8*, i32)\n" "declare void @_ZdaPvj(i8*, i32)\n"
"declare void @_ZdaPvjSt11align_val_t(i8*, i32, i32)\n"
"declare void @_ZdaPvm(i8*, i64)\n" "declare void @_ZdaPvm(i8*, i64)\n"
"declare void @_ZdaPvmSt11align_val_t(i8*, i64, i64)\n"
"declare void @_ZdlPv(i8*)\n" "declare void @_ZdlPv(i8*)\n"
"declare void @_ZdlPvRKSt9nothrow_t(i8*, %struct*)\n" "declare void @_ZdlPvRKSt9nothrow_t(i8*, %struct*)\n"
"declare void @_ZdlPvSt11align_val_t(i8*, i64)\n" "declare void @_ZdlPvSt11align_val_t(i8*, i64)\n"
"declare void @_ZdlPvSt11align_val_tRKSt9nothrow_t(i8*, i64, %struct*)\n" "declare void @_ZdlPvSt11align_val_tRKSt9nothrow_t(i8*, i64, %struct*)\n"
"declare void @_ZdlPvj(i8*, i32)\n" "declare void @_ZdlPvj(i8*, i32)\n"
"declare void @_ZdlPvjSt11align_val_t(i8*, i32, i32)\n"
"declare void @_ZdlPvm(i8*, i64)\n" "declare void @_ZdlPvm(i8*, i64)\n"
"declare void @_ZdlPvmSt11align_val_t(i8*, i64, i64)\n"
"declare i8* @_Znaj(i32)\n" "declare i8* @_Znaj(i32)\n"
"declare i8* @_ZnajRKSt9nothrow_t(i32, %struct*)\n" "declare i8* @_ZnajRKSt9nothrow_t(i32, %struct*)\n"
"declare i8* @_ZnajSt11align_val_t(i32, i32)\n" "declare i8* @_ZnajSt11align_val_t(i32, i32)\n"
"declare i8* @_ZnajSt11align_val_tRKSt9nothrow_t(i32, i32, %struct*)\n" "declare i8* @_ZnajSt11align_val_tRKSt9nothrow_t(i32, i32, %struct*)\n"
"declare i8* @_Znam(i64)\n" "declare i8* @_Znam(i64)\n"
"declare i8* @_ZnamRKSt9nothrow_t(i64, %struct*)\n" "declare i8* @_ZnamRKSt9nothrow_t(i64, %struct*)\n"
"declare i8* @_ZnamSt11align_val_t(i64, i64)\n" "declare i8* @_ZnamSt11align_val_t(i64, i64)\n"
"declare i8* @_ZnamSt11align_val_tRKSt9nothrow_t(i64, i64, %struct*)\n" "declare i8* @_ZnamSt11align_val_tRKSt9nothrow_t(i64, i64, %struct*)\n"
▲ Show 20 Lines • Show All 152 Lines • Show Last 20 Lines