[CIR][Lowering][TBAA] distinct C and C++

Author: PikachuHyA

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

@@ -23,6 +23,7 @@
 #include "mlir/IR/Attributes.h"
 #include "mlir/IR/BuiltinAttributes.h"
 #include "mlir/IR/PatternMatch.h"
+#include "mlir/Support/LLVM.h"
 #include "mlir/Support/LogicalResult.h"
 #include "clang/CIR/Target/AArch64.h"
 #include "llvm/Support/ErrorHandling.h"
@@ -242,6 +243,12 @@ createLowerModule(mlir::ModuleOp module, mlir::PatternRewriter &rewriter) {
   // Create context.
   cir_cconv_assert(!cir::MissingFeatures::langOpts());
   clang::LangOptions langOpts;
+  if (auto langAttr = mlir::cast_if_present<cir::LangAttr>(
+          module->getAttr(cir::CIRDialect::getLangAttrName()))) {
+    if (langAttr.isCXX()) {
+      langOpts.CPlusPlus = true;
+    }
+  }
 
   // FIXME(cir): This just uses the default code generation options. We need to
   // account for custom options.

clang/lib/CIR/Lowering/DirectToLLVM/LowerTBAAToLLVM.cpp

@@ -14,8 +14,8 @@ namespace direct {
 
 class CIRToLLVMTBAAAttrLowering {
 public:
-  CIRToLLVMTBAAAttrLowering(mlir::MLIRContext *mlirContext)
-      : mlirContext(mlirContext) {}
+  CIRToLLVMTBAAAttrLowering(mlir::MLIRContext *mlirContext, bool isCPlusPlus)
+      : mlirContext(mlirContext), isCPlusPlus(isCPlusPlus) {}
 
   mlir::LLVM::TBAATypeDescriptorAttr
   lowerCIRTBAAAttrToLLVMTBAAAttr(mlir::Attribute tbaa) {
@@ -44,7 +44,11 @@ class CIRToLLVMTBAAAttrLowering {
 
 private:
   mlir::LLVM::TBAARootAttr getRoot() {
-    return createTBAARoot("Simple C/C++ TBAA");
+    if (isCPlusPlus) {
+      return createTBAARoot("Simple C++ TBAA");
+    } else {
+      return createTBAARoot("Simple C/C++ TBAA");
+    }
   }
 
   mlir::LLVM::TBAATypeDescriptorAttr getChar() {
@@ -67,13 +71,15 @@ class CIRToLLVMTBAAAttrLowering {
   }
 
   mlir::MLIRContext *mlirContext;
+  bool isCPlusPlus;
 };
 
 mlir::ArrayAttr lowerCIRTBAAAttr(mlir::Attribute tbaa,
                                  mlir::ConversionPatternRewriter &rewriter,
                                  cir::LowerModule *lowerMod) {
   auto *ctx = rewriter.getContext();
-  CIRToLLVMTBAAAttrLowering lower(ctx);
+  CIRToLLVMTBAAAttrLowering lower(
+      ctx, lowerMod->getContext().getLangOpts().CPlusPlus);
   if (auto tbaaTag = mlir::dyn_cast<cir::TBAATagAttr>(tbaa)) {
     mlir::LLVM::TBAATypeDescriptorAttr accessType =
         lower.lowerCIRTBAAAttrToLLVMTBAAAttr(tbaaTag.getAccess());

clang/test/CIR/CodeGen/tbaa-struct.cpp

@@ -380,7 +380,7 @@ uint32_t g15(StructS *S, StructS3 *S3, uint64_t count) {
 // OLD-PATH: [[TAG_i32]] = !{[[TYPE_INT:!.*]], [[TYPE_INT]], i64 0}
 // OLD-PATH: [[TYPE_INT]] = !{!"int", [[TYPE_CHAR:!.*]], i64 0}
 // OLD-PATH: [[TYPE_CHAR]] = !{!"omnipotent char", [[TAG_cxx_tbaa:!.*]],
-// OLD-PATH: [[TAG_cxx_tbaa]] = !{!"Simple C/C++ TBAA"}
+// OLD-PATH: [[TAG_cxx_tbaa]] = !{!"Simple C++ TBAA"}
 // OLD-PATH: [[TAG_A_f32]] = !{[[TYPE_A:!.*]], [[TYPE_INT]], i64 4}
 // OLD-PATH: [[TYPE_A]] = !{!"_ZTS7StructA", [[TYPE_SHORT:!.*]], i64 0, [[TYPE_INT]], i64 4, [[TYPE_SHORT]], i64 8, [[TYPE_INT]], i64 12}
 // OLD-PATH: [[TYPE_SHORT:!.*]] = !{!"short", [[TYPE_CHAR]]