Address intermittent ICE triggered from the OpenMPIRBuilder::finalize method due to an invalid builder insertion point

Author: skatrak

mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp

@@ -5834,6 +5834,7 @@ convertOmpTarget(Operation &opInst, llvm::IRBuilderBase &builder,
 
 static LogicalResult
 convertDeclareTargetAttr(Operation *op, mlir::omp::DeclareTargetAttr attribute,
+ llvm::OpenMPIRBuilder *ompBuilder,
  LLVM::ModuleTranslation &moduleTranslation) {
  // Amend omp.declare_target by deleting the IR of the outlined functions
  // created for target regions. They cannot be filtered out from MLIR earlier
@@ -5856,6 +5857,11 @@ convertDeclareTargetAttr(Operation *op, mlir::omp::DeclareTargetAttr attribute,
  moduleTranslation.lookupFunction(funcOp.getName());
  llvmFunc->dropAllReferences();
  llvmFunc->eraseFromParent();
+
+ // Invalidate the builder's current insertion point, as it now points to
+ // a deleted block.
+ ompBuilder->Builder.ClearInsertionPoint();
+ ompBuilder->Builder.SetCurrentDebugLocation(llvm::DebugLoc());
  }
  }
  return success();
@@ -6300,9 +6306,12 @@ LogicalResult OpenMPDialectLLVMIRTranslationInterface::amendOperation(
  .Case("omp.declare_target",
  [&](Attribute attr) {
  if (auto declareTargetAttr =
- dyn_cast<omp::DeclareTargetAttr>(attr))
+ dyn_cast<omp::DeclareTargetAttr>(attr)) {
+ llvm::OpenMPIRBuilder *ompBuilder =
+ moduleTranslation.getOpenMPBuilder();
  return convertDeclareTargetAttr(op, declareTargetAttr,
- moduleTranslation);
+ ompBuilder, moduleTranslation);
+ }
  return failure();
  })
  .Case("omp.requires",