[CIR][NFC] Move code around to match OG

Author: bcardosolopes

clang/lib/CIR/CodeGen/CIRGenClass.cpp

@@ -1810,3 +1810,85 @@ void CIRGenFunction::buildCXXAggrConstructorCall(
   if (constantCount.use_empty())
     constantCount.erase();
 }
+
+void CIRGenFunction::buildCXXConstructorCall(const clang::CXXConstructorDecl *D,
+                                             clang::CXXCtorType Type,
+                                             bool ForVirtualBase,
+                                             bool Delegating,
+                                             AggValueSlot ThisAVS,
+                                             const clang::CXXConstructExpr *E) {
+  CallArgList Args;
+  Address This = ThisAVS.getAddress();
+  LangAS SlotAS = ThisAVS.getQualifiers().getAddressSpace();
+  QualType ThisType = D->getThisType();
+  LangAS ThisAS = ThisType.getTypePtr()->getPointeeType().getAddressSpace();
+  mlir::Value ThisPtr = This.getPointer();
+
+  assert(SlotAS == ThisAS && "This edge case NYI");
+
+  Args.add(RValue::get(ThisPtr), D->getThisType());
+
+  // In LLVM Codegen: If this is a trivial constructor, just emit what's needed.
+  // If this is a union copy constructor, we must emit a memcpy, because the AST
+  // does not model that copy.
+  if (isMemcpyEquivalentSpecialMember(D)) {
+    assert(!MissingFeatures::isMemcpyEquivalentSpecialMember());
+  }
+
+  const FunctionProtoType *FPT = D->getType()->castAs<FunctionProtoType>();
+  EvaluationOrder Order = E->isListInitialization()
+                              ? EvaluationOrder::ForceLeftToRight
+                              : EvaluationOrder::Default;
+
+  buildCallArgs(Args, FPT, E->arguments(), E->getConstructor(),
+                /*ParamsToSkip*/ 0, Order);
+
+  buildCXXConstructorCall(D, Type, ForVirtualBase, Delegating, This, Args,
+                          ThisAVS.mayOverlap(), E->getExprLoc(),
+                          ThisAVS.isSanitizerChecked());
+}
+
+void CIRGenFunction::buildCXXConstructorCall(
+    const CXXConstructorDecl *D, CXXCtorType Type, bool ForVirtualBase,
+    bool Delegating, Address This, CallArgList &Args,
+    AggValueSlot::Overlap_t Overlap, SourceLocation Loc,
+    bool NewPointerIsChecked) {
+
+  const auto *ClassDecl = D->getParent();
+
+  if (!NewPointerIsChecked)
+    buildTypeCheck(CIRGenFunction::TCK_ConstructorCall, Loc, This.getPointer(),
+                   getContext().getRecordType(ClassDecl), CharUnits::Zero());
+
+  // If this is a call to a trivial default constructor:
+  // In LLVM: do nothing.
+  // In CIR: emit as a regular call, other later passes should lower the
+  // ctor call into trivial initialization.
+  assert(!MissingFeatures::isTrivialCtorOrDtor());
+
+  if (isMemcpyEquivalentSpecialMember(D)) {
+    assert(!MissingFeatures::isMemcpyEquivalentSpecialMember());
+  }
+
+  bool PassPrototypeArgs = true;
+
+  assert(!D->getInheritedConstructor() && "inheritance NYI");
+
+  // Insert any ABI-specific implicit constructor arguments.
+  CIRGenCXXABI::AddedStructorArgCounts ExtraArgs =
+      CGM.getCXXABI().addImplicitConstructorArgs(*this, D, Type, ForVirtualBase,
+                                                 Delegating, Args);
+
+  // Emit the call.
+  auto CalleePtr = CGM.getAddrOfCXXStructor(GlobalDecl(D, Type));
+  const CIRGenFunctionInfo &Info = CGM.getTypes().arrangeCXXConstructorCall(
+      Args, D, Type, ExtraArgs.Prefix, ExtraArgs.Suffix, PassPrototypeArgs);
+  CIRGenCallee Callee = CIRGenCallee::forDirect(CalleePtr, GlobalDecl(D, Type));
+  mlir::cir::CIRCallOpInterface C;
+  buildCall(Info, Callee, ReturnValueSlot(), Args, &C, false, getLoc(Loc));
+
+  assert(CGM.getCodeGenOpts().OptimizationLevel == 0 ||
+         ClassDecl->isDynamicClass() || Type == Ctor_Base ||
+         !CGM.getCodeGenOpts().StrictVTablePointers &&
+             "vtable assumption loads NYI");
+}

clang/lib/CIR/CodeGen/CIRGenFunction.cpp

@@ -747,104 +747,6 @@ mlir::Value CIRGenFunction::createLoad(const VarDecl *VD, const char *Name) {
                                 addr.getElementType(), addr.getPointer());
 }
 
-static bool isMemcpyEquivalentSpecialMember(const CXXMethodDecl *D) {
-  auto *CD = llvm::dyn_cast<CXXConstructorDecl>(D);
-  if (!(CD && CD->isCopyOrMoveConstructor()) &&
-      !D->isCopyAssignmentOperator() && !D->isMoveAssignmentOperator())
-    return false;
-
-  // We can emit a memcpy for a trivial copy or move constructor/assignment
-  if (D->isTrivial() && !D->getParent()->mayInsertExtraPadding())
-    return true;
-
-  if (D->getParent()->isUnion() && D->isDefaulted())
-    return true;
-
-  return false;
-}
-
-void CIRGenFunction::buildCXXConstructorCall(const clang::CXXConstructorDecl *D,
-                                             clang::CXXCtorType Type,
-                                             bool ForVirtualBase,
-                                             bool Delegating,
-                                             AggValueSlot ThisAVS,
-                                             const clang::CXXConstructExpr *E) {
-  CallArgList Args;
-  Address This = ThisAVS.getAddress();
-  LangAS SlotAS = ThisAVS.getQualifiers().getAddressSpace();
-  QualType ThisType = D->getThisType();
-  LangAS ThisAS = ThisType.getTypePtr()->getPointeeType().getAddressSpace();
-  mlir::Value ThisPtr = This.getPointer();
-
-  assert(SlotAS == ThisAS && "This edge case NYI");
-
-  Args.add(RValue::get(ThisPtr), D->getThisType());
-
-  // In LLVM Codegen: If this is a trivial constructor, just emit what's needed.
-  // If this is a union copy constructor, we must emit a memcpy, because the AST
-  // does not model that copy.
-  if (isMemcpyEquivalentSpecialMember(D)) {
-    assert(!MissingFeatures::isMemcpyEquivalentSpecialMember());
-  }
-
-  const FunctionProtoType *FPT = D->getType()->castAs<FunctionProtoType>();
-  EvaluationOrder Order = E->isListInitialization()
-                              ? EvaluationOrder::ForceLeftToRight
-                              : EvaluationOrder::Default;
-
-  buildCallArgs(Args, FPT, E->arguments(), E->getConstructor(),
-                /*ParamsToSkip*/ 0, Order);
-
-  buildCXXConstructorCall(D, Type, ForVirtualBase, Delegating, This, Args,
-                          ThisAVS.mayOverlap(), E->getExprLoc(),
-                          ThisAVS.isSanitizerChecked());
-}
-
-void CIRGenFunction::buildCXXConstructorCall(
-    const CXXConstructorDecl *D, CXXCtorType Type, bool ForVirtualBase,
-    bool Delegating, Address This, CallArgList &Args,
-    AggValueSlot::Overlap_t Overlap, SourceLocation Loc,
-    bool NewPointerIsChecked) {
-
-  const auto *ClassDecl = D->getParent();
-
-  if (!NewPointerIsChecked)
-    buildTypeCheck(CIRGenFunction::TCK_ConstructorCall, Loc, This.getPointer(),
-                   getContext().getRecordType(ClassDecl), CharUnits::Zero());
-
-  // If this is a call to a trivial default constructor:
-  // In LLVM: do nothing.
-  // In CIR: emit as a regular call, other later passes should lower the
-  // ctor call into trivial initialization.
-  assert(!MissingFeatures::isTrivialCtorOrDtor());
-
-  if (isMemcpyEquivalentSpecialMember(D)) {
-    assert(!MissingFeatures::isMemcpyEquivalentSpecialMember());
-  }
-
-  bool PassPrototypeArgs = true;
-
-  assert(!D->getInheritedConstructor() && "inheritance NYI");
-
-  // Insert any ABI-specific implicit constructor arguments.
-  CIRGenCXXABI::AddedStructorArgCounts ExtraArgs =
-      CGM.getCXXABI().addImplicitConstructorArgs(*this, D, Type, ForVirtualBase,
-                                                 Delegating, Args);
-
-  // Emit the call.
-  auto CalleePtr = CGM.getAddrOfCXXStructor(GlobalDecl(D, Type));
-  const CIRGenFunctionInfo &Info = CGM.getTypes().arrangeCXXConstructorCall(
-      Args, D, Type, ExtraArgs.Prefix, ExtraArgs.Suffix, PassPrototypeArgs);
-  CIRGenCallee Callee = CIRGenCallee::forDirect(CalleePtr, GlobalDecl(D, Type));
-  mlir::cir::CIRCallOpInterface C;
-  buildCall(Info, Callee, ReturnValueSlot(), Args, &C, false, getLoc(Loc));
-
-  assert(CGM.getCodeGenOpts().OptimizationLevel == 0 ||
-         ClassDecl->isDynamicClass() || Type == Ctor_Base ||
-         !CGM.getCodeGenOpts().StrictVTablePointers &&
-             "vtable assumption loads NYI");
-}
-
 void CIRGenFunction::buildConstructorBody(FunctionArgList &Args) {
   // TODO: EmitAsanPrologueOrEpilogue(true);
   const auto *Ctor = cast<CXXConstructorDecl>(CurGD.getDecl());