[CIR][ABI][AArch64][Lowering] Support structures with padding

clang/include/clang/CIR/MissingFeatures.h

@@ -401,9 +401,6 @@ struct MissingFeatures {
   // specs. We should make it always present.
   static bool makeTripleAlwaysPresent() { return false; }
 
-  // This Itanium bit is currently being skipped in cir.
-  static bool itaniumRecordLayoutBuilderFinishLayout() { return false; }
-
   static bool mustProgress() { return false; }
 };
 

clang/lib/CIR/Dialect/Transforms/TargetLowering/LowerFunction.cpp

@@ -278,6 +278,43 @@ cir::AllocaOp findAlloca(mlir::Operation *op) {
   return {};
 }
 
+/// Creates a coerced value from \param Src having a type of \param Ty which is
+/// a non primitive type
+mlir::Value createCoercedNonPrimitive(mlir::Value Src, mlir::Type Ty,
+                                      LowerFunction &LF) {
+  if (auto Load = mlir::dyn_cast<LoadOp>(Src.getDefiningOp())) {
+    auto &bld = LF.getRewriter();
+    auto Addr = Load.getAddr();
+
+    auto oldAlloca = mlir::dyn_cast<AllocaOp>(Addr.getDefiningOp());
+    auto Alloca = bld.create<AllocaOp>(
+        Src.getLoc(), bld.getType<PointerType>(Ty), Ty,
+        /*name=*/llvm::StringRef(""), oldAlloca.getAlignmentAttr());
+
+    auto Size = LF.LM.getDataLayout().getTypeStoreSize(Ty);
+    auto uInt64Ty = IntType::get(bld.getContext(), 64, false);
+    auto SizeVal = bld.create<ConstantOp>(Src.getLoc(), uInt64Ty,
+                                          IntAttr::get(uInt64Ty, Size));
+
+    auto VoidTy = VoidType::get(bld.getContext());
+    auto VoidPtrTy = PointerType::get(bld.getContext(), VoidTy);
+
+    auto SrcVoidPtr =
+        bld.create<CastOp>(Src.getLoc(), VoidPtrTy, CastKind::bitcast, Addr);
+    auto DestVoidPtr =
+        bld.create<CastOp>(Src.getLoc(), VoidPtrTy, CastKind::bitcast, Alloca);
+
+    bld.create<MemCpyOp>(Src.getLoc(), DestVoidPtr, SrcVoidPtr, SizeVal);
+
+    auto newLoad = bld.create<LoadOp>(Src.getLoc(), Alloca.getResult());
+    bld.replaceAllOpUsesWith(Load, newLoad);
+
+    return newLoad;
+  }
+
+  cir_cconv_unreachable("NYI");
+}
+
 /// After the calling convention is lowered, an ABI-agnostic type might have to
 /// be loaded back to its ABI-aware couterpart so it may be returned. If they
 /// differ, we have to do a coerced load. A coerced load, which means to load a
@@ -301,7 +338,8 @@ mlir::Value castReturnValue(mlir::Value Src, mlir::Type Ty, LowerFunction &LF) {
 
   auto intTy = mlir::dyn_cast<IntType>(Ty);
   if (intTy && !intTy.isPrimitive())
-    cir_cconv_unreachable("non-primitive types NYI");
+    return createCoercedNonPrimitive(Src, Ty, LF);
+
   llvm::TypeSize DstSize = LF.LM.getDataLayout().getTypeAllocSize(Ty);
 
   // FIXME(cir): Do we need the EnterStructPointerForCoercedAccess routine here?

clang/lib/CIR/Dialect/Transforms/TargetLowering/RecordLayoutBuilder.cpp

@@ -223,6 +223,10 @@ class ItaniumRecordLayoutBuilder {
   /// Initialize record layout for the given record decl.
   void initializeLayout(const Type Ty);
 
+  /// FinishLayout - Finalize record layout. Adjust record size based on the
+  /// alignment.
+  void finishLayout(const StructType D);
+
   uint64_t getDataSizeInBits() const { return DataSize; }
 
   void setDataSize(clang::CharUnits NewSize) {
@@ -243,8 +247,7 @@ void ItaniumRecordLayoutBuilder::layout(const StructType RT) {
   // FIXME(cir): Handle virtual-related layouts.
   cir_cconv_assert(!cir::MissingFeatures::getCXXRecordBases());
 
-  cir_cconv_assert(
-      !cir::MissingFeatures::itaniumRecordLayoutBuilderFinishLayout());
+  finishLayout(RT);
 }
 
 void ItaniumRecordLayoutBuilder::initializeLayout(const mlir::Type Ty) {
@@ -478,6 +481,31 @@ void ItaniumRecordLayoutBuilder::layoutFields(const StructType D) {
   }
 }
 
+void ItaniumRecordLayoutBuilder::finishLayout(const StructType D) {
+  // If we have any remaining field tail padding, include that in the overall
+  // size.
+  setSize(std::max(getSizeInBits(), (uint64_t)Context.toBits(PaddedFieldSize)));
+
+  // Finally, round the size of the record up to the alignment of the
+  // record itself.
+  uint64_t UnpaddedSize = getSizeInBits() - UnfilledBitsInLastUnit;
+  uint64_t UnpackedSizeInBits =
+      llvm::alignTo(getSizeInBits(), Context.toBits(UnpackedAlignment));
+
+  uint64_t RoundedSize = llvm::alignTo(
+      getSizeInBits(),
+      Context.toBits(!Context.getTargetInfo().defaultsToAIXPowerAlignment()
+                         ? Alignment
+                         : PreferredAlignment));
+
+  if (UseExternalLayout) {
+    cir_cconv_unreachable("NYI");
+  }
+
+  // Set the size to the final size.
+  setSize(RoundedSize);
+}
+
 void ItaniumRecordLayoutBuilder::UpdateAlignment(
     clang::CharUnits NewAlignment, clang::CharUnits UnpackedNewAlignment,
     clang::CharUnits PreferredNewAlignment) {
@@ -522,12 +550,12 @@ void ItaniumRecordLayoutBuilder::checkFieldPadding(
   // Warn if padding was introduced to the struct/class.
   if (!IsUnion && Offset > UnpaddedOffset) {
     unsigned PadSize = Offset - UnpaddedOffset;
-    // bool InBits = true;
+    bool InBits = true;
     if (PadSize % CharBitNum == 0) {
       PadSize = PadSize / CharBitNum;
-      // InBits = false;
+      InBits = false;
     }
-    cir_cconv_assert(cir::MissingFeatures::bitFieldPaddingDiagnostics());
+    cir_cconv_assert(!cir::MissingFeatures::bitFieldPaddingDiagnostics());
   }
   if (isPacked && Offset != UnpackedOffset) {
     HasPackedField = true;

clang/test/CIR/CallConvLowering/AArch64/aarch64-cc-structs.c

@@ -152,3 +152,32 @@ void pass_eq_128(EQ_128 s) {}
 // LLVM:   store ptr %0, ptr %[[#V1]], align 8
 // LLVM:   %[[#V2:]] = load ptr, ptr %[[#V1]], align 8
 void pass_gt_128(GT_128 s) {}
+
+typedef struct {
+  uint8_t a;
+  uint16_t b;
+  uint8_t c;
+} S_PAD;
+
+// CHECK: cir.func {{.*@ret_s_pad}}()  -> !u48i
+// CHECK: %[[#V0:]] = cir.alloca !ty_S_PAD, !cir.ptr<!ty_S_PAD>, ["__retval"] {alignment = 2 : i64}
+// CHECK: %[[#V1:]] = cir.load %[[#V0]] : !cir.ptr<!ty_S_PAD>, !ty_S_PAD
+// CHECK: %[[#V2:]] = cir.alloca !u48i, !cir.ptr<!u48i>, [""] {alignment = 2 : i64}
+// CHECK: %[[#V3:]] = cir.const #cir.int<6> : !u64i
+// CHECK: %[[#V4:]] = cir.cast(bitcast, %[[#V0]] : !cir.ptr<!ty_S_PAD>)
+// CHECK: %[[#V5:]] = cir.cast(bitcast, %[[#V2:]] : !cir.ptr<!u48i>), !cir.ptr<!void>
+// CHECK: cir.libc.memcpy %[[#V3]] bytes from %[[#V4]] to %[[#V5]] : !u64i, !cir.ptr<!void>
+// CHECK: %[[#V6:]] = cir.load %[[#V2]] : !cir.ptr<!u48i>
+// CHECK: cir.return %[[#V6]]
+
+// LLVM: i48 @ret_s_pad()
+// LLVM: %[[#V1:]] = alloca %struct.S_PAD, i64 1, align 2
+// LLVM: %[[#V2:]] = load %struct.S_PAD, ptr %[[#V1]], align 2
+// LLVM: %[[#V3:]] = alloca i48, i64 1, align 2
+// LLVM: call void @llvm.memcpy.p0.p0.i64(ptr %[[#V3]], ptr %[[#V1]], i64 6, i1 false)
+// LLVM: %[[#V4:]] = load i48, ptr %[[#V3]]
+// LLVM: ret i48 %[[#V4]]
+S_PAD ret_s_pad() {
+  S_PAD s;
+  return s;
+}