From 53dcf94d0593a79b661ae8bb85a9155181b1fc41 Mon Sep 17 00:00:00 2001 From: John McCall Date: Tue, 29 Sep 2015 23:55:17 +0000 Subject: Don't crash when a reserved global placement operator new is paired with a non-reserved operator delete in a new-expression. llvm-svn: 248862 --- clang/test/CodeGenCXX/exceptions.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'clang/test/CodeGenCXX/exceptions.cpp') diff --git a/clang/test/CodeGenCXX/exceptions.cpp b/clang/test/CodeGenCXX/exceptions.cpp index d6b5942dd23..ff76b11350d 100644 --- a/clang/test/CodeGenCXX/exceptions.cpp +++ b/clang/test/CodeGenCXX/exceptions.cpp @@ -2,6 +2,9 @@ typedef __typeof(sizeof(0)) size_t; +// Declare the reserved global placement new. +void *operator new(size_t, void*); + // This just shouldn't crash. namespace test0 { struct allocator { @@ -526,4 +529,21 @@ namespace test11 { // (After this is a terminate landingpad.) } +namespace test12 { + struct A { + void operator delete(void *, void *); + A(); + }; + + A *test(void *ptr) { + return new (ptr) A(); + } + // CHECK-LABEL: define {{.*}} @_ZN6test124testEPv( + // CHECK: [[PTR:%.*]] = load i8*, i8* + // CHECK-NEXT: [[CAST:%.*]] = bitcast i8* [[PTR]] to [[A:%.*]]* + // CHECK-NEXT: invoke void @_ZN6test121AC1Ev([[A]]* [[CAST]]) + // CHECK: ret [[A]]* [[CAST]] + // CHECK: invoke void @_ZN6test121AdlEPvS1_(i8* [[PTR]], i8* [[PTR]]) +} + // CHECK: attributes [[NI_NR_NUW]] = { noinline noreturn nounwind } -- cgit v1.2.3