CR feedback

Author: Fznamznon

clang/include/clang/Sema/Sema.h

@@ -8548,10 +8548,10 @@ class Sema final : public SemaBase {
                                               ImplicitDeallocationParameters,
                                               DeclarationName Name,
                                               bool Diagnose = true);
-  FunctionDecl *
-  FindDeallocationFunctionForDestructor(SourceLocation StartLoc,
-                                        CXXRecordDecl *RD, bool Diagnose = true,
-                                        bool LookForGlobal = false);
+  FunctionDecl *FindDeallocationFunctionForDestructor(SourceLocation StartLoc,
+                                                      CXXRecordDecl *RD,
+                                                      bool Diagnose,
+                                                      bool LookForGlobal);
 
   /// ActOnCXXDelete - Parsed a C++ 'delete' expression (C++ 5.3.5), as in:
   /// @code ::delete ptr; @endcode

clang/lib/CodeGen/CGClass.cpp

@@ -1613,9 +1613,9 @@ namespace {
     assert(OD->isDestroyingOperatorDelete() == ReturnAfterDelete &&
            "unexpected value for ReturnAfterDelete");
     auto *CondTy = cast<llvm::IntegerType>(ShouldDeleteCondition->getType());
-    // MSVC calls  global operator delete inside of dtor body, but clang aligned
-    // with this behavior only after a particular version and started emitting
-    // code that is not ABI-compatible with previous versions.
+    // MSVC calls global operator delete inside of the dtor body, but clang
+    // aligned with this behavior only after a particular version. This is not
+    // ABI-compatible with previous versions.
     ASTContext &Context = CGF.getContext();
     bool CallGlobDelete =
         Context.getTargetInfo().callGlobalDeleteInDeletingDtor(

clang/lib/CodeGen/MicrosoftCXXABI.cpp

@@ -2030,12 +2030,12 @@ llvm::Value *MicrosoftCXXABI::EmitVirtualDestructorCall(
   CGCallee Callee = CGCallee::forVirtual(CE, GD, This, Ty);
 
   ASTContext &Context = getContext();
-  llvm::Value *ImplicitParam = llvm::ConstantInt::get(
-      llvm::IntegerType::getInt32Ty(CGF.getLLVMContext()),
-      (DtorType == Dtor_Deleting) |
-          4 * (D && D->isGlobalDelete() &&
-               Context.getTargetInfo().callGlobalDeleteInDeletingDtor(
-                   Context.getLangOpts())));
+  bool IsDeleting = DtorType == Dtor_Deleting;
+  bool IsGlobalDelete = D && D->isGlobalDelete() &&
+                        Context.getTargetInfo().callGlobalDeleteInDeletingDtor(
+                            Context.getLangOpts());
+  llvm::Value *ImplicitParam =
+      CGF.Builder.getInt32((IsDeleting ? 1 : 0) | (IsGlobalDelete ? 4 : 0));
 
   QualType ThisTy;
   if (CE) {

clang/lib/Sema/SemaDeclCXX.cpp

@@ -11123,8 +11123,8 @@ bool Sema::CheckDestructor(CXXDestructorDecl *Destructor) {
       Loc = RD->getLocation();
 
     // If we have a virtual destructor, look up the deallocation function
-    if (FunctionDecl *OperatorDelete =
-            FindDeallocationFunctionForDestructor(Loc, RD)) {
+    if (FunctionDecl *OperatorDelete = FindDeallocationFunctionForDestructor(
+            Loc, RD, /*Diagnose=*/true, /*LookForGlobal=*/false)) {
       Expr *ThisArg = nullptr;
 
       // If the notional 'delete this' expression requires a non-trivial