[MLIR][LLVMIR][HACK] Emit scope for DIDerivedType

Author: frabert

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

@@ -643,8 +643,8 @@ class LLVM_DbgIntrOp<string name, string argName, list<Trait> traits = []>
     builder.CreateCall(fn, {
         llvm::MetadataAsValue::get(ctx,
             llvm::ValueAsMetadata::get(moduleTranslation.lookupValue(opInst.getOperand(0)))),
-        llvm::MetadataAsValue::get(ctx, moduleTranslation.translateDebugInfo($varInfo)),
-        llvm::MetadataAsValue::get(ctx, moduleTranslation.translateExpression($locationExpr)),
+        llvm::MetadataAsValue::get(ctx, moduleTranslation.translateDebugInfo($varInfo, nullptr)),
+        llvm::MetadataAsValue::get(ctx, moduleTranslation.translateExpression($locationExpr, nullptr)),
       });
   }];
   let mlirBuilder = [{
@@ -709,7 +709,7 @@ def LLVM_DbgLabelOp : LLVM_IntrOp<"dbg.label", [], [], [], 0> {
     llvm::Function *fn =
       llvm::Intrinsic::getOrInsertDeclaration(module, llvm::Intrinsic::dbg_label);
     builder.CreateCall(fn, {
-        llvm::MetadataAsValue::get(ctx, moduleTranslation.translateDebugInfo($label))
+        llvm::MetadataAsValue::get(ctx, moduleTranslation.translateDebugInfo($label, nullptr))
       });
   }];
   let mlirBuilder = [{

mlir/include/mlir/Target/LLVMIR/ModuleTranslation.h

@@ -211,14 +211,14 @@ class ModuleTranslation {
   llvm::DILocation *translateLoc(Location loc, llvm::DILocalScope *scope);
 
   /// Translates the given LLVM DWARF expression metadata.
-  llvm::DIExpression *translateExpression(LLVM::DIExpressionAttr attr);
+  llvm::DIExpression *translateExpression(LLVM::DIExpressionAttr attr, llvm::DIScope *scope);
 
   /// Translates the given LLVM global variable expression metadata.
   llvm::DIGlobalVariableExpression *
-  translateGlobalVariableExpression(LLVM::DIGlobalVariableExpressionAttr attr);
+  translateGlobalVariableExpression(LLVM::DIGlobalVariableExpressionAttr attr, llvm::DIScope *scope);
 
   /// Translates the given LLVM debug info metadata.
-  llvm::Metadata *translateDebugInfo(LLVM::DINodeAttr attr);
+  llvm::Metadata *translateDebugInfo(LLVM::DINodeAttr attr, llvm::DIScope *scope);
 
   /// Translates the given LLVM rounding mode metadata.
   llvm::RoundingMode translateRoundingMode(LLVM::RoundingMode rounding);