[MLIR][LLVMIR] Add flags to DIDerivedTypeAttr

Author: frabert

mlir/include/mlir-c/Dialect/LLVM.h

@@ -265,7 +265,7 @@ MLIR_CAPI_EXPORTED MlirAttribute mlirLLVMDICompositeTypeAttrGet(
 /// and non-negative values indicate a value present.
 MLIR_CAPI_EXPORTED MlirAttribute mlirLLVMDIDerivedTypeAttrGet(
     MlirContext ctx, unsigned int tag, MlirAttribute name,
-    MlirAttribute baseType, uint64_t sizeInBits, uint32_t alignInBits,
+    MlirAttribute baseType, int64_t flags, uint64_t sizeInBits, uint32_t alignInBits,
     uint64_t offsetInBits, int64_t dwarfAddressSpace, MlirAttribute extraData);
 
 MLIR_CAPI_EXPORTED MlirAttribute mlirLLVMDIStringTypeAttrGet(

mlir/include/mlir/Dialect/LLVMIR/LLVMAttrDefs.td

@@ -474,6 +474,7 @@ def LLVM_DIDerivedTypeAttr : LLVM_Attr<"DIDerivedType", "di_derived_type",
                                        /*traits=*/[], "DITypeAttr"> {
   let parameters = (ins
     LLVM_DITagParameter:$tag,
+    "DIFlags":$flags,
     OptionalParameter<"StringAttr">:$name,
     OptionalParameter<"DITypeAttr">:$baseType,
     OptionalParameter<"uint64_t">:$sizeInBits,

mlir/include/mlir/Dialect/LLVMIR/LLVMIntrinsicOps.td

@@ -734,8 +734,8 @@ def LLVM_DbgAssignOp : LLVM_DbgIntrOp<"dbg.assign", "value"> {
     DefaultValuedAttr<LLVM_DIExpressionAttr, "{}">:$addressExpr
   );
   let assemblyFormat = [{
-    qualified($varInfo) (qualified($locationExpr)^)? qualified($assignId) 
-    (qualified($addressExpr)^)? `=` $value `,` $address `:` qualified(type($value)) `,` qualified(type($address)) attr-dict
+    qualified($varInfo) qualified($locationExpr) qualified($assignId)
+    qualified($addressExpr) `=` $value `,` $address `:` qualified(type($value)) `,` qualified(type($address)) attr-dict
   }];
 }
 

mlir/lib/CAPI/Dialect/LLVM.cpp

@@ -207,13 +207,13 @@ MlirAttribute mlirLLVMDICompositeTypeAttrGet(
 
 MlirAttribute mlirLLVMDIDerivedTypeAttrGet(
     MlirContext ctx, unsigned int tag, MlirAttribute name,
-    MlirAttribute baseType, uint64_t sizeInBits, uint32_t alignInBits,
+    MlirAttribute baseType, int64_t flags, uint64_t sizeInBits, uint32_t alignInBits,
     uint64_t offsetInBits, int64_t dwarfAddressSpace, MlirAttribute extraData) {
   std::optional<unsigned> addressSpace = std::nullopt;
   if (dwarfAddressSpace >= 0)
     addressSpace = (unsigned)dwarfAddressSpace;
   return wrap(DIDerivedTypeAttr::get(
-      unwrap(ctx), tag, cast<StringAttr>(unwrap(name)),
+      unwrap(ctx), tag, DIFlags(flags), cast<StringAttr>(unwrap(name)),
       cast<DITypeAttr>(unwrap(baseType)), sizeInBits, alignInBits, offsetInBits,
       addressSpace, cast<DINodeAttr>(unwrap(extraData))));
 }

mlir/lib/Target/LLVMIR/DebugImporter.cpp

@@ -102,9 +102,11 @@ DIDerivedTypeAttr DebugImporter::translateImpl(llvm::DIDerivedType *node) {
     return nullptr;
   DINodeAttr extraData =
       translate(dyn_cast_or_null<llvm::DINode>(node->getExtraData()));
+  std::optional<DIFlags> flags = symbolizeDIFlags(node->getFlags());
   return DIDerivedTypeAttr::get(
-      context, node->getTag(), getStringAttrOrNull(node->getRawName()),
-      baseType, node->getSizeInBits(), node->getAlignInBits(),
+      context, node->getTag(), flags.value_or(DIFlags::Zero),
+      getStringAttrOrNull(node->getRawName()), baseType,
+      node->getSizeInBits(), node->getAlignInBits(),
       node->getOffsetInBits(), node->getDWARFAddressSpace(), extraData);
 }
 

mlir/lib/Target/LLVMIR/DebugTranslation.cpp

@@ -201,7 +201,7 @@ llvm::DIDerivedType *DebugTranslation::translateImpl(DIDerivedTypeAttr attr) {
       /*Scope=*/nullptr, translate(attr.getBaseType()), attr.getSizeInBits(),
       attr.getAlignInBits(), attr.getOffsetInBits(),
       attr.getDwarfAddressSpace(), /*PtrAuthData=*/std::nullopt,
-      /*Flags=*/llvm::DINode::FlagZero, translate(attr.getExtraData()));
+      static_cast<llvm::DINode::DIFlags>(attr.getFlags()), translate(attr.getExtraData()));
 }
 
 llvm::DIStringType *DebugTranslation::translateImpl(DIStringTypeAttr attr) {