[llvm-branch-commits] [clang] [llvm] CGExprCXX: emit family and allockind attributes (PR #239732)
Augie Fackler via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Mon Nov 16 14:32:06 PST 2026
https://github.com/durin42 updated https://github.com/llvm/llvm-project/pull/239732
>From aa4d5c2bafce3347d365862760fc95b6fcd5af0b Mon Sep 17 00:00:00 2001
From: Augie Fackler <augie at google.com>
Date: Wed, 4 Nov 2026 13:04:41 -0500
Subject: [PATCH] CGExprCXX: emit family and allockind attributes
This allows us to remove the special knowledge about C++ allocation from
LLVM's MemoryBuiltins.cpp, instead trusting attributes to communicate
the important properties.
Annoyingly, clang has to grow a little bit of hard-coded knowledge about
mangled symbol names in order to actually get the most-basic-matching
::operator::new when working out the alloc-family attribute. I spent
some time trying to do this "right" by looking up the available
operators new and finding the best one, but that's super tricky and this
has the virtue of working and being pretty obviously correct when
compared to the old code.
Happily, clang now emits allocator family attributes for custom
allocators like the `__hot_cold_t` overloads in `new_hot_cold.cpp`
(which `isReplaceableGlobalAllocationFunction` in clang recognizes),
allowing us to remove that special knowledge from LLVM.
This patch is originally from 2023 and was rebased and revised with
assistance from an LLM. I have manually reviewed the diffs to the
limit of my abilities (I don't do much in LLVM, and this is my first
time touching clang in a meaningful way) and they appear sensible. The
commit messages are entirely written by me.
Differential Revision: https://reviews.llvm.org/D152401
---
clang/lib/CodeGen/CGExprCXX.cpp | 54 +++++++-
.../test/CIR/CodeGen/operator-new-noalias.cpp | 4 +-
clang/test/CodeGen/no-builtin.cpp | 2 +-
.../CodeGenCXX/cxx1z-aligned-allocation.cpp | 2 +-
clang/test/CodeGenCXX/new.cpp | 11 +-
clang/test/CodeGenCXX/new_hot_cold.cpp | 26 ++--
clang/test/CodeGenCXX/operator-new.cpp | 4 +-
clang/test/Headers/openmp_new_nothrow.cpp | 32 ++---
llvm/lib/Analysis/MemoryBuiltins.cpp | 122 +-----------------
.../load-size-cache.ll | 2 +-
llvm/test/ThinLTO/X86/memprof-fixup.ll | 2 +-
.../CodeGenPrepare/dead-allocation.ll | 2 +-
.../Transforms/GVN/malloc-load-removal.ll | 2 +-
.../GVN/no_speculative_loads_with_asan.ll | 2 +-
.../InstCombine/debuginfo-invoke.ll | 2 +-
.../Transforms/InstCombine/deref-alloc-fns.ll | 6 +-
llvm/test/Transforms/InstCombine/invoke.ll | 2 +-
.../InstCombine/malloc-free-addrspace.ll | 8 +-
.../InstCombine/new-delete-itanium-32.ll | 28 ++--
.../InstCombine/new-delete-itanium.ll | 102 +++++++--------
.../Transforms/InstCombine/new-delete-msvc.ll | 8 +-
.../test/Transforms/InstCombine/objsize-64.ll | 2 +-
.../Transforms/NewGVN/malloc-load-removal.ll | 2 +-
23 files changed, 177 insertions(+), 250 deletions(-)
diff --git a/clang/lib/CodeGen/CGExprCXX.cpp b/clang/lib/CodeGen/CGExprCXX.cpp
index 761c689c224186..6cc710fce4feb6 100644
--- a/clang/lib/CodeGen/CGExprCXX.cpp
+++ b/clang/lib/CodeGen/CGExprCXX.cpp
@@ -17,7 +17,9 @@
#include "CodeGenFunction.h"
#include "ConstantEmitter.h"
#include "TargetInfo.h"
+#include "clang/AST/Mangle.h"
#include "clang/Basic/CodeGenOptions.h"
+#include "clang/Basic/OperatorKinds.h"
#include "clang/CodeGen/CGFunctionInfo.h"
#include "llvm/IR/Intrinsics.h"
@@ -1393,12 +1395,58 @@ static RValue EmitNewDeleteCall(CodeGenFunction &CGF,
///
/// We model such elidable calls with the 'builtin' attribute.
llvm::Function *Fn = dyn_cast<llvm::Function>(CalleePtr);
- if (CalleeDecl->isReplaceableGlobalAllocationFunction() && Fn) {
- if (Fn->hasFnAttribute(llvm::Attribute::NoBuiltin))
+ UnsignedOrNone AlignArg = std::nullopt;
+ if (CalleeDecl->isReplaceableGlobalAllocationFunction(&AlignArg)) {
+ auto &Ctx = CallOrInvoke->getContext();
+ llvm::AllocFnKind AK = llvm::AllocFnKind::Unknown;
+ bool IsDeleter = CalleeDecl->getOverloadedOperator() == OO_Array_Delete ||
+ CalleeDecl->getOverloadedOperator() == OO_Delete;
+ if (IsDeleter) {
+ AK = AK | llvm::AllocFnKind::Free;
+ } else {
+ if (AlignArg)
+ AK = llvm::AllocFnKind::Aligned;
+ AK = AK | llvm::AllocFnKind::Alloc | llvm::AllocFnKind::Uninitialized;
+ }
+ ASTContext &ASTCtx = CalleeDecl->getASTContext();
+ ASTNameGenerator gen = ASTNameGenerator(ASTCtx);
+ std::string Mangled = gen.getName(CalleeDecl);
+
+ if (Mangled.find("??") == 0) {
+ // MSVC mangling
+ if (CalleeDecl->getOverloadedOperator() == clang::OO_Array_Delete ||
+ CalleeDecl->getOverloadedOperator() == clang::OO_Array_New) {
+ Mangled = "??_U at YAPAXI@Z";
+ } else {
+ Mangled = "??2 at YAPAXI@Z";
+ }
+ } else if (Mangled.find("_Z") == 0 || Mangled.find("_Z") == 1) {
+ // LLVM Mangling
+ if (CalleeDecl->getOverloadedOperator() == clang::OO_Array_Delete ||
+ CalleeDecl->getOverloadedOperator() == clang::OO_Array_New) {
+ if (AlignArg)
+ Mangled = "_ZnamSt11align_val_t";
+ else
+ Mangled = "_Znam";
+ } else if (AlignArg)
+ Mangled = "_ZnwmSt11align_val_t";
+ else
+ Mangled = "_Znwm";
+ } else {
+ std::string msg =
+ "unknown mangling when resolving mangled form of operator::new: " +
+ Mangled;
+ llvm_unreachable(msg.c_str());
+ }
+
+ CallOrInvoke->addFnAttr(llvm::Attribute::get(Ctx, "alloc-family", Mangled));
+ if (Fn && Fn->hasFnAttribute(llvm::Attribute::NoBuiltin))
CallOrInvoke->addFnAttr(llvm::Attribute::Builtin);
+ CallOrInvoke->addFnAttr(llvm::Attribute::get(
+ Ctx, llvm::Attribute::AllocKind, static_cast<uint64_t>(AK)));
// A sane operator new does not read or write accessible memory.
- if (CGF.CGM.getCodeGenOpts().AssumeSaneOperatorNew &&
+ if (Fn && CGF.CGM.getCodeGenOpts().AssumeSaneOperatorNew &&
CalleeDecl->getDeclName().isAnyOperatorNew()) {
// FIXME: inaccessiblemem could cause issues if LTO makes the
// previously inaccessible memory accessible after linking.
diff --git a/clang/test/CIR/CodeGen/operator-new-noalias.cpp b/clang/test/CIR/CodeGen/operator-new-noalias.cpp
index a3652dea732f8e..469bcee63087a1 100644
--- a/clang/test/CIR/CodeGen/operator-new-noalias.cpp
+++ b/clang/test/CIR/CodeGen/operator-new-noalias.cpp
@@ -16,9 +16,9 @@ void *test_new() { return new int; }
// LLVM: call noalias noundef nonnull ptr @_Znwm(i64 noundef 4) [[ATTR:#[0-9]+]]
// OGCG: call noalias noundef nonnull ptr @_Znwm(i64 noundef 4) [[ATTR:#[0-9]+]]
// LLVM: attributes [[ATTR]] = { builtin allocsize(0) memory(inaccessiblemem: readwrite, errnomem: write) }
-// OGCG: attributes [[ATTR]] = { builtin allocsize(0) memory(inaccessiblemem: readwrite, errnomem: write) }
+// OGCG: attributes [[ATTR]] = { builtin allockind("alloc,uninitialized") allocsize(0) memory(inaccessiblemem: readwrite, errnomem: write) "alloc-family"="_Znwm" }
// NOSANE: call noundef nonnull ptr @_Znwm(i64 noundef 4) [[NOSANE_ATTR:#[0-9]+]]
// NOSANE-NOT: call noalias
-// NOSANE: attributes [[NOSANE_ATTR]] = { builtin allocsize(0) }
+// NOSANE: attributes [[NOSANE_ATTR]] = { builtin {{(allockind\("alloc,uninitialized"\) )?}}allocsize(0){{( "alloc-family"="_Znwm")?}} }
// NOSANE-NOT: inaccessiblemem
diff --git a/clang/test/CodeGen/no-builtin.cpp b/clang/test/CodeGen/no-builtin.cpp
index 54354bddc8b609..0d0fe243b03517 100644
--- a/clang/test/CodeGen/no-builtin.cpp
+++ b/clang/test/CodeGen/no-builtin.cpp
@@ -61,4 +61,4 @@ B::~B() {} // Anchoring B so B::foo() gets generated
// CHECK: attributes #6 = {{{.*}}"no-builtin-memcpy"{{.*}}}
// CHECK-NOT: attributes #5 = {{{.*}}"no-builtin-memcpy"{{.*}}}
// CHECK-NOT: attributes #5 = {{{.*}}"no-builtin-memset"{{.*}}}
-// CHECK: attributes #8 = { builtin nounwind }
+// CHECK: attributes #8 = { builtin nounwind allockind("free") "alloc-family"="_Znwm" }
diff --git a/clang/test/CodeGenCXX/cxx1z-aligned-allocation.cpp b/clang/test/CodeGenCXX/cxx1z-aligned-allocation.cpp
index 7ae03a6ad2c5a2..a005da920f03d7 100644
--- a/clang/test/CodeGenCXX/cxx1z-aligned-allocation.cpp
+++ b/clang/test/CodeGenCXX/cxx1z-aligned-allocation.cpp
@@ -58,7 +58,7 @@ void *a1(long n) { return new A[n]; }
void a2(A *p) { delete p; }
// CHECK-LABEL: define {{.*}} @_Z2a3P1A(
-// CHECK: call void @_ZdaPvSt11align_val_t(ptr allocptr noundef %{{.*}}, i64 noundef 32) #9
+// CHECK: call void @_ZdaPvSt11align_val_t(ptr allocptr noundef %{{.*}}, i64 noundef 32) #11
void a3(A *p) { delete[] p; }
diff --git a/clang/test/CodeGenCXX/new.cpp b/clang/test/CodeGenCXX/new.cpp
index 172ecbf13b373f..ac6748bc96924c 100644
--- a/clang/test/CodeGenCXX/new.cpp
+++ b/clang/test/CodeGenCXX/new.cpp
@@ -320,9 +320,9 @@ namespace N3664 {
// CHECK: call void @_ZdlPvm({{.*}}) [[ATTR_BUILTIN_DELETE:#[^ ]*]]
delete p;
- // CHECK: call noalias noundef nonnull ptr @_Znam(i64 noundef 12) [[ATTR_BUILTIN_NEW]]
+ // CHECK: call noalias noundef nonnull ptr @_Znam(i64 noundef 12) [[ATTR_BUILTIN_ARRAY_NEW:#[^ ]*]]
int *q = new int[3];
- // CHECK: call void @_ZdaPv({{.*}}) [[ATTR_BUILTIN_DELETE]]
+ // CHECK: call void @_ZdaPv({{.*}}) [[ATTR_BUILTIN_ARRAY_DELETE:#[^ ]*]]
delete[] p; // expected-warning {{'delete[]' applied to a pointer that was allocated with 'new'; did you mean 'delete'?}}
// CHECK: call noalias noundef ptr @_ZnamRKSt9nothrow_t(i64 noundef 3, {{.*}}) [[ATTR_NOBUILTIN_NOUNWIND_ALLOCSIZE:#[^ ]*]]
@@ -366,8 +366,11 @@ namespace builtins {
// CHECK-DAG: attributes [[ATTR_NOBUILTIN_NOUNWIND]] = {{[{].*}} nobuiltin nounwind {{.*[}]}}
// CHECK-DAG: attributes [[ATTR_NOBUILTIN_NOUNWIND_ALLOCSIZE]] = {{[{].*}} nobuiltin nounwind allocsize(0) {{.*[}]}}
-// CHECK-DAG: attributes [[ATTR_BUILTIN_NEW]] = {{[{].*}} builtin {{.*[}]}}
-// CHECK-DAG: attributes [[ATTR_BUILTIN_DELETE]] = {{[{].*}} builtin {{.*[}]}}
+// CHECK-DAG: attributes [[ATTR_BUILTIN_NEW]] = { builtin allockind("alloc,uninitialized") allocsize(0) memory(inaccessiblemem: readwrite, errnomem: write) "alloc-family"="_Znwm" }
+// CHECK-DAG: attributes [[ATTR_BUILTIN_DELETE]] = { builtin nounwind allockind("free") "alloc-family"="_Znwm" }
+
+// CHECK-DAG: attributes [[ATTR_BUILTIN_ARRAY_NEW]] = { builtin allockind("alloc,uninitialized") allocsize(0) memory(inaccessiblemem: readwrite, errnomem: write) "alloc-family"="_Znam" }
+// CHECK-DAG: attributes [[ATTR_BUILTIN_ARRAY_DELETE]] = { builtin nounwind allockind("free") "alloc-family"="_Znam" }
// The ([^b}|...) monstrosity is matching a character that's not the start of 'builtin'.
// Add more letters if this matches some other attribute.
diff --git a/clang/test/CodeGenCXX/new_hot_cold.cpp b/clang/test/CodeGenCXX/new_hot_cold.cpp
index ee07ab1c940893..26933095faa19a 100644
--- a/clang/test/CodeGenCXX/new_hot_cold.cpp
+++ b/clang/test/CodeGenCXX/new_hot_cold.cpp
@@ -49,7 +49,7 @@ void *operator new[](size_t size, std::align_val_t alignment,
void hot_cold_new() {
// CHECK: call noalias noundef nonnull ptr @_Znwm12__hot_cold_t(i64 noundef 1, i8 noundef zeroext 0) [[ATTR_NO_BUILTIN_CALL:#[^ ]*]]
operator new(1, (__hot_cold_t)0);
- // CHECK: call noalias noundef nonnull ptr @_Znwm12__hot_cold_t(i64 noundef 4, i8 noundef zeroext 0) [[ATTR_BUILTIN_CALL:#[^ ]*]]
+ // CHECK: call noalias noundef nonnull ptr @_Znwm12__hot_cold_t(i64 noundef 4, i8 noundef zeroext 0) [[ATTR_BUILTIN_NEW:#[^ ]*]]
new ((__hot_cold_t)0) int;
}
@@ -58,7 +58,7 @@ void hot_cold_new() {
void hot_cold_new_array() {
// CHECK: call noalias noundef nonnull ptr @_Znam12__hot_cold_t(i64 noundef 1, i8 noundef zeroext 0) [[ATTR_NO_BUILTIN_CALL:#[^ ]*]]
operator new[](1, (__hot_cold_t)0);
- // CHECK: call noalias noundef nonnull ptr @_Znam12__hot_cold_t(i64 noundef 4, i8 noundef zeroext 0) [[ATTR_BUILTIN_CALL:#[^ ]*]]
+ // CHECK: call noalias noundef nonnull ptr @_Znam12__hot_cold_t(i64 noundef 4, i8 noundef zeroext 0) [[ATTR_BUILTIN_ARRAY_NEW:#[^ ]*]]
new ((__hot_cold_t)0) int[1];
}
@@ -67,7 +67,7 @@ void hot_cold_new_array() {
void hot_cold_new_nothrow() {
// CHECK: call noalias noundef ptr @_ZnwmRKSt9nothrow_t12__hot_cold_t(i64 noundef 1, {{.*}} @nothrow, i8 noundef zeroext 0) [[ATTR_NO_BUILTIN_NOTHROW_CALL:#[^ ]*]]
operator new(1, nothrow, (__hot_cold_t)0);
- // CHECK: call noalias noundef ptr @_ZnwmRKSt9nothrow_t12__hot_cold_t(i64 noundef 4, {{.*}} @nothrow, i8 noundef zeroext 0) [[ATTR_BUILTIN_NOTHROW_CALL:#[^ ]*]]
+ // CHECK: call noalias noundef ptr @_ZnwmRKSt9nothrow_t12__hot_cold_t(i64 noundef 4, {{.*}} @nothrow, i8 noundef zeroext 0) [[ATTR_BUILTIN_NOTHROW_NEW:#[^ ]*]]
new (nothrow, (__hot_cold_t)0) int;
}
@@ -76,7 +76,7 @@ void hot_cold_new_nothrow() {
void hot_cold_new_nothrow_array() {
// CHECK: call noalias noundef ptr @_ZnamRKSt9nothrow_t12__hot_cold_t(i64 noundef 1, {{.*}} @nothrow, i8 noundef zeroext 0) [[ATTR_NO_BUILTIN_NOTHROW_CALL:#[^ ]*]]
operator new[](1, nothrow, (__hot_cold_t)0);
- // CHECK: call noalias noundef ptr @_ZnamRKSt9nothrow_t12__hot_cold_t(i64 noundef 4, {{.*}} @nothrow, i8 noundef zeroext 0) [[ATTR_BUILTIN_NOTHROW_CALL:#[^ ]*]]
+ // CHECK: call noalias noundef ptr @_ZnamRKSt9nothrow_t12__hot_cold_t(i64 noundef 4, {{.*}} @nothrow, i8 noundef zeroext 0) [[ATTR_BUILTIN_NOTHROW_ARRAY_NEW:#[^ ]*]]
new (nothrow, (__hot_cold_t)0) int[1];
}
@@ -89,7 +89,7 @@ class alignas(32) alignedstruct {
void hot_cold_new_align() {
// CHECK: call noalias noundef nonnull align 32 ptr @_ZnwmSt11align_val_t12__hot_cold_t(i64 noundef 1, i64 allocalign noundef 32, i8 noundef zeroext 0) [[ATTR_NO_BUILTIN_CALL:#[^ ]*]]
operator new(1, (std::align_val_t)32, (__hot_cold_t)0);
- // CHECK: call noalias noundef nonnull align 32 ptr @_ZnwmSt11align_val_t12__hot_cold_t(i64 noundef 32, i64 allocalign noundef 32, i8 noundef zeroext 0) [[ATTR_BUILTIN_CALL:#[^ ]*]]
+ // CHECK: call noalias noundef nonnull align 32 ptr @_ZnwmSt11align_val_t12__hot_cold_t(i64 noundef 32, i64 allocalign noundef 32, i8 noundef zeroext 0) [[ATTR_BUILTIN_ALIGN_NEW:#[^ ]*]]
new ((__hot_cold_t)0) alignedstruct;
}
@@ -98,7 +98,7 @@ void hot_cold_new_align() {
void hot_cold_new_align_array() {
// CHECK: call noalias noundef nonnull align 32 ptr @_ZnamSt11align_val_t12__hot_cold_t(i64 noundef 1, i64 allocalign noundef 32, i8 noundef zeroext 0) [[ATTR_NO_BUILTIN_CALL:#[^ ]*]]
operator new[](1, (std::align_val_t)32, (__hot_cold_t)0);
- // CHECK: call noalias noundef nonnull align 32 ptr @_ZnamSt11align_val_t12__hot_cold_t(i64 noundef 32, i64 allocalign noundef 32, i8 noundef zeroext 0) [[ATTR_BUILTIN_CALL:#[^ ]*]]
+ // CHECK: call noalias noundef nonnull align 32 ptr @_ZnamSt11align_val_t12__hot_cold_t(i64 noundef 32, i64 allocalign noundef 32, i8 noundef zeroext 0) [[ATTR_BUILTIN_ALIGN_ARRAY_NEW:#[^ ]*]]
new ((__hot_cold_t)0) alignedstruct[1];
}
@@ -107,7 +107,7 @@ void hot_cold_new_align_array() {
void hot_cold_new_align_nothrow() {
// CHECK: call noalias noundef align 32 ptr @_ZnwmSt11align_val_tRKSt9nothrow_t12__hot_cold_t(i64 noundef 1, i64 allocalign noundef 32, {{.*}} @nothrow, i8 noundef zeroext 0) [[ATTR_NO_BUILTIN_NOTHROW_CALL:#[^ ]*]]
operator new(1, (std::align_val_t)32, nothrow, (__hot_cold_t)0);
- // CHECK: call noalias noundef align 32 ptr @_ZnwmSt11align_val_tRKSt9nothrow_t12__hot_cold_t(i64 noundef 32, i64 allocalign noundef 32, {{.*}} @nothrow, i8 noundef zeroext 0) [[ATTR_BUILTIN_NOTHROW_CALL:#[^ ]*]]
+ // CHECK: call noalias noundef align 32 ptr @_ZnwmSt11align_val_tRKSt9nothrow_t12__hot_cold_t(i64 noundef 32, i64 allocalign noundef 32, {{.*}} @nothrow, i8 noundef zeroext 0) [[ATTR_BUILTIN_ALIGN_NOTHROW_NEW:#[^ ]*]]
new (nothrow, (__hot_cold_t)0) alignedstruct;
}
@@ -116,7 +116,7 @@ void hot_cold_new_align_nothrow() {
void hot_cold_new_align_nothrow_array() {
// CHECK: call noalias noundef align 32 ptr @_ZnamSt11align_val_tRKSt9nothrow_t12__hot_cold_t(i64 noundef 1, i64 allocalign noundef 32, {{.*}} @nothrow, i8 noundef zeroext 0) [[ATTR_NO_BUILTIN_NOTHROW_CALL:#[^ ]*]]
operator new[](1, (std::align_val_t)32, nothrow, (__hot_cold_t)0);
- // CHECK: call noalias noundef align 32 ptr @_ZnamSt11align_val_tRKSt9nothrow_t12__hot_cold_t(i64 noundef 32, i64 allocalign noundef 32, {{.*}} @nothrow, i8 noundef zeroext 0) [[ATTR_BUILTIN_NOTHROW_CALL:#[^ ]*]]
+ // CHECK: call noalias noundef align 32 ptr @_ZnamSt11align_val_tRKSt9nothrow_t12__hot_cold_t(i64 noundef 32, i64 allocalign noundef 32, {{.*}} @nothrow, i8 noundef zeroext 0) [[ATTR_BUILTIN_ALIGN_NOTHROW_ARRAY_NEW:#[^ ]*]]
new (nothrow, (__hot_cold_t)0) alignedstruct[1];
}
@@ -125,6 +125,12 @@ void hot_cold_new_align_nothrow_array() {
// CHECK-DAG: attributes [[ATTR_NOBUILTIN]] = { nobuiltin allocsize(0) {{.*}} }
// CHECK-DAG: attributes [[ATTR_NOBUILTIN_NOTHROW]] = { nobuiltin nounwind allocsize(0) {{.*}} }
// CHECK-DAG: attributes [[ATTR_NO_BUILTIN_CALL]] = { allocsize(0) }
-// CHECK-DAG: attributes [[ATTR_BUILTIN_CALL]] = { builtin allocsize(0) memory(inaccessiblemem: readwrite, errnomem: write) }
// CHECK-DAG: attributes [[ATTR_NO_BUILTIN_NOTHROW_CALL]] = { nounwind allocsize(0) }
-// CHECK-DAG: attributes [[ATTR_BUILTIN_NOTHROW_CALL]] = { builtin nounwind allocsize(0) memory(inaccessiblemem: readwrite, errnomem: write) }
+// CHECK-DAG: attributes [[ATTR_BUILTIN_NEW]] = { builtin allockind("alloc,uninitialized") allocsize(0) memory(inaccessiblemem: readwrite, errnomem: write) "alloc-family"="_Znwm" }
+// CHECK-DAG: attributes [[ATTR_BUILTIN_ARRAY_NEW]] = { builtin allockind("alloc,uninitialized") allocsize(0) memory(inaccessiblemem: readwrite, errnomem: write) "alloc-family"="_Znam" }
+// CHECK-DAG: attributes [[ATTR_BUILTIN_NOTHROW_NEW]] = { builtin nounwind allockind("alloc,uninitialized") allocsize(0) memory(inaccessiblemem: readwrite, errnomem: write) "alloc-family"="_Znwm" }
+// CHECK-DAG: attributes [[ATTR_BUILTIN_NOTHROW_ARRAY_NEW]] = { builtin nounwind allockind("alloc,uninitialized") allocsize(0) memory(inaccessiblemem: readwrite, errnomem: write) "alloc-family"="_Znam" }
+// CHECK-DAG: attributes [[ATTR_BUILTIN_ALIGN_NEW]] = { builtin allockind("alloc,uninitialized,aligned") allocsize(0) memory(inaccessiblemem: readwrite, errnomem: write) "alloc-family"="_ZnwmSt11align_val_t" }
+// CHECK-DAG: attributes [[ATTR_BUILTIN_ALIGN_ARRAY_NEW]] = { builtin allockind("alloc,uninitialized,aligned") allocsize(0) memory(inaccessiblemem: readwrite, errnomem: write) "alloc-family"="_ZnamSt11align_val_t" }
+// CHECK-DAG: attributes [[ATTR_BUILTIN_ALIGN_NOTHROW_NEW]] = { builtin nounwind allockind("alloc,uninitialized,aligned") allocsize(0) memory(inaccessiblemem: readwrite, errnomem: write) "alloc-family"="_ZnwmSt11align_val_t" }
+// CHECK-DAG: attributes [[ATTR_BUILTIN_ALIGN_NOTHROW_ARRAY_NEW]] = { builtin nounwind allockind("alloc,uninitialized,aligned") allocsize(0) memory(inaccessiblemem: readwrite, errnomem: write) "alloc-family"="_ZnamSt11align_val_t" }
diff --git a/clang/test/CodeGenCXX/operator-new.cpp b/clang/test/CodeGenCXX/operator-new.cpp
index 7d89a24941256b..04aaf431be67fe 100644
--- a/clang/test/CodeGenCXX/operator-new.cpp
+++ b/clang/test/CodeGenCXX/operator-new.cpp
@@ -34,7 +34,7 @@ void *f3(unsigned long N) {
return ::operator new(N);
}
-// SANE: attributes [[ATTR]] = { builtin allocsize(0) memory(inaccessiblemem: readwrite, errnomem: write) }
+// SANE: attributes [[ATTR]] = { builtin allockind("alloc,uninitialized") allocsize(0) memory(inaccessiblemem: readwrite, errnomem: write) "alloc-family"="_Znam" }
// SANE: attributes [[ATTR2]] = { allocsize(0) }
-// SANENOT: attributes [[ATTR]] = { builtin allocsize(0) }
+// SANENOT: attributes [[ATTR]] = { builtin allockind("alloc,uninitialized") allocsize(0) "alloc-family"="_Znam" }
// SANENOT: attributes [[ATTR2]] = { allocsize(0) }
diff --git a/clang/test/Headers/openmp_new_nothrow.cpp b/clang/test/Headers/openmp_new_nothrow.cpp
index bb1a8319569554..7d4eb54dcd9dd7 100644
--- a/clang/test/Headers/openmp_new_nothrow.cpp
+++ b/clang/test/Headers/openmp_new_nothrow.cpp
@@ -35,29 +35,17 @@ int* new_stuff_nothrow() {
// NVPTX-CXX11-NEXT: entry:
// NVPTX-CXX11-NEXT: [[CALL:%.*]] = call noalias noundef ptr @_ZnamRKSt9nothrow_t(i64 noundef 136, ptr noundef nonnull align 1 dereferenceable(1) @nothrow) #[[ATTR7:[0-9]+]]
// NVPTX-CXX11-NEXT: ret ptr [[CALL]]
-// NVPTX-CXX03-LABEL: define hidden noundef ptr @_Z23new_array_stuff_nothrowv
-// NVPTX-CXX03-SAME: () #[[ATTR0]] {
-// NVPTX-CXX03-NEXT: entry:
-// NVPTX-CXX03-NEXT: [[CALL:%.*]] = call noalias noundef ptr @_ZnamRKSt9nothrow_t(i64 noundef 136, ptr noundef nonnull align 1 dereferenceable(1) @nothrow) #[[ATTR4]]
-// NVPTX-CXX03-NEXT: ret ptr [[CALL]]
-//
-// NVPTX-NVPTX-CXX11-LABEL: define hidden noundef ptr @_Z23new_array_stuff_nothrowv
-// NVPTX-NVPTX-CXX11-SAME: () #[[ATTR0]] {
-// NVPTX-NVPTX-CXX11-NEXT: entry:
-// NVPTX-NVPTX-CXX11-NEXT: [[CALL:%.*]] = call noalias noundef ptr @_ZnamRKSt9nothrow_t(i64 noundef 136, ptr noundef nonnull align 1 dereferenceable(1) @nothrow) #[[ATTR7:[0-9]+]]
-// NVPTX-NVPTX-CXX11-NEXT: ret ptr [[CALL]]
-//
-// AMDGPU-CXX03-LABEL: define hidden noundef ptr @_Z23new_array_stuff_nothrowv
-// AMDGPU-CXX03-SAME: () #[[ATTR0]] {
-// AMDGPU-CXX03-NEXT: entry:
-// AMDGPU-CXX03-NEXT: [[CALL:%.*]] = call noalias noundef ptr @_ZnamRKSt9nothrow_t(i64 noundef 136, ptr noundef nonnull align 1 dereferenceable(1) addrspacecast (ptr addrspace(1) @nothrow to ptr)) #[[ATTR4]]
-// AMDGPU-CXX03-NEXT: ret ptr [[CALL]]
+// NVPTX-LABEL: define hidden noundef ptr @_Z23new_array_stuff_nothrowv
+// NVPTX-SAME: () #[[ATTR0]] {
+// NVPTX-NEXT: entry:
+// NVPTX-NEXT: [[CALL:%.*]] = call noalias noundef ptr @_ZnamRKSt9nothrow_t(i64 noundef 136, ptr noundef nonnull align 1 dereferenceable(1) @nothrow) #[[ATTR7:[0-9]+]]
+// NVPTX-NEXT: ret ptr [[CALL]]
//
-// AMDGPU-CXX11-LABEL: define hidden noundef ptr @_Z23new_array_stuff_nothrowv
-// AMDGPU-CXX11-SAME: () #[[ATTR0]] {
-// AMDGPU-CXX11-NEXT: entry:
-// AMDGPU-CXX11-NEXT: [[CALL:%.*]] = call noalias noundef ptr @_ZnamRKSt9nothrow_t(i64 noundef 136, ptr noundef nonnull align 1 dereferenceable(1) addrspacecast (ptr addrspace(1) @nothrow to ptr)) #[[ATTR7:[0-9]+]]
-// AMDGPU-CXX11-NEXT: ret ptr [[CALL]]
+// AMDGPU-LABEL: define hidden noundef ptr @_Z23new_array_stuff_nothrowv
+// AMDGPU-SAME: () #[[ATTR0]] {
+// AMDGPU-NEXT: entry:
+// AMDGPU-NEXT: [[CALL:%.*]] = call noalias noundef ptr @_ZnamRKSt9nothrow_t(i64 noundef 136, ptr noundef nonnull align 1 dereferenceable(1) addrspacecast (ptr addrspace(1) @nothrow to ptr)) #[[ATTR7:[0-9]+]]
+// AMDGPU-NEXT: ret ptr [[CALL]]
//
int* new_array_stuff_nothrow() {
return new (nothrow) int[34];
diff --git a/llvm/lib/Analysis/MemoryBuiltins.cpp b/llvm/lib/Analysis/MemoryBuiltins.cpp
index 22b5abd0f714d7..83c0cf6de371c8 100644
--- a/llvm/lib/Analysis/MemoryBuiltins.cpp
+++ b/llvm/lib/Analysis/MemoryBuiltins.cpp
@@ -73,12 +73,6 @@ enum AllocType : uint8_t {
enum class MallocFamily {
Malloc,
- CPPNew, // new(unsigned int)
- CPPNewAligned, // new(unsigned int, align_val_t)
- CPPNewArray, // new[](unsigned int)
- CPPNewArrayAligned, // new[](unsigned long, align_val_t)
- MSVCNew, // new(unsigned int)
- MSVCArrayNew, // new[](unsigned int)
VecMalloc,
};
// clang-format on
@@ -87,18 +81,6 @@ static StringRef mangledNameForMallocFamily(const MallocFamily &Family) {
switch (Family) {
case MallocFamily::Malloc:
return "malloc";
- case MallocFamily::CPPNew:
- return "_Znwm";
- case MallocFamily::CPPNewAligned:
- return "_ZnwmSt11align_val_t";
- case MallocFamily::CPPNewArray:
- return "_Znam";
- case MallocFamily::CPPNewArrayAligned:
- return "_ZnamSt11align_val_t";
- case MallocFamily::MSVCNew:
- return "??2 at YAPAXI@Z";
- case MallocFamily::MSVCArrayNew:
- return "??_U at YAPAXI@Z";
case MallocFamily::VecMalloc:
return "vec_malloc";
}
@@ -120,38 +102,6 @@ struct AllocFnsTy {
// FIXME: certain users need more information. E.g., SimplifyLibCalls needs to
// know which functions are nounwind, noalias, nocapture parameters, etc.
static const std::pair<LibFunc, AllocFnsTy> AllocationFnData[] = {
- {LibFunc_Znwj, {OpNewLike, 1, 0, -1, -1, MallocFamily::CPPNew}}, // new(unsigned int)
- {LibFunc_ZnwjRKSt9nothrow_t, {MallocLike, 2, 0, -1, -1, MallocFamily::CPPNew}}, // new(unsigned int, nothrow)
- {LibFunc_ZnwjSt11align_val_t, {OpNewLike, 2, 0, -1, 1, MallocFamily::CPPNewAligned}}, // new(unsigned int, align_val_t)
- {LibFunc_ZnwjSt11align_val_tRKSt9nothrow_t, {MallocLike, 3, 0, -1, 1, MallocFamily::CPPNewAligned}}, // new(unsigned int, align_val_t, nothrow)
- {LibFunc_Znwm, {OpNewLike, 1, 0, -1, -1, MallocFamily::CPPNew}}, // new(unsigned long)
- {LibFunc_Znwm12__hot_cold_t, {OpNewLike, 2, 0, -1, -1, MallocFamily::CPPNew}}, // new(unsigned long, __hot_cold_t)
- {LibFunc_ZnwmRKSt9nothrow_t, {MallocLike, 2, 0, -1, -1, MallocFamily::CPPNew}}, // new(unsigned long, nothrow)
- {LibFunc_ZnwmRKSt9nothrow_t12__hot_cold_t, {MallocLike, 3, 0, -1, -1, MallocFamily::CPPNew}}, // new(unsigned long, nothrow, __hot_cold_t)
- {LibFunc_ZnwmSt11align_val_t, {OpNewLike, 2, 0, -1, 1, MallocFamily::CPPNewAligned}}, // new(unsigned long, align_val_t)
- {LibFunc_ZnwmSt11align_val_t12__hot_cold_t, {OpNewLike, 3, 0, -1, 1, MallocFamily::CPPNewAligned}}, // new(unsigned long, align_val_t, __hot_cold_t)
- {LibFunc_ZnwmSt11align_val_tRKSt9nothrow_t, {MallocLike, 3, 0, -1, 1, MallocFamily::CPPNewAligned}}, // new(unsigned long, align_val_t, nothrow)
- {LibFunc_ZnwmSt11align_val_tRKSt9nothrow_t12__hot_cold_t, {MallocLike, 4, 0, -1, 1, MallocFamily::CPPNewAligned}}, // new(unsigned long, align_val_t, nothrow, __hot_cold_t)
- {LibFunc_Znaj, {OpNewLike, 1, 0, -1, -1, MallocFamily::CPPNewArray}}, // new[](unsigned int)
- {LibFunc_ZnajRKSt9nothrow_t, {MallocLike, 2, 0, -1, -1, MallocFamily::CPPNewArray}}, // new[](unsigned int, nothrow)
- {LibFunc_ZnajSt11align_val_t, {OpNewLike, 2, 0, -1, 1, MallocFamily::CPPNewArrayAligned}}, // new[](unsigned int, align_val_t)
- {LibFunc_ZnajSt11align_val_tRKSt9nothrow_t, {MallocLike, 3, 0, -1, 1, MallocFamily::CPPNewArrayAligned}}, // new[](unsigned int, align_val_t, nothrow)
- {LibFunc_Znam, {OpNewLike, 1, 0, -1, -1, MallocFamily::CPPNewArray}}, // new[](unsigned long)
- {LibFunc_Znam12__hot_cold_t, {OpNewLike, 2, 0, -1, -1, MallocFamily::CPPNew}}, // new[](unsigned long, __hot_cold_t)
- {LibFunc_ZnamRKSt9nothrow_t, {MallocLike, 2, 0, -1, -1, MallocFamily::CPPNewArray}}, // new[](unsigned long, nothrow)
- {LibFunc_ZnamRKSt9nothrow_t12__hot_cold_t, {MallocLike, 3, 0, -1, -1, MallocFamily::CPPNew}}, // new[](unsigned long, nothrow, __hot_cold_t)
- {LibFunc_ZnamSt11align_val_t, {OpNewLike, 2, 0, -1, 1, MallocFamily::CPPNewArrayAligned}}, // new[](unsigned long, align_val_t)
- {LibFunc_ZnamSt11align_val_t12__hot_cold_t, {OpNewLike, 3, 0, -1, 1, MallocFamily::CPPNewAligned}}, // new[](unsigned long, align_val_t, __hot_cold_t)
- {LibFunc_ZnamSt11align_val_tRKSt9nothrow_t, {MallocLike, 3, 0, -1, 1, MallocFamily::CPPNewArrayAligned}}, // new[](unsigned long, align_val_t, nothrow)
- {LibFunc_ZnamSt11align_val_tRKSt9nothrow_t12__hot_cold_t, {MallocLike, 4, 0, -1, 1, MallocFamily::CPPNewAligned}}, // new[](unsigned long, align_val_t, nothrow, __hot_cold_t)
- {LibFunc_msvc_new_int, {OpNewLike, 1, 0, -1, -1, MallocFamily::MSVCNew}}, // new(unsigned int)
- {LibFunc_msvc_new_int_nothrow, {MallocLike, 2, 0, -1, -1, MallocFamily::MSVCNew}}, // new(unsigned int, nothrow)
- {LibFunc_msvc_new_longlong, {OpNewLike, 1, 0, -1, -1, MallocFamily::MSVCNew}}, // new(unsigned long long)
- {LibFunc_msvc_new_longlong_nothrow, {MallocLike, 2, 0, -1, -1, MallocFamily::MSVCNew}}, // new(unsigned long long, nothrow)
- {LibFunc_msvc_new_array_int, {OpNewLike, 1, 0, -1, -1, MallocFamily::MSVCArrayNew}}, // new[](unsigned int)
- {LibFunc_msvc_new_array_int_nothrow, {MallocLike, 2, 0, -1, -1, MallocFamily::MSVCArrayNew}}, // new[](unsigned int, nothrow)
- {LibFunc_msvc_new_array_longlong, {OpNewLike, 1, 0, -1, -1, MallocFamily::MSVCArrayNew}}, // new[](unsigned long long)
- {LibFunc_msvc_new_array_longlong_nothrow, {MallocLike, 2, 0, -1, -1, MallocFamily::MSVCArrayNew}}, // new[](unsigned long long, nothrow)
{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}},
@@ -448,56 +398,6 @@ Constant *llvm::getInitialValueOfAllocation(const Value *V,
return nullptr;
}
-struct FreeFnsTy {
- unsigned NumParams;
- // Name of default allocator function to group malloc/free calls by family
- MallocFamily Family;
-};
-
-// clang-format off
-static const std::pair<LibFunc, FreeFnsTy> FreeFnData[] = {
- {LibFunc_ZdlPv, {1, MallocFamily::CPPNew}}, // operator delete(void*)
- {LibFunc_ZdaPv, {1, MallocFamily::CPPNewArray}}, // operator delete[](void*)
- {LibFunc_msvc_delete_ptr32, {1, MallocFamily::MSVCNew}}, // operator delete(void*)
- {LibFunc_msvc_delete_ptr64, {1, MallocFamily::MSVCNew}}, // operator delete(void*)
- {LibFunc_msvc_delete_array_ptr32, {1, MallocFamily::MSVCArrayNew}}, // operator delete[](void*)
- {LibFunc_msvc_delete_array_ptr64, {1, MallocFamily::MSVCArrayNew}}, // operator delete[](void*)
- {LibFunc_ZdlPvj, {2, MallocFamily::CPPNew}}, // delete(void*, uint)
- {LibFunc_ZdlPvm, {2, MallocFamily::CPPNew}}, // delete(void*, ulong)
- {LibFunc_ZdlPvRKSt9nothrow_t, {2, MallocFamily::CPPNew}}, // delete(void*, nothrow)
- {LibFunc_ZdlPvSt11align_val_t, {2, MallocFamily::CPPNewAligned}}, // delete(void*, align_val_t)
- {LibFunc_ZdaPvj, {2, MallocFamily::CPPNewArray}}, // delete[](void*, uint)
- {LibFunc_ZdaPvm, {2, MallocFamily::CPPNewArray}}, // delete[](void*, ulong)
- {LibFunc_ZdaPvRKSt9nothrow_t, {2, MallocFamily::CPPNewArray}}, // delete[](void*, nothrow)
- {LibFunc_ZdaPvSt11align_val_t, {2, MallocFamily::CPPNewArrayAligned}}, // delete[](void*, align_val_t)
- {LibFunc_msvc_delete_ptr32_int, {2, MallocFamily::MSVCNew}}, // delete(void*, uint)
- {LibFunc_msvc_delete_ptr64_longlong, {2, MallocFamily::MSVCNew}}, // delete(void*, ulonglong)
- {LibFunc_msvc_delete_ptr32_nothrow, {2, MallocFamily::MSVCNew}}, // delete(void*, nothrow)
- {LibFunc_msvc_delete_ptr64_nothrow, {2, MallocFamily::MSVCNew}}, // delete(void*, nothrow)
- {LibFunc_msvc_delete_array_ptr32_int, {2, MallocFamily::MSVCArrayNew}}, // delete[](void*, uint)
- {LibFunc_msvc_delete_array_ptr64_longlong, {2, MallocFamily::MSVCArrayNew}}, // delete[](void*, ulonglong)
- {LibFunc_msvc_delete_array_ptr32_nothrow, {2, MallocFamily::MSVCArrayNew}}, // delete[](void*, nothrow)
- {LibFunc_msvc_delete_array_ptr64_nothrow, {2, MallocFamily::MSVCArrayNew}}, // delete[](void*, nothrow)
- {LibFunc_ZdlPvSt11align_val_tRKSt9nothrow_t, {3, MallocFamily::CPPNewAligned}}, // delete(void*, align_val_t, nothrow)
- {LibFunc_ZdaPvSt11align_val_tRKSt9nothrow_t, {3, MallocFamily::CPPNewArrayAligned}}, // delete[](void*, align_val_t, nothrow)
- {LibFunc_ZdlPvjSt11align_val_t, {3, MallocFamily::CPPNewAligned}}, // delete(void*, unsigned int, align_val_t)
- {LibFunc_ZdlPvmSt11align_val_t, {3, MallocFamily::CPPNewAligned}}, // delete(void*, unsigned long, align_val_t)
- {LibFunc_ZdaPvjSt11align_val_t, {3, MallocFamily::CPPNewArrayAligned}}, // delete[](void*, unsigned int, align_val_t)
- {LibFunc_ZdaPvmSt11align_val_t, {3, MallocFamily::CPPNewArrayAligned}}, // delete[](void*, unsigned long, align_val_t)
-};
-// clang-format on
-
-static std::optional<FreeFnsTy>
-getFreeFunctionDataForFunction(const Function *Callee, const LibFunc TLIFn) {
- const auto *Iter =
- find_if(FreeFnData, [TLIFn](const std::pair<LibFunc, FreeFnsTy> &P) {
- return P.first == TLIFn;
- });
- if (Iter == std::end(FreeFnData))
- return std::nullopt;
- return Iter->second;
-}
-
std::optional<StringRef>
llvm::getAllocationFamily(const Value *I, const TargetLibraryInfo *TLI) {
if (const Function *Callee = getCalledFunction(I)) {
@@ -508,9 +408,6 @@ llvm::getAllocationFamily(const Value *I, const TargetLibraryInfo *TLI) {
getAllocationDataForFunction(Callee, AnyAlloc, TLI);
if (AllocData)
return mangledNameForMallocFamily(AllocData->Family);
- const auto FreeData = getFreeFunctionDataForFunction(Callee, TLIFn);
- if (FreeData)
- return mangledNameForMallocFamily(FreeData->Family);
}
}
@@ -525,23 +422,8 @@ llvm::getAllocationFamily(const Value *I, const TargetLibraryInfo *TLI) {
}
/// isLibFreeFunction - Returns true if the function is a builtin free()
-bool llvm::isLibFreeFunction(const Function *F, const LibFunc TLIFn) {
- std::optional<FreeFnsTy> FnData = getFreeFunctionDataForFunction(F, TLIFn);
- if (!FnData)
- return checkFnAllocKind(F, AllocFnKind::Free);
-
- // Check free prototype.
- // FIXME: workaround for PR5130, this will be obsolete when a nobuiltin
- // attribute will exist.
- FunctionType *FTy = F->getFunctionType();
- if (!FTy->getReturnType()->isVoidTy())
- return false;
- if (FTy->getNumParams() != FnData->NumParams)
- return false;
- if (!FTy->getParamType(0)->isPointerTy())
- return false;
-
- return true;
+bool llvm::isLibFreeFunction(const Function *F, const LibFunc /*TLIFn*/) {
+ return checkFnAllocKind(F, AllocFnKind::Free);
}
Value *llvm::getFreedOperand(const CallBase *CB, const TargetLibraryInfo *TLI) {
diff --git a/llvm/test/Analysis/MemoryDependenceAnalysis/load-size-cache.ll b/llvm/test/Analysis/MemoryDependenceAnalysis/load-size-cache.ll
index 6f50f2c0a71860..ba1b4ceff1439a 100644
--- a/llvm/test/Analysis/MemoryDependenceAnalysis/load-size-cache.ll
+++ b/llvm/test/Analysis/MemoryDependenceAnalysis/load-size-cache.ll
@@ -63,5 +63,5 @@ bb9:
ret i8 %phi10
}
-declare ptr @_Znwm(i64)
+declare ptr @_Znwm(i64) allockind("alloc,uninitialized") allocsize(0)
declare void @use(i64)
diff --git a/llvm/test/ThinLTO/X86/memprof-fixup.ll b/llvm/test/ThinLTO/X86/memprof-fixup.ll
index afed80fc562c1a..c612e4544c89fe 100644
--- a/llvm/test/ThinLTO/X86/memprof-fixup.ll
+++ b/llvm/test/ThinLTO/X86/memprof-fixup.ll
@@ -112,7 +112,7 @@ entry:
ret i32 0
}
-declare ptr @_Znam(i64)
+declare ptr @_Znam(i64) allockind("alloc,uninitialized") allocsize(0)
!7 = !{!8, !10}
!8 = !{!9, !"cold", !2}
diff --git a/llvm/test/Transforms/CodeGenPrepare/dead-allocation.ll b/llvm/test/Transforms/CodeGenPrepare/dead-allocation.ll
index 9550e748da6d1e..edf9620ab564b0 100644
--- a/llvm/test/Transforms/CodeGenPrepare/dead-allocation.ll
+++ b/llvm/test/Transforms/CodeGenPrepare/dead-allocation.ll
@@ -20,5 +20,5 @@ entry:
ret void
}
-declare noundef nonnull ptr @_Znwm(i64 noundef) local_unnamed_addr
+declare noundef nonnull ptr @_Znwm(i64 noundef) local_unnamed_addr allockind("alloc,uninitialized") allocsize(0)
declare void @llvm.assume(i1 noundef)
diff --git a/llvm/test/Transforms/GVN/malloc-load-removal.ll b/llvm/test/Transforms/GVN/malloc-load-removal.ll
index c86990ffb160c0..d8cffdac90fbed 100644
--- a/llvm/test/Transforms/GVN/malloc-load-removal.ll
+++ b/llvm/test/Transforms/GVN/malloc-load-removal.ll
@@ -33,7 +33,7 @@ if.end: ; preds = %if.then, %entry
ret ptr %call
}
-declare noalias ptr @_Znwm(i64) nounwind
+declare noalias ptr @_Znwm(i64) nounwind allockind("alloc,uninitialized") allocsize(0)
define noalias ptr @test2() nounwind uwtable ssp {
; CHECK-LABEL: define noalias ptr @test2(
diff --git a/llvm/test/Transforms/GVN/no_speculative_loads_with_asan.ll b/llvm/test/Transforms/GVN/no_speculative_loads_with_asan.ll
index 0ff237b83fb3c8..ddc2356f52f5fd 100644
--- a/llvm/test/Transforms/GVN/no_speculative_loads_with_asan.ll
+++ b/llvm/test/Transforms/GVN/no_speculative_loads_with_asan.ll
@@ -1,7 +1,7 @@
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
; RUN: opt -passes=gvn -S %s | FileCheck %s
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
-declare noalias ptr @_Znam(i64) #1
+declare noalias ptr @_Znam(i64) allockind("alloc,uninitialized") allocsize(0)
; Load of %i8 is an out of bounds load, which is folded to poison, which allows
; us to elide the phi.
diff --git a/llvm/test/Transforms/InstCombine/debuginfo-invoke.ll b/llvm/test/Transforms/InstCombine/debuginfo-invoke.ll
index 287582b9baf3b8..c521655001855d 100644
--- a/llvm/test/Transforms/InstCombine/debuginfo-invoke.ll
+++ b/llvm/test/Transforms/InstCombine/debuginfo-invoke.ll
@@ -27,7 +27,7 @@ lpad159: ; preds = %entry
br label %common.ret
}
-declare ptr @_Znam(i64)
+declare ptr @_Znam(i64) allockind("alloc,uninitialized") allocsize(0)
!llvm.dbg.cu = !{!0}
!llvm.module.flags = !{!3}
diff --git a/llvm/test/Transforms/InstCombine/deref-alloc-fns.ll b/llvm/test/Transforms/InstCombine/deref-alloc-fns.ll
index 00dbf7e180c4c4..0323ced7a3ed00 100644
--- a/llvm/test/Transforms/InstCombine/deref-alloc-fns.ll
+++ b/llvm/test/Transforms/InstCombine/deref-alloc-fns.ll
@@ -4,13 +4,13 @@
declare noalias ptr @malloc(i64) allockind("alloc,uninitialized") allocsize(0) "alloc-family"="malloc"
declare noalias ptr @calloc(i64, i64) allockind("alloc,zeroed") allocsize(0,1) "alloc-family"="malloc"
declare noalias ptr @realloc(ptr nocapture, i64) allockind("realloc") allocsize(1) "alloc-family"="malloc"
-declare noalias nonnull ptr @_Znam(i64) ; throwing version of 'new'
-declare noalias nonnull ptr @_Znwm(i64) ; throwing version of 'new'
+declare noalias nonnull ptr @_Znam(i64) allockind("alloc,uninitialized") allocsize(0) "alloc-family"="_Znam" ; throwing version of 'new'
+declare noalias nonnull ptr @_Znwm(i64) allockind("alloc,uninitialized") allocsize(0) "alloc-family"="_Znwm" ; throwing version of 'new'
declare noalias ptr @strdup(ptr)
declare noalias ptr @aligned_alloc(i64 allocalign, i64) allockind("alloc,uninitialized,aligned") allocsize(1) "alloc-family"="malloc"
declare noalias align 16 ptr @memalign(i64 allocalign, i64) allocsize(1)
; new[](unsigned int, align_val_t)
-declare noalias ptr @_ZnamSt11align_val_t(i64 %size, i64 %align)
+declare noalias ptr @_ZnamSt11align_val_t(i64 %size, i64 allocalign %align) allockind("alloc,uninitialized,aligned") allocsize(0) "alloc-family"="_ZnamSt11align_val_t"
declare ptr @my_malloc(i64) allocsize(0)
declare ptr @my_calloc(i64, i64) allocsize(0, 1)
diff --git a/llvm/test/Transforms/InstCombine/invoke.ll b/llvm/test/Transforms/InstCombine/invoke.ll
index 7e64d9ed601571..e7687e01c62472 100644
--- a/llvm/test/Transforms/InstCombine/invoke.ll
+++ b/llvm/test/Transforms/InstCombine/invoke.ll
@@ -4,7 +4,7 @@ target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f3
declare i32 @__gxx_personality_v0(...)
declare void @__cxa_call_unexpected(ptr)
declare i64 @llvm.objectsize.i64(ptr, i1) nounwind readonly
-declare ptr @_Znwm(i64)
+declare ptr @_Znwm(i64) allockind("alloc,uninitialized") allocsize(0)
; CHECK-LABEL: @f1(
diff --git a/llvm/test/Transforms/InstCombine/malloc-free-addrspace.ll b/llvm/test/Transforms/InstCombine/malloc-free-addrspace.ll
index 7c42dce1802c51..2f11d0b3a0f195 100644
--- a/llvm/test/Transforms/InstCombine/malloc-free-addrspace.ll
+++ b/llvm/test/Transforms/InstCombine/malloc-free-addrspace.ll
@@ -77,8 +77,8 @@ declare noalias ptr addrspace(200) @aligned_alloc(i64, i64) addrspace(200) alloc
declare noalias ptr addrspace(200) @strdup(ptr addrspace(200) %arg) addrspace(200)
declare void @free(ptr addrspace(200)) addrspace(200) allockind("free") "alloc-family"="malloc"
; new/delete
-declare noalias ptr addrspace(200) @_Znwm(i64) addrspace(200)
-declare void @_ZdlPv(ptr addrspace(200)) addrspace(200)
+declare noalias ptr addrspace(200) @_Znwm(i64) addrspace(200) allockind("alloc,uninitialized") allocsize(0) "alloc-family"="_Znwm"
+declare void @_ZdlPv(ptr addrspace(200) allocptr) addrspace(200) allockind("free") "alloc-family"="_Znwm"
; new[]/delete[]
-declare noalias ptr addrspace(200) @_Znam(i64) addrspace(200)
-declare void @_ZdaPv(ptr addrspace(200)) addrspace(200)
+declare noalias ptr addrspace(200) @_Znam(i64) addrspace(200) allockind("alloc,uninitialized") allocsize(0) "alloc-family"="_Znam"
+declare void @_ZdaPv(ptr addrspace(200) allocptr) addrspace(200) allockind("free") "alloc-family"="_Znam"
diff --git a/llvm/test/Transforms/InstCombine/new-delete-itanium-32.ll b/llvm/test/Transforms/InstCombine/new-delete-itanium-32.ll
index e23b7d8eb213e7..b2443eb6aee9b5 100644
--- a/llvm/test/Transforms/InstCombine/new-delete-itanium-32.ll
+++ b/llvm/test/Transforms/InstCombine/new-delete-itanium-32.ll
@@ -12,47 +12,47 @@ target datalayout = "p:32:32"
; operator new(size_t = unsigned int)
-declare ptr @_Znwj(%size_t)
+declare ptr @_Znwj(%size_t) allockind("alloc,uninitialized") allocsize(0) "alloc-family"="_Znwm"
; operator new[](size_t = unsigned int)
-declare ptr @_Znaj(%size_t)
+declare ptr @_Znaj(%size_t) allockind("alloc,uninitialized") allocsize(0) "alloc-family"="_Znam"
; operator new(size_t = unsigned int, std::align_val_t)
-declare ptr @_ZnwjSt11align_val_t(%size_t, %size_t)
+declare ptr @_ZnwjSt11align_val_t(%size_t, %size_t allocalign) allockind("alloc,uninitialized,aligned") allocsize(0) "alloc-family"="_ZnwmSt11align_val_t"
; operator new[](size_t = unsigned int, std::align_val_t)
-declare ptr @_ZnajSt11align_val_t(%size_t, %size_t)
+declare ptr @_ZnajSt11align_val_t(%size_t, %size_t allocalign) allockind("alloc,uninitialized,aligned") allocsize(0) "alloc-family"="_ZnamSt11align_val_t"
; operator new(size_t = unsigned int, std::align_val_t, const std::nothrow_t&)
-declare ptr @_ZnwjSt11align_val_tRKSt9nothrow_t(%size_t, %size_t, ptr)
+declare ptr @_ZnwjSt11align_val_tRKSt9nothrow_t(%size_t, %size_t allocalign, ptr) allockind("alloc,uninitialized,aligned") allocsize(0) "alloc-family"="_ZnwmSt11align_val_t"
; operator new[](size_t = unsigned int, std::align_val_t, const std::nothrow_t&)
-declare ptr @_ZnajSt11align_val_tRKSt9nothrow_t(%size_t, %size_t, ptr)
+declare ptr @_ZnajSt11align_val_tRKSt9nothrow_t(%size_t, %size_t allocalign, ptr) allockind("alloc,uninitialized,aligned") allocsize(0) "alloc-family"="_ZnamSt11align_val_t"
; operator delete(ptr, size_t = unsigned int)
-declare void @_ZdlPvj(ptr, %size_t)
+declare void @_ZdlPvj(ptr allocptr, %size_t) allockind("free") "alloc-family"="_Znwm"
; operator delete[](ptr, size_t = unsigned int)
-declare void @_ZdaPvj(ptr, %size_t)
+declare void @_ZdaPvj(ptr allocptr, %size_t) allockind("free") "alloc-family"="_Znam"
; operator delete(ptr, std::align_val_t)
-declare void @_ZdlPvSt11align_val_t(ptr, %align_val_t)
+declare void @_ZdlPvSt11align_val_t(ptr allocptr, %align_val_t) allockind("free") "alloc-family"="_ZnwmSt11align_val_t"
; operator delete[](ptr, std::align_val_t)
-declare void @_ZdaPvSt11align_val_t(ptr, %align_val_t)
+declare void @_ZdaPvSt11align_val_t(ptr allocptr, %align_val_t) allockind("free") "alloc-family"="_ZnamSt11align_val_t"
; operator delete(ptr, size_t = unsigned int, std::align_val_t)
-declare void @_ZdlPvjSt11align_val_t(ptr, %size_t, %align_val_t)
+declare void @_ZdlPvjSt11align_val_t(ptr allocptr, %size_t, %align_val_t) allockind("free") "alloc-family"="_ZnwmSt11align_val_t"
; operator delete[](ptr, size_t = unsigned int, std::align_val_t)
-declare void @_ZdaPvjSt11align_val_t(ptr, %size_t, %align_val_t)
+declare void @_ZdaPvjSt11align_val_t(ptr allocptr, %size_t, %align_val_t) allockind("free") "alloc-family"="_ZnamSt11align_val_t"
; operator delete(ptr, std::align_val_t, const std::nothrow_t&)
-declare void @_ZdlPvSt11align_val_tRKSt9nothrow_t(ptr, %align_val_t, ptr)
+declare void @_ZdlPvSt11align_val_tRKSt9nothrow_t(ptr allocptr, %align_val_t, ptr) allockind("free") "alloc-family"="_ZnwmSt11align_val_t"
; operator delete[](ptr, std::align_val_t, const std::nothrow_t&)
-declare void @_ZdaPvSt11align_val_tRKSt9nothrow_t(ptr, %align_val_t, ptr)
+declare void @_ZdaPvSt11align_val_tRKSt9nothrow_t(ptr allocptr, %align_val_t, ptr) allockind("free") "alloc-family"="_ZnamSt11align_val_t"
declare void @llvm.assume(i1)
diff --git a/llvm/test/Transforms/InstCombine/new-delete-itanium.ll b/llvm/test/Transforms/InstCombine/new-delete-itanium.ll
index 76c9193b4f4e85..f575c2c9995811 100644
--- a/llvm/test/Transforms/InstCombine/new-delete-itanium.ll
+++ b/llvm/test/Transforms/InstCombine/new-delete-itanium.ll
@@ -20,15 +20,15 @@ entry:
br i1 %tobool, label %if.end, label %if.then
if.then: ; preds = %entry
- tail call void @_ZdlPv(ptr %foo) builtin
+ tail call void @_ZdlPv(ptr %foo) builtin allockind("free") "alloc-family"="_Znwm"
br label %if.end
if.end: ; preds = %entry, %if.then
ret void
}
-declare ptr @_ZnwmRKSt9nothrow_t(i64, ptr) nobuiltin
-declare void @_ZdlPvRKSt9nothrow_t(ptr, ptr) nobuiltin
+declare ptr @_ZnwmRKSt9nothrow_t(i64, ptr) nobuiltin allocsize(0)
+declare void @_ZdlPvRKSt9nothrow_t(ptr allocptr, ptr) nobuiltin
declare i32 @__gxx_personality_v0(...)
declare void @_ZN1AC2Ev(ptr %this)
@@ -46,7 +46,7 @@ define void @test7() personality ptr @__gxx_personality_v0 {
;
entry:
%nt = alloca i8
- %call.i = tail call ptr @_ZnwmRKSt9nothrow_t(i64 1, ptr %nt) builtin nounwind
+ %call.i = tail call ptr @_ZnwmRKSt9nothrow_t(i64 1, ptr %nt) builtin nounwind allockind("alloc,uninitialized") "alloc-family"="_Znwm"
invoke void @_ZN1AC2Ev(ptr undef)
to label %.noexc.i unwind label %lpad.i
@@ -55,12 +55,12 @@ entry:
lpad.i: ; preds = %entry
%0 = landingpad { ptr, i32 } cleanup
- call void @_ZdlPvRKSt9nothrow_t(ptr %call.i, ptr %nt) builtin nounwind
+ call void @_ZdlPvRKSt9nothrow_t(ptr %call.i, ptr %nt) builtin nounwind allockind("free") "alloc-family"="_Znwm"
resume { ptr, i32 } %0
}
-declare ptr @_Znwm(i64) nobuiltin
-define ptr @_Znwj(i32 %n) nobuiltin {
+declare ptr @_Znwm(i64) nobuiltin allocsize(0)
+define ptr @_Znwj(i32 %n) nobuiltin allocsize(0) {
; CHECK-LABEL: @_Znwj(
; CHECK-NEXT: [[Z:%.*]] = zext i32 [[N:%.*]] to i64
; CHECK-NEXT: [[M:%.*]] = call ptr @_Znwm(i64 [[Z]])
@@ -70,12 +70,12 @@ define ptr @_Znwj(i32 %n) nobuiltin {
%m = call ptr @_Znwm(i64 %z)
ret ptr %m
}
-declare ptr @_Znam(i64) nobuiltin
-declare ptr @_Znaj(i32) nobuiltin
-declare void @_ZdlPv(ptr) nobuiltin
-declare void @_ZdaPv(ptr) nobuiltin
+declare ptr @_Znam(i64) nobuiltin allocsize(0)
+declare ptr @_Znaj(i32) nobuiltin allocsize(0)
+declare void @_ZdlPv(ptr allocptr) nobuiltin
+declare void @_ZdaPv(ptr allocptr) nobuiltin
-define linkonce void @_ZdlPvm(ptr %p, i64) nobuiltin {
+define linkonce void @_ZdlPvm(ptr allocptr %p, i64) nobuiltin {
; CHECK-LABEL: @_ZdlPvm(
; CHECK-NEXT: call void @_ZdlPv(ptr [[P:%.*]])
; CHECK-NEXT: ret void
@@ -83,7 +83,7 @@ define linkonce void @_ZdlPvm(ptr %p, i64) nobuiltin {
call void @_ZdlPv(ptr %p)
ret void
}
-define linkonce void @_ZdlPvj(ptr %p, i32) nobuiltin {
+define linkonce void @_ZdlPvj(ptr allocptr %p, i32) nobuiltin {
; CHECK-LABEL: @_ZdlPvj(
; CHECK-NEXT: call void @_ZdlPv(ptr [[P:%.*]])
; CHECK-NEXT: ret void
@@ -91,7 +91,7 @@ define linkonce void @_ZdlPvj(ptr %p, i32) nobuiltin {
call void @_ZdlPv(ptr %p)
ret void
}
-define linkonce void @_ZdaPvm(ptr %p, i64) nobuiltin {
+define linkonce void @_ZdaPvm(ptr allocptr %p, i64) nobuiltin {
; CHECK-LABEL: @_ZdaPvm(
; CHECK-NEXT: call void @_ZdaPv(ptr [[P:%.*]])
; CHECK-NEXT: ret void
@@ -99,7 +99,7 @@ define linkonce void @_ZdaPvm(ptr %p, i64) nobuiltin {
call void @_ZdaPv(ptr %p)
ret void
}
-define linkonce void @_ZdaPvj(ptr %p, i32) nobuiltin {
+define linkonce void @_ZdaPvj(ptr allocptr %p, i32) nobuiltin {
; CHECK-LABEL: @_ZdaPvj(
; CHECK-NEXT: call void @_ZdaPv(ptr [[P:%.*]])
; CHECK-NEXT: ret void
@@ -110,25 +110,25 @@ define linkonce void @_ZdaPvj(ptr %p, i32) nobuiltin {
; new(size_t, align_val_t)
-declare ptr @_ZnwmSt11align_val_t(i64, i64) nobuiltin
+declare ptr @_ZnwmSt11align_val_t(i64, i64 allocalign) nobuiltin allocsize(0)
; new[](size_t, align_val_t)
-declare ptr @_ZnamSt11align_val_t(i64, i64) nobuiltin
+declare ptr @_ZnamSt11align_val_t(i64, i64 allocalign) nobuiltin allocsize(0)
; new(size_t, align_val_t, nothrow)
-declare ptr @_ZnwmSt11align_val_tRKSt9nothrow_t(i64, i64, ptr) nobuiltin
+declare ptr @_ZnwmSt11align_val_tRKSt9nothrow_t(i64, i64 allocalign, ptr) nobuiltin allocsize(0)
; new[](size_t, align_val_t, nothrow)
-declare ptr @_ZnamSt11align_val_tRKSt9nothrow_t(i64, i64, ptr) nobuiltin
+declare ptr @_ZnamSt11align_val_tRKSt9nothrow_t(i64, i64 allocalign, ptr) nobuiltin allocsize(0)
; delete(ptr, align_val_t)
-declare void @_ZdlPvSt11align_val_t(ptr, i64) nobuiltin
+declare void @_ZdlPvSt11align_val_t(ptr allocptr, i64) nobuiltin
; delete[](ptr, align_val_t)
-declare void @_ZdaPvSt11align_val_t(ptr, i64) nobuiltin
+declare void @_ZdaPvSt11align_val_t(ptr allocptr, i64) nobuiltin
; delete(ptr, align_val_t, nothrow)
-declare void @_ZdlPvSt11align_val_tRKSt9nothrow_t(ptr, i64, ptr) nobuiltin
+declare void @_ZdlPvSt11align_val_tRKSt9nothrow_t(ptr allocptr, i64, ptr) nobuiltin
; delete[](ptr, align_val_t, nothrow)
-declare void @_ZdaPvSt11align_val_tRKSt9nothrow_t(ptr, i64, ptr) nobuiltin
+declare void @_ZdaPvSt11align_val_tRKSt9nothrow_t(ptr allocptr, i64, ptr) nobuiltin
; delete(ptr, unsigned long, align_val_t)
-declare void @_ZdlPvmSt11align_val_t(ptr, i64, i64) nobuiltin
+declare void @_ZdlPvmSt11align_val_t(ptr allocptr, i64, i64) nobuiltin
; delete[](ptr, unsigned long, align_val_t)
-declare void @_ZdaPvmSt11align_val_t(ptr, i64, i64) nobuiltin
+declare void @_ZdaPvmSt11align_val_t(ptr allocptr, i64, i64) nobuiltin
declare void @llvm.assume(i1)
@@ -137,31 +137,31 @@ define void @test8() {
; CHECK-NEXT: ret void
;
%nt = alloca i8
- %nw = call ptr @_Znwm(i64 32) builtin
- call void @_ZdlPv(ptr %nw) builtin
- %na = call ptr @_Znam(i64 32) builtin
- call void @_ZdaPv(ptr %na) builtin
- %nwm = call ptr @_Znwm(i64 32) builtin
- call void @_ZdlPvm(ptr %nwm, i64 32) builtin
- %nam = call ptr @_Znam(i64 32) builtin
- call void @_ZdaPvm(ptr %nam, i64 32) builtin
- %nwa = call ptr @_ZnwmSt11align_val_t(i64 32, i64 8) builtin
- call void @_ZdlPvSt11align_val_t(ptr %nwa, i64 8) builtin
- %naa = call ptr @_ZnamSt11align_val_t(i64 32, i64 8) builtin
- call void @_ZdaPvSt11align_val_t(ptr %naa, i64 8) builtin
- %nwat = call ptr @_ZnwmSt11align_val_tRKSt9nothrow_t(i64 32, i64 8, ptr %nt) builtin
- call void @_ZdlPvSt11align_val_tRKSt9nothrow_t(ptr %nwat, i64 8, ptr %nt) builtin
- %naat = call ptr @_ZnamSt11align_val_tRKSt9nothrow_t(i64 32, i64 8, ptr %nt) builtin
- call void @_ZdaPvSt11align_val_tRKSt9nothrow_t(ptr %naat, i64 8, ptr %nt) builtin
- %nwa2 = call ptr @_ZnwmSt11align_val_t(i64 32, i64 8) builtin
- call void @_ZdlPvmSt11align_val_t(ptr %nwa2, i64 32, i64 8) builtin
- %naa2 = call ptr @_ZnamSt11align_val_t(i64 32, i64 8) builtin
- call void @_ZdaPvmSt11align_val_t(ptr %naa2, i64 32, i64 8) builtin
+ %nw = call ptr @_Znwm(i64 32) builtin allockind("alloc,uninitialized") "alloc-family"="_Znwm"
+ call void @_ZdlPv(ptr %nw) builtin allockind("free") "alloc-family"="_Znwm"
+ %na = call ptr @_Znam(i64 32) builtin allockind("alloc,uninitialized") "alloc-family"="_Znam"
+ call void @_ZdaPv(ptr %na) builtin allockind("free") "alloc-family"="_Znam"
+ %nwm = call ptr @_Znwm(i64 32) builtin allockind("alloc,uninitialized") "alloc-family"="_Znwm"
+ call void @_ZdlPvm(ptr %nwm, i64 32) builtin allockind("free") "alloc-family"="_Znwm"
+ %nam = call ptr @_Znam(i64 32) builtin allockind("alloc,uninitialized") "alloc-family"="_Znam"
+ call void @_ZdaPvm(ptr %nam, i64 32) builtin allockind("free") "alloc-family"="_Znam"
+ %nwa = call ptr @_ZnwmSt11align_val_t(i64 32, i64 8) builtin allockind("alloc,uninitialized,aligned") "alloc-family"="_ZnwmSt11align_val_t"
+ call void @_ZdlPvSt11align_val_t(ptr %nwa, i64 8) builtin allockind("free") "alloc-family"="_ZnwmSt11align_val_t"
+ %naa = call ptr @_ZnamSt11align_val_t(i64 32, i64 8) builtin allockind("alloc,uninitialized,aligned") "alloc-family"="_ZnamSt11align_val_t"
+ call void @_ZdaPvSt11align_val_t(ptr %naa, i64 8) builtin allockind("free") "alloc-family"="_ZnamSt11align_val_t"
+ %nwat = call ptr @_ZnwmSt11align_val_tRKSt9nothrow_t(i64 32, i64 8, ptr %nt) builtin allockind("alloc,uninitialized,aligned") "alloc-family"="_ZnwmSt11align_val_t"
+ call void @_ZdlPvSt11align_val_tRKSt9nothrow_t(ptr %nwat, i64 8, ptr %nt) builtin allockind("free") "alloc-family"="_ZnwmSt11align_val_t"
+ %naat = call ptr @_ZnamSt11align_val_tRKSt9nothrow_t(i64 32, i64 8, ptr %nt) builtin allockind("alloc,uninitialized,aligned") "alloc-family"="_ZnamSt11align_val_t"
+ call void @_ZdaPvSt11align_val_tRKSt9nothrow_t(ptr %naat, i64 8, ptr %nt) builtin allockind("free") "alloc-family"="_ZnamSt11align_val_t"
+ %nwa2 = call ptr @_ZnwmSt11align_val_t(i64 32, i64 8) builtin allockind("alloc,uninitialized,aligned") "alloc-family"="_ZnwmSt11align_val_t"
+ call void @_ZdlPvmSt11align_val_t(ptr %nwa2, i64 32, i64 8) builtin allockind("free") "alloc-family"="_ZnwmSt11align_val_t"
+ %naa2 = call ptr @_ZnamSt11align_val_t(i64 32, i64 8) builtin allockind("alloc,uninitialized,aligned") "alloc-family"="_ZnamSt11align_val_t"
+ call void @_ZdaPvmSt11align_val_t(ptr %naa2, i64 32, i64 8) builtin allockind("free") "alloc-family"="_ZnamSt11align_val_t"
; Check that the alignment assume does not prevent the removal.
- %nwa3 = call ptr @_ZnwmSt11align_val_t(i64 32, i64 16) builtin
+ %nwa3 = call ptr @_ZnwmSt11align_val_t(i64 32, i64 16) builtin allockind("alloc,uninitialized,aligned") "alloc-family"="_ZnwmSt11align_val_t"
call void @llvm.assume(i1 true) [ "align"(ptr %nwa3, i64 16) ]
- call void @_ZdlPvmSt11align_val_t(ptr %nwa3, i64 32, i64 16) builtin
+ call void @_ZdlPvmSt11align_val_t(ptr %nwa3, i64 32, i64 16) builtin allockind("free") "alloc-family"="_ZnwmSt11align_val_t"
ret void
}
@@ -177,11 +177,11 @@ define void @test10() {
define void @test11() {
; CHECK-LABEL: @test11(
-; CHECK-NEXT: [[CALL:%.*]] = call dereferenceable_or_null(8) ptr @_Znwm(i64 8) #[[ATTR5]]
+; CHECK-NEXT: [[CALL:%.*]] = call dereferenceable_or_null(8) ptr @_Znwm(i64 8) #[[ATTR6:[0-9]+]]
; CHECK-NEXT: call void @_ZdlPv(ptr [[CALL]])
; CHECK-NEXT: ret void
;
- %call = call ptr @_Znwm(i64 8) builtin
+ %call = call ptr @_Znwm(i64 8) builtin allockind("alloc,uninitialized") "alloc-family"="_Znwm"
call void @_ZdlPv(ptr %call)
ret void
}
@@ -192,9 +192,9 @@ define void @test17() {
; CHECK-LABEL: @test17(
; CHECK-NEXT: ret void
;
- %nw1 = call ptr @_Znwm(i64 32) builtin
+ %nw1 = call ptr @_Znwm(i64 32) builtin allockind("alloc,uninitialized") "alloc-family"="_Znwm"
%nw2 = call ptr @llvm.launder.invariant.group(ptr %nw1)
store i8 1, ptr %nw2
- call void @_ZdlPv(ptr %nw2) builtin
+ call void @_ZdlPv(ptr %nw2) builtin allockind("free") "alloc-family"="_Znwm"
ret void
}
diff --git a/llvm/test/Transforms/InstCombine/new-delete-msvc.ll b/llvm/test/Transforms/InstCombine/new-delete-msvc.ll
index 2db9b1ce09b17c..931089066aae1c 100644
--- a/llvm/test/Transforms/InstCombine/new-delete-msvc.ll
+++ b/llvm/test/Transforms/InstCombine/new-delete-msvc.ll
@@ -3,15 +3,15 @@
; REQUIRES: x86-registered-target
; PR1201
-declare noalias ptr @"\01??2 at YAPEAX_K@Z"(i64) nobuiltin
-declare void @"\01??3 at YAXPEAX@Z"(ptr) nobuiltin
+declare noalias ptr @"\01??2 at YAPEAX_K@Z"(i64) nobuiltin allocsize(0)
+declare void @"\01??3 at YAXPEAX@Z"(ptr allocptr) nobuiltin
define void @test9() {
; CHECK-LABEL: @test9(
; CHECK-NEXT: ret void
;
- %new_long_long = call noalias ptr @"\01??2 at YAPEAX_K@Z"(i64 32) builtin
- call void @"\01??3 at YAXPEAX@Z"(ptr %new_long_long) builtin
+ %new_long_long = call noalias ptr @"\01??2 at YAPEAX_K@Z"(i64 32) builtin allockind("alloc,uninitialized") "alloc-family"="??2 at YAPAXI@Z"
+ call void @"\01??3 at YAXPEAX@Z"(ptr %new_long_long) builtin allockind("free") "alloc-family"="??2 at YAPAXI@Z"
ret void
}
diff --git a/llvm/test/Transforms/InstCombine/objsize-64.ll b/llvm/test/Transforms/InstCombine/objsize-64.ll
index b214ddae94b125..8f890f271c18ac 100644
--- a/llvm/test/Transforms/InstCombine/objsize-64.ll
+++ b/llvm/test/Transforms/InstCombine/objsize-64.ll
@@ -3,7 +3,7 @@
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
declare noalias ptr @malloc(i64) nounwind allockind("alloc,uninitialized") allocsize(0)
-declare noalias nonnull ptr @_Znwm(i64) ; new(unsigned long)
+declare noalias nonnull ptr @_Znwm(i64) allockind("alloc,uninitialized") allocsize(0) ; new(unsigned long)
declare i32 @__gxx_personality_v0(...)
declare void @__cxa_call_unexpected(ptr)
declare i64 @llvm.objectsize.i64(ptr, i1) nounwind readonly
diff --git a/llvm/test/Transforms/NewGVN/malloc-load-removal.ll b/llvm/test/Transforms/NewGVN/malloc-load-removal.ll
index 3e11d9221c9dd2..1e5a3f8e53a489 100644
--- a/llvm/test/Transforms/NewGVN/malloc-load-removal.ll
+++ b/llvm/test/Transforms/NewGVN/malloc-load-removal.ll
@@ -34,7 +34,7 @@ if.end: ; preds = %if.then, %entry
}
-declare ptr @_Znwm(i64) nounwind
+declare ptr @_Znwm(i64) nounwind allockind("alloc,uninitialized") allocsize(0) "alloc-family"="_Znwm"
define noalias ptr @test2() nounwind uwtable ssp {
; CHECK-LABEL: define noalias ptr @test2(
More information about the llvm-branch-commits
mailing list