Enable changes under -fclang-abi-compat

Fznamznon · Fznamznon · commit 94f43ae5c4f3 · 2025-06-16T10:52:36.000-07:00
diff --git a/clang/lib/CodeGen/CGClass.cpp b/clang/lib/CodeGen/CGClass.cpp
@@ -1596,7 +1596,11 @@ namespace {
     assert(OD->isDestroyingOperatorDelete() == ReturnAfterDelete &&
            "unexpected value for ReturnAfterDelete");
     auto *CondTy = cast<llvm::IntegerType>(ShouldDeleteCondition->getType());
-    if (OD->isDestroyingOperatorDelete()) {
+    // Clang 20 calls global operator delete after dtor call. Clang 21 and newer
+    // call global operator delete inside of dtor body, as MSVC does.
+    bool Clang21AndNewer = CGF.getContext().getLangOpts().getClangABICompat() >
+                           LangOptions::ClangABI::Ver20;
+    if (Clang21AndNewer && OD->isDestroyingOperatorDelete()) {
       llvm::BasicBlock *CallDtor = CGF.createBasicBlock("dtor.call_dtor");
       llvm::BasicBlock *DontCallDtor = CGF.createBasicBlock("dtor.entry_cont");
       // Third bit set signals that global operator delete is called. That means
@@ -1636,7 +1640,7 @@ namespace {
     // always call it. Otherwise we need to check the third bit and call the
     // appropriate operator delete, i.e. global or class-specific.
     if (const FunctionDecl *GlobOD = Dtor->getOperatorGlobalDelete();
-        isa<CXXMethodDecl>(OD) && GlobOD) {
+        isa<CXXMethodDecl>(OD) && GlobOD && Clang21AndNewer) {
       // Third bit set signals that global operator delete is called, i.e.
       // ::delete appears on the callsite.
       llvm::Value *CheckTheBitForGlobDeleteCall = CGF.Builder.CreateAnd(
diff --git a/clang/lib/CodeGen/MicrosoftCXXABI.cpp b/clang/lib/CodeGen/MicrosoftCXXABI.cpp
@@ -894,8 +894,19 @@ void MicrosoftCXXABI::emitVirtualObjectDelete(CodeGenFunction &CGF,
                                               const CXXDestructorDecl *Dtor) {
   // FIXME: Provide a source location here even though there's no
   // CXXMemberCallExpr for dtor call.
-  EmitVirtualDestructorCall(CGF, Dtor, Dtor_Deleting, Ptr, DE,
-                            /*CallOrInvoke=*/nullptr);
+  if (getContext().getLangOpts().getClangABICompat() <=
+      LangOptions::ClangABI::Ver20) {
+    bool UseGlobalDelete = DE->isGlobalDelete();
+    CXXDtorType DtorType = UseGlobalDelete ? Dtor_Complete : Dtor_Deleting;
+    llvm::Value *MDThis =
+        EmitVirtualDestructorCall(CGF, Dtor, DtorType, Ptr, DE,
+                                  /*CallOrInvoke=*/nullptr);
+    if (UseGlobalDelete)
+      CGF.EmitDeleteCall(DE->getOperatorDelete(), MDThis, ElementType);
+  } else {
+    EmitVirtualDestructorCall(CGF, Dtor, Dtor_Deleting, Ptr, DE,
+                              /*CallOrInvoke=*/nullptr);
+  }
 }
 
 void MicrosoftCXXABI::emitRethrow(CodeGenFunction &CGF, bool isNoReturn) {
@@ -2010,7 +2021,10 @@ llvm::Value *MicrosoftCXXABI::EmitVirtualDestructorCall(
   ASTContext &Context = getContext();
   llvm::Value *ImplicitParam = llvm::ConstantInt::get(
       llvm::IntegerType::getInt32Ty(CGF.getLLVMContext()),
-      (DtorType == Dtor_Deleting) | 4 * (D && D->isGlobalDelete()));
+      (DtorType == Dtor_Deleting) |
+          4 * (D && D->isGlobalDelete() &&
+               Context.getLangOpts().getClangABICompat() >
+                   LangOptions::ClangABI::Ver20));
 
   QualType ThisTy;
   if (CE) {
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -11124,7 +11124,13 @@ bool Sema::CheckDestructor(CXXDestructorDecl *Destructor) {
       MarkFunctionReferenced(Loc, OperatorDelete);
       Destructor->setOperatorDelete(OperatorDelete, ThisArg);
 
-      if (isa<CXXMethodDecl>(OperatorDelete) &&
+      // Clang 20 calls global operator delete after dtor call. Clang 21 and
+      // newer call global operator delete inside of dtor body, as MSVC does.
+      // So we don't really need to fetch global operator delete for Clang 20
+      // ABI.
+      bool Clang21AndNewer = Context.getLangOpts().getClangABICompat() >
+                             LangOptions::ClangABI::Ver20;
+      if (Clang21AndNewer && isa<CXXMethodDecl>(OperatorDelete) &&
           Context.getTargetInfo().getCXXABI().isMicrosoft()) {
         // In Microsoft ABI whenever a class has a defined operator delete,
         // scalar deleting destructors check the 3rd bit of the implicit
diff --git a/clang/test/CodeGenCXX/cxx2a-destroying-delete.cpp b/clang/test/CodeGenCXX/cxx2a-destroying-delete.cpp
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -std=c++2a -fexceptions -emit-llvm %s -triple x86_64-linux-gnu -o - | FileCheck %s --check-prefixes=CHECK,CHECK-ITANIUM,CHECK-64BIT
-// RUN: %clang_cc1 -std=c++2a -fexceptions -emit-llvm %s -triple x86_64-windows -o - | FileCheck %s --check-prefixes=CHECK,CHECK-MSABI,CHECK-MSABI64,CHECK-64BIT
-// RUN: %clang_cc1 -std=c++2a -fexceptions -emit-llvm %s -triple i386-windows -o - | FileCheck %s --check-prefixes=CHECK,CHECK-MSABI,CHECK-MSABI32,CHECK-32BIT
+// RUN: %clang_cc1 -std=c++2a -fexceptions -emit-llvm %s -triple x86_64-windows -o - | FileCheck %s --check-prefixes=CHECK,CHECK-MSABI,CHECK-MSABI64,CHECK-64BIT,CLANG21-MSABI,CLANG21-MSABI64
+// RUN: %clang_cc1 -std=c++2a -fexceptions -emit-llvm %s -triple i386-windows -o - | FileCheck %s --check-prefixes=CHECK,CHECK-MSABI,CHECK-MSABI32,CHECK-32BIT,CLANG21-MSABI,CLANG21-MSABI32
+// RUN: %clang_cc1 -std=c++2a -fexceptions -emit-llvm %s -triple i386-windows -fclang-abi-compat=20 -o - | FileCheck %s --check-prefixes=CHECK,CHECK-MSABI,CHECK-32BIT,CHECK-MSABI32,CLANG20-MSABI
+// RUN: %clang_cc1 -std=c++2a -fexceptions -emit-llvm %s -triple x86_64-windows -fclang-abi-compat=20 -o - | FileCheck %s --check-prefixes=CHECK,CHECK-MSABI,CHECK-MSABI64,CHECK-64BIT,CLANG20-MSABI
 
 // PR46908: ensure the IR passes the verifier with optimizations enabled.
 // RUN: %clang_cc1 -std=c++2a -fexceptions -emit-llvm-only %s -triple x86_64-linux-gnu -O2
@@ -165,38 +167,44 @@ H::~H() { call_in_dtor(); }
 // CHECK-MSABI-NOT: call{{ }}
 // CHECK-MSABI: store i32 %[[IP]], ptr %[[IP_ALLOCA:.*]]
 // CHECK-MSABI: %[[IMP_PARAM:.*]] = load i32, ptr %[[IP_ALLOCA]]
-// CHECK-MSABI-NEXT: %[[THIRDBIT:.*]] = and i32 %[[IMP_PARAM]], 4
-// CHECK-MSABI-NEXT: %[[CHCK:.*]] = icmp eq i32 %[[THIRDBIT]], 0
-// CHECK-MSABI-NEXT: br i1 %[[CHCK]], label %dtor.entry_cont, label %dtor.call_dtor
+// CLANG21: %[[THIRDBIT:.*]] = and i32 %[[IMP_PARAM]], 4
+// CLANG21-NEXT: %[[CHCK:.*]] = icmp eq i32 %[[THIRDBIT]], 0
+// CLANG21-NEXT: br i1 %[[CHCK]], label %dtor.entry_cont, label %dtor.call_dtor
+// CLANG20-MSABI: %[[FIRSTBIT:.*]] = and i32 %[[IMP_PARAM]], 1
+// CLANG20-MSABI: %[[CHCK:.*]] = icmp eq i32 %[[FIRSTBIT]], 0
+// CLANG20-MSABI: br i1 %[[CHCK]], label %dtor.continue, label %dtor.call_delete
 //
-// CHECK_MSABI-LABEL: dtor.call_dtor:
-// CHECK_MSABI-NEXT: call void @"??1H@@UEAA@XZ"({{.*}})
-// CHECK_MSABI-NEXT: br label %dtor.entry_cont
+// CLANG21-MSABI: dtor.call_dtor:
+// CLANG21-MSABI64-NEXT: call void @"??1H@@UEAA@XZ"({{.*}})
+// CLANG21-MSABI32-NEXT: call x86_thiscallcc void @"??1H@@UAE@XZ"({{.*}})
+// CLANG21-MSABI-NEXT: br label %dtor.entry_cont
 //
-// CHECK_MSABI-LABEL: dtor.entry_cont:
-// CHECK_MSABI-NEXT: %[[FIRSTBIT:.*]] = and i32 %[[IMP_PARAM]], 1
-// CHECK_MSABI-NEXT: %[[CHCK1:.*]] = icmp eq i32 %[[FIRSTBIT]], 0
-// CHECK_MSABI-NEXT: br i1 %[[CHCK1]], label %dtor.continue, label %dtor.call_delete
+// CLANG21-MSABI-LABEL: dtor.entry_cont:
+// CLANG21-MSABI-NEXT: %[[FIRSTBIT:.*]] = and i32 %[[IMP_PARAM]], 1
+// CLANG21-MSABI-NEXT: %[[CHCK1:.*]] = icmp eq i32 %[[FIRSTBIT]], 0
+// CLANG21-MSABI-NEXT: br i1 %[[CHCK1]], label %dtor.continue, label %dtor.call_delete
 //
-// CHECK_MSABI-LABEL: dtor.call_delete:
-// CHECK-MSABI: %[[THIRDBIT1:.*]] = and i32 %[[IMP_PARAM]], 4
-// CHECK-MSABI-NEXT: %[[CHCK2:.*]] = icmp eq i32 %[[THIRDBIT1]], 0
-// CHECK-MSABI-NEXT: br i1 %[[CHCK2]], label %dtor.call_class_delete, label %dtor.call_glob_delete
+// CLANG21-MSABI-LABEL: dtor.call_delete:
+// CLANG21-MSABI: %[[THIRDBIT1:.*]] = and i32 %[[IMP_PARAM]], 4
+// CLANG21-MSABI-NEXT: %[[CHCK2:.*]] = icmp eq i32 %[[THIRDBIT1]], 0
+// CLANG21-MSABI-NEXT: br i1 %[[CHCK2]], label %dtor.call_class_delete, label %dtor.call_glob_delete
 //
-// CHECK-MSABI-LABEL: dtor.call_glob_delete:
-// CHECK-MSABI64: call void @"??3@YAXPEAX_K@Z"(ptr noundef %{{.*}}, i64 noundef 48)
-// CHECK-MSABI32: call void @"??3@YAXPAXIW4align_val_t@std@@@Z"(ptr noundef %{{.*}}, i32 noundef 32, i32 noundef 16)
-// CHECK-MSABI-NEXT: br label %[[RETURN:.*]]
+// CLANG21-MSABI-LABEL: dtor.call_glob_delete:
+// CLANG21-MSABI64: call void @"??3@YAXPEAX_K@Z"(ptr noundef %{{.*}}, i64 noundef 48)
+// CLANG21-MSABI32: call void @"??3@YAXPAXIW4align_val_t@std@@@Z"(ptr noundef %{{.*}}, i32 noundef 32, i32 noundef 16)
+// CLANG21-MSABI-NEXT: br label %[[RETURN:.*]]
 //
-// CHECK-MSABI: dtor.call_class_delete:
-// CHECK-MSABI-NOT: call{{ }}
-// CHECK-MSABI64: getelementptr {{.*}}, i64 24
-// CHECK-MSABI32: getelementptr {{.*}}, i32 20
-// CHECK-MSABI-NOT: call{{ }}
+// CLANG20-MSABI: dtor.call_delete:
+// CLANG21-MSABI: dtor.call_class_delete:
+// CLANG21-MSABI-NOT: call{{ }}
+// CLANG21-MSABI64: getelementptr {{.*}}, i64 24
+// CLANG21-MSABI32: getelementptr {{.*}}, i32 20
+// CLANG21-MSABI-NOT: call{{ }}
 // CHECK-MSABI64: call void @"??3F@@SAXPEAU0@Udestroying_delete_t@std@@_KW4align_val_t@2@@Z"({{.*}}, i64 noundef 48, i64 noundef 16)
 // CHECK-MSABI32: call void @"??3F@@SAXPAU0@Udestroying_delete_t@std@@IW4align_val_t@2@@Z"({{.*}}, i32 noundef 32, i32 noundef 16)
 // CHECK-MSABI: br label %[[RETURN:]]
 //
+// CHECK-MSABI: dtor.continue:
 // CHECK-MSABI64: call void @"??1H@@UEAA@XZ"(
 // CHECK-MSABI32: call x86_thiscallcc void @"??1H@@UAE@XZ"(
 // CHECK-MSABI: br label %[[RETURN]]
@@ -217,31 +225,32 @@ I::~I() { call_in_dtor(); }
 // CHECK-MSABI32-LABEL: define {{.*}} @"??_GI@@UAEPAXI@Z"(
 // CHECK-MSABI-NOT: call{{ }}
 // CHECK-MSABI: load i32
-// CHECK-MSABI-NEXT: and i32 %[[IMP_PARAM:.*]], 4
-// CHECK-MSABI-NEXT: icmp eq i32 {{.*}}, 0
-// CHECK-MSABI-NEXT: br i1 %[[CHCK]], label %dtor.entry_cont, label %dtor.call_dtor
+// CLANG21-MSABI-NEXT: and i32 %[[IMP_PARAM:.*]], 4
+// CLANG21-MSABI-NEXT: icmp eq i32 {{.*}}, 0
+// CLANG21-MSABI-NEXT: br i1 %{{.*}}, label %dtor.entry_cont, label %dtor.call_dtor
 //
-// CHECK-MSABI: dtor.call_dtor:
-// CHECK-MSABI64-NEXT: call void @"??1I@@UEAA@XZ"({{.*}})
-// CHECK-MSABI32-NEXT: call x86_thiscallcc void @"??1I@@UAE@XZ"({{.*}})
-// CHECK-MSABI-NEXT: br label %dtor.entry_cont
+// CLANG21-MSABI: dtor.call_dtor:
+// CLANG21-MSABI64-NEXT: call void @"??1I@@UEAA@XZ"({{.*}})
+// CLANG21-MSABI32-NEXT: call x86_thiscallcc void @"??1I@@UAE@XZ"({{.*}})
+// CLANG21-MSABI-NEXT: br label %dtor.entry_cont
 //
-// CHECK-MSABI: dtor.entry_cont:
-// CHECK-MSABI-NEXT: and i32 %[[IMP_PARAM]], 1
-// CHECK-MSABI-NEXT: icmp eq i32 %{{.*}}, 0
-// CHECK-MSABI-NEXT: br i1 %{{.*}}, label %dtor.continue, label %dtor.call_delete
+// CLANG21-MSABI: dtor.entry_cont:
+// CLANG21-MSABI-NEXT: and i32 %[[IMP_PARAM]], 1
+// CLANG21-MSABI-NEXT: icmp eq i32 %{{.*}}, 0
+// CLANG21-MSABI-NEXT: br i1 %{{.*}}, label %dtor.continue, label %dtor.call_delete
 //
-// CHECK-MSABI: dtor.call_delete:
-// CHECK-MSABI-NEXT: %[[THIRDBIT1:.*]] = and i32 %[[IMP_PARAM]], 4
-// CHECK-MSABI-NEXT: %[[CHCK2:.*]] = icmp eq i32 %[[THIRDBIT1]], 0
-// CHECK-MSABI-NEXT: br i1 %[[CHCK2]], label %dtor.call_class_delete, label %dtor.call_glob_delete
+// CLANG21-MSABI: dtor.call_delete:
+// CLANG21-MSABI-NEXT: %[[THIRDBIT1:.*]] = and i32 %[[IMP_PARAM]], 4
+// CLANG21-MSABI-NEXT: %[[CHCK2:.*]] = icmp eq i32 %[[THIRDBIT1]], 0
+// CLANG21-MSABI-NEXT: br i1 %[[CHCK2]], label %dtor.call_class_delete, label %dtor.call_glob_delete
 //
-// CHECK-MSABI-LABEL: dtor.call_glob_delete:
-// CHECK-MSABI64: call void @"??3@YAXPEAX_KW4align_val_t@std@@@Z"(ptr noundef %{{.*}}, i64 noundef 96, i64 noundef 32)
-// CHECK-MSABI32: call void @"??3@YAXPAXIW4align_val_t@std@@@Z"(ptr noundef %{{.*}}, i32 noundef 64, i32 noundef 32)
-// CHECK-MSABI-NEXT: br label %[[RETURN:.*]]
+// CLANG21-MSABI: dtor.call_glob_delete:
+// CLANG21-MSABI64: call void @"??3@YAXPEAX_KW4align_val_t@std@@@Z"(ptr noundef %{{.*}}, i64 noundef 96, i64 noundef 32)
+// CLANG21-MSABI32: call void @"??3@YAXPAXIW4align_val_t@std@@@Z"(ptr noundef %{{.*}}, i32 noundef 64, i32 noundef 32)
+// CLANG21-MSABI-NEXT: br label %[[RETURN:.*]]
 //
-// CHECK_MSABI: dtor.call_class_delete:
+// CLANG20-MSABI: dtor.call_delete:
+// CLANG21-MSABI: dtor.call_class_delete:
 // CHECK-MSABI-NOT: call{{ }}
 // CHECK-MSABI64: getelementptr {{.*}}, i64 24
 // CHECK-MSABI32: getelementptr {{.*}}, i32 20
diff --git a/clang/test/CodeGenCXX/microsoft-abi-structors.cpp b/clang/test/CodeGenCXX/microsoft-abi-structors.cpp
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -no-enable-noundef-analysis -emit-llvm -fno-rtti %s -std=c++11 -o - -mconstructor-aliases -triple=i386-pc-win32 -fno-rtti > %t
-// RUN: FileCheck %s < %t
+// RUN: FileCheck --check-prefixes CHECK,CLANG21 %s < %t
 // vftables are emitted very late, so do another pass to try to keep the checks
 // in source order.
 // RUN: FileCheck --check-prefix DTORS %s < %t
@@ -8,6 +8,7 @@
 // RUN: FileCheck --check-prefix DTORS4 %s < %t
 //
 // RUN: %clang_cc1 -emit-llvm %s -o - -mconstructor-aliases -triple=x86_64-pc-win32 -fno-rtti -std=c++11 | FileCheck --check-prefix DTORS-X64 %s
+// RUN: %clang_cc1 -no-enable-noundef-analysis -emit-llvm -fno-rtti %s -std=c++11 -o - -mconstructor-aliases -triple=i386-pc-win32 -fclang-abi-compat=20 | FileCheck --check-prefixes CHECK,CLANG20 %s
 
 namespace basic {
 
@@ -114,7 +115,9 @@ void call_deleting_dtor_and_global_delete(C *obj_ptr) {
 // CHECK-NEXT:   %[[VTABLE:.*]] = load ptr, ptr %[[OBJ_PTR_VALUE]]
 // CHECK-NEXT:   %[[PVDTOR:.*]] = getelementptr inbounds ptr, ptr %[[VTABLE]], i64 0
 // CHECK-NEXT:   %[[VDTOR:.*]] = load ptr, ptr %[[PVDTOR]]
-// CHECK-NEXT:   %[[CALL:.*]] = call x86_thiscallcc ptr %[[VDTOR]](ptr {{[^,]*}} %[[OBJ_PTR_VALUE]], i32 5)
+// CLANG21-NEXT:   %[[CALL:.*]] = call x86_thiscallcc ptr %[[VDTOR]](ptr {{[^,]*}} %[[OBJ_PTR_VALUE]], i32 5)
+// CLANG20-NEXT:   %[[CALL:.*]] = call x86_thiscallcc ptr %[[VDTOR]](ptr {{[^,]*}} %[[OBJ_PTR_VALUE]], i32 0)
+// CLANG20-NEXT: call void @"??3@YAXPAX@Z"(ptr %[[CALL]])
 // CHECK:      ret void
 }
 
@@ -495,4 +498,20 @@ void checkH() {
 // DTORS-NEXT:   %[[RET:.*]] = load ptr, ptr %[[RETVAL]]
 // DTORS-NEXT:   ret ptr %[[RET]]
 
+// CLANG20:      define linkonce_odr dso_local x86_thiscallcc ptr @"??_GH@operator_delete@@EAEPAXI@Z"(ptr {{[^,]*}} %this, i32 %should_call_delete) {{.*}} comdat {{.*}} {
+// CLANG20:        store i32 %should_call_delete, ptr %[[SHOULD_DELETE_VAR:[0-9a-z._]+]], align 4
+// CLANG20:        store ptr %{{.*}}, ptr %[[RETVAL:retval]]
+// CLANG20:        %[[SHOULD_DELETE_VALUE:[0-9a-z._]+]] = load i32, ptr %[[SHOULD_DELETE_VAR]]
+// CLANG20:        call x86_thiscallcc void @"??1H@operator_delete@@EAE@XZ"(ptr {{[^,]*}} %[[THIS:[0-9a-z]+]])
+// CLANG20-NEXT:   %[[AND:[0-9]+]] = and i32 %[[SHOULD_DELETE_VALUE]], 1
+// CLANG20-NEXT:   %[[CONDITION:[0-9]+]] = icmp eq i32 %[[AND]], 0
+// CLANG20-NEXT:   br i1 %[[CONDITION]], label %[[CONTINUE_LABEL:[0-9a-z._]+]], label %[[CALL_DELETE_LABEL:[0-9a-z._]+]]
+//
+// CLANG20:      [[CALL_DELETE_LABEL]]
+// CLANG20-NEXT:   call void @"??3H@operator_delete@@CAXPAX@Z"(ptr %[[THIS:[0-9a-z]+]])
+// CLANG20-NEXT:   br label %[[CONTINUE_LABEL]]
+//
+// CLANG20:      [[CONTINUE_LABEL]]
+// CLANG20-NEXT:   %[[RET:.*]] = load ptr, ptr %[[RETVAL]]
+// CLANG20-NEXT:   ret ptr %[[RET]]
 }
