This patch reverts the fix added in llvm#85218 in favour of a better approach.

Author: TIFitis

llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp

@@ -4886,11 +4886,8 @@ OpenMPIRBuilder::InsertPointTy OpenMPIRBuilder::createTargetData(
     return InsertPointTy();
 
   // Disable TargetData CodeGen on Device pass.
-  if (Config.IsTargetDevice.value_or(false)) {
-    if (BodyGenCB)
-      Builder.restoreIP(BodyGenCB(Builder.saveIP(), BodyGenTy::NoPriv));
+  if (Config.IsTargetDevice.value_or(false))
     return Builder.saveIP();
-  }
 
   Builder.restoreIP(CodeGenIP);
   bool IsStandAlone = !BodyGenCB;