use CIRDataLayout to get some ABI info

clang/lib/CIR/Dialect/Transforms/LoweringPrepare.cpp

@@ -17,6 +17,7 @@
 #include "clang/Basic/Module.h"
 #include "clang/Basic/TargetInfo.h"
 #include "clang/CIR/Dialect/Builder/CIRBaseBuilder.h"
+#include "clang/CIR/Dialect/IR/CIRDataLayout.h"
 #include "clang/CIR/Dialect/IR/CIRDialect.h"
 #include "clang/CIR/Dialect/Passes.h"
 #include "clang/CIR/Interfaces/ASTAttrInterfaces.h"
@@ -334,8 +335,9 @@ static void canonicalizeIntrinsicThreeWayCmp(CIRBaseBuilderTy &builder,
 void LoweringPreparePass::lowerVAArgOp(VAArgOp op) {
   CIRBaseBuilderTy builder(getContext());
   builder.setInsertionPoint(op);
+  ::cir::CIRDataLayout datalayout(theModule);
 
-  auto res = cxxABI->lowerVAArg(builder, op);
+  auto res = cxxABI->lowerVAArg(builder, op, datalayout);
   if (res) {
     op.replaceAllUsesWith(res);
     op.erase();

clang/lib/CIR/Dialect/Transforms/LoweringPrepareAArch64CXXABI.cpp

@@ -15,6 +15,7 @@
 #include "../IR/MissingFeatures.h"
 #include "LoweringPrepareItaniumCXXABI.h"
 #include "clang/AST/CharUnits.h"
+#include "clang/CIR/Dialect/IR/CIRDataLayout.h"
 #include "clang/CIR/Dialect/IR/CIRTypes.h"
 
 #include <assert.h>
@@ -25,20 +26,23 @@ namespace {
 class LoweringPrepareAArch64CXXABI : public LoweringPrepareItaniumCXXABI {
 public:
   LoweringPrepareAArch64CXXABI(AArch64ABIKind k) : Kind(k) {}
-  mlir::Value lowerVAArg(cir::CIRBaseBuilderTy &builder,
-                         mlir::cir::VAArgOp op) override;
+  mlir::Value lowerVAArg(cir::CIRBaseBuilderTy &builder, mlir::cir::VAArgOp op,
+                         const cir::CIRDataLayout &datalayout) override;
 
 private:
   AArch64ABIKind Kind;
   mlir::Value lowerAAPCSVAArg(cir::CIRBaseBuilderTy &builder,
-                              mlir::cir::VAArgOp op);
+                              mlir::cir::VAArgOp op,
+                              const cir::CIRDataLayout &datalayout);
   bool isDarwinPCS() const { return Kind == AArch64ABIKind::DarwinPCS; }
   mlir::Value lowerMSVAArg(cir::CIRBaseBuilderTy &builder,
-                           mlir::cir::VAArgOp op) {
+                           mlir::cir::VAArgOp op,
+                           const cir::CIRDataLayout &datalayout) {
     llvm_unreachable("MSVC ABI not supported yet");
   }
   mlir::Value lowerDarwinVAArg(cir::CIRBaseBuilderTy &builder,
-                               mlir::cir::VAArgOp op) {
+                               mlir::cir::VAArgOp op,
+                               const cir::CIRDataLayout &datalayout) {
     llvm_unreachable("Darwin ABI not supported yet");
   }
 };
@@ -49,9 +53,9 @@ cir::LoweringPrepareCXXABI::createAArch64ABI(AArch64ABIKind k) {
   return new LoweringPrepareAArch64CXXABI(k);
 }
 
-mlir::Value
-LoweringPrepareAArch64CXXABI::lowerAAPCSVAArg(cir::CIRBaseBuilderTy &builder,
-                                              mlir::cir::VAArgOp op) {
+mlir::Value LoweringPrepareAArch64CXXABI::lowerAAPCSVAArg(
+    cir::CIRBaseBuilderTy &builder, mlir::cir::VAArgOp op,
+    const cir::CIRDataLayout &datalayout) {
   auto loc = op->getLoc();
   auto valist = op->getOperand(0);
   auto opResTy = op.getType();
@@ -118,9 +122,10 @@ LoweringPrepareAArch64CXXABI::lowerAAPCSVAArg(cir::CIRBaseBuilderTy &builder,
   assert(!cir::MissingFeatures::supportTyAlignQueryForAArch64());
   // One is just place holder for now, as we don't have a way to query
   // type size and alignment.
-  clang::CharUnits tySize = clang::CharUnits::One();
-  clang::CharUnits tyAlign = clang::CharUnits::One();
-  ;
+  clang::CharUnits tySize =
+      clang::CharUnits::fromQuantity(datalayout.getTypeStoreSize(opResTy));
+  clang::CharUnits tyAlign =
+      clang::CharUnits::fromQuantity(datalayout.getAlignment(opResTy, true));
 
   // indirectness, type size and type alignment all
   // decide regSize, but they are all ABI defined
@@ -215,9 +220,10 @@ LoweringPrepareAArch64CXXABI::lowerAAPCSVAArg(cir::CIRBaseBuilderTy &builder,
   uint64_t numMembers = 0;
   assert(!cir::MissingFeatures::supportisHomogeneousAggregateQueryForAArch64());
   bool isHFA = false;
+  // though endianess can be known from datalayout, it might need an unified
+  // ABI lowering query system to answer the question.
   assert(!cir::MissingFeatures::supportisEndianQueryForAArch64());
-  // TODO: endianess should be query result from ABI info
-  bool isBigEndian = false;
+  bool isBigEndian = datalayout.isBigEndian();
   assert(!cir::MissingFeatures::supportisAggregateTypeForABIAArch64());
   // TODO: isAggregateTypeForABI should be query result from ABI info
   bool isAggregateTypeForABI = false;
@@ -336,8 +342,9 @@ LoweringPrepareAArch64CXXABI::lowerAAPCSVAArg(cir::CIRBaseBuilderTy &builder,
 
 mlir::Value
 LoweringPrepareAArch64CXXABI::lowerVAArg(cir::CIRBaseBuilderTy &builder,
-                                         mlir::cir::VAArgOp op) {
-  return Kind == AArch64ABIKind::Win64 ? lowerMSVAArg(builder, op)
-         : isDarwinPCS()               ? lowerDarwinVAArg(builder, op)
-                                       : lowerAAPCSVAArg(builder, op);
+                                         mlir::cir::VAArgOp op,
+                                         const cir::CIRDataLayout &datalayout) {
+  return Kind == AArch64ABIKind::Win64 ? lowerMSVAArg(builder, op, datalayout)
+         : isDarwinPCS() ? lowerDarwinVAArg(builder, op, datalayout)
+                         : lowerAAPCSVAArg(builder, op, datalayout);
 }

clang/lib/CIR/Dialect/Transforms/LoweringPrepareCXXABI.h

@@ -18,6 +18,7 @@
 #include "mlir/IR/Value.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/CIR/Dialect/Builder/CIRBaseBuilder.h"
+#include "clang/CIR/Dialect/IR/CIRDataLayout.h"
 #include "clang/CIR/Dialect/IR/CIRDialect.h"
 
 namespace cir {
@@ -36,7 +37,8 @@ class LoweringPrepareCXXABI {
   static LoweringPrepareCXXABI *createAArch64ABI(AArch64ABIKind k);
 
   virtual mlir::Value lowerVAArg(CIRBaseBuilderTy &builder,
-                                 mlir::cir::VAArgOp op) = 0;
+                                 mlir::cir::VAArgOp op,
+                                 const cir::CIRDataLayout &datalayout) = 0;
   virtual ~LoweringPrepareCXXABI() {}
 
   virtual mlir::Value lowerDynamicCast(CIRBaseBuilderTy &builder,

clang/lib/CIR/Dialect/Transforms/LoweringPrepareItaniumCXXABI.cpp

@@ -20,6 +20,7 @@
 #include "clang/Basic/TargetInfo.h"
 #include "clang/CIR/Dialect/Builder/CIRBaseBuilder.h"
 #include "clang/CIR/Dialect/IR/CIRAttrs.h"
+#include "clang/CIR/Dialect/IR/CIRDataLayout.h"
 #include "clang/CIR/Dialect/IR/CIRDialect.h"
 
 using namespace cir;
@@ -160,8 +161,9 @@ LoweringPrepareItaniumCXXABI::lowerDynamicCast(CIRBaseBuilderTy &builder,
       .getResult();
 }
 
-mlir::Value LoweringPrepareItaniumCXXABI::lowerVAArg(CIRBaseBuilderTy &builder,
-                                                     mlir::cir::VAArgOp op) {
+mlir::Value LoweringPrepareItaniumCXXABI::lowerVAArg(
+    CIRBaseBuilderTy &builder, mlir::cir::VAArgOp op,
+    const ::cir::CIRDataLayout &datalayout) {
   // There is no generic cir lowering for var_arg, here we fail
   // so to prevent attempt of calling lowerVAArg for ItaniumCXXABI
   llvm_unreachable("NYI");

clang/lib/CIR/Dialect/Transforms/LoweringPrepareItaniumCXXABI.h

@@ -12,12 +12,13 @@
 //===----------------------------------------------------------------------===//
 
 #include "LoweringPrepareCXXABI.h"
+#include "clang/CIR/Dialect/IR/CIRDataLayout.h"
 
 class LoweringPrepareItaniumCXXABI : public cir::LoweringPrepareCXXABI {
 public:
   mlir::Value lowerDynamicCast(cir::CIRBaseBuilderTy &builder,
                                clang::ASTContext &astCtx,
                                mlir::cir::DynamicCastOp op) override;
-  mlir::Value lowerVAArg(cir::CIRBaseBuilderTy &builder,
-                         mlir::cir::VAArgOp op) override;
+  mlir::Value lowerVAArg(cir::CIRBaseBuilderTy &builder, mlir::cir::VAArgOp op,
+                         const cir::CIRDataLayout &datalayout) override;
 };