Small merge and rebase tweak

- A small upstream funciton change that required a new argument to be added to an invocation we make downstream
- lost some emplace and reset calls in the rebase, need to re-add

Author: agozillon

llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp

@@ -4682,7 +4682,7 @@ void OpenMPIRBuilder::setOutlinedTargetRegionFunctionAttributes(
                           std::to_string(NumTeamsValue));
 
   if (ThreadLimitValue == -1 && Config.isGPU())
-    ThreadLimitValue = getGridValue(OutlinedFn).GV_Default_WG_Size;
+    ThreadLimitValue = getGridValue(T, OutlinedFn).GV_Default_WG_Size;
 
   if (ThreadLimitValue > 0) {
     if (OutlinedFn->getCallingConv() == CallingConv::AMDGPU_KERNEL) {

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

@@ -2553,6 +2553,7 @@ convertOmpTarget(Operation &opInst, llvm::IRBuilderBase &builder,
       kernelInput.push_back(useValue);
   }
 
+  ompBuilder->CurrentTargetInfo.emplace();
   builder.restoreIP(moduleTranslation.getOpenMPBuilder()->createTarget(
       ompLoc, targetOp.isTargetSPMDLoop(), allocaIP, builder.saveIP(), entryInfo,
        kernelInput, genMapInfoCB, bodyCB, argAccessorCB));
@@ -2562,6 +2563,8 @@ convertOmpTarget(Operation &opInst, llvm::IRBuilderBase &builder,
   if (moduleTranslation.getOpenMPBuilder()->Config.isTargetDevice())
     handleDeclareTargetMapVar(mapData, moduleTranslation, builder);
 
+  ompBuilder->CurrentTargetInfo.reset();
+
   return bodyGenStatus;
 }