Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions clang/lib/Sema/SemaExprCXX.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1929,8 +1929,9 @@ static bool CheckDeleteOperator(Sema &S, SourceLocation StartLoc,
}
return true;
}

return S.CheckAllocationAccess(StartLoc, Range, NamingClass, Decl, Diagnose);
Sema::AccessResult Accessible =
S.CheckAllocationAccess(StartLoc, Range, NamingClass, Decl, Diagnose);
return Accessible == Sema::AR_inaccessible;
}

/// Select the correct "usual" deallocation function to use from a selection of
Expand Down
38 changes: 38 additions & 0 deletions clang/test/CodeGenCXX/bug135668.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// RUN: %clang_cc1 %s -triple arm64-apple-macosx -emit-llvm -fcxx-exceptions -fexceptions -std=c++23 -o - | FileCheck %s

class TestClass {
public:
TestClass();
int field = 0;
friend class Foo;
static void * operator new(unsigned long size);
private:
static void operator delete(void *p);
};

class Foo {
public:
int test_method();
};

int Foo::test_method() {
TestClass *obj = new TestClass() ;
return obj->field;
}

// CHECK-LABEL: define noundef i32 @_ZN3Foo11test_methodEv
// CHECK: [[THIS_ADDR:%.*]] = alloca ptr, align 8
// CHECK: [[OBJ:%.*]] = alloca ptr, align 8
// CHECK: store ptr %this, ptr [[THIS_ADDR]], align 8
// CHECK: [[THIS1:%.*]] = load ptr, ptr [[THIS_ADDR]], align 8
// CHECK: [[ALLOCATION:%.*]] = call noundef ptr @_ZN9TestClassnwEm(i64 noundef 4)
// CHECK: [[INITIALIZEDOBJ:%.*]] = invoke noundef ptr @_ZN9TestClassC1Ev(ptr noundef nonnull align 4 dereferenceable(4) [[ALLOCATION]])
// CHECK-NEXT: to label %[[INVOKE_CONT:.*]] unwind label %[[LPAD:.*]]
// CHECK: [[INVOKE_CONT]]:
// CHECK: store ptr [[ALLOCATION]], ptr [[OBJ]], align 8
// CHECK: [[OBJPTR:%.*]] = load ptr, ptr [[OBJ]], align 8
// CHECK: [[FIELDPTR:%.*]] = getelementptr inbounds nuw %class.TestClass, ptr [[OBJPTR]], i32 0, i32 0
// CHECK: [[FIELD:%.*]] = load i32, ptr [[FIELDPTR]], align 4
// CHECK: ret i32 [[FIELD]]
// CHECK: [[LPAD]]:
// CHECK: call void @_ZN9TestClassdlEPv(ptr noundef [[ALLOCATION]]) #3
25 changes: 25 additions & 0 deletions clang/test/SemaCXX/bug135668.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// RUN: %clang_cc1 -triple arm64-apple-macosx -Wall -fsyntax-only -verify %s -std=c++26 -fexceptions -fcxx-exceptions
// expected-no-diagnostics

// This test makes sure that we don't erroneously consider an accessible operator
// delete to be inaccessible, and then discard the entire new expression.

class TestClass {
public:
TestClass();
int field = 0;
friend class Foo;
static void * operator new(unsigned long size);
private:
static void operator delete(void *p);
};

class Foo {
public:
int test_method();
};

int Foo::test_method() {
TestClass *obj = new TestClass() ;
return obj->field;
}
Loading