[Flang][OpenMP] Additional global address space modifications for device

A prior PR added a portion of the global address space modifications required for declare target to, this PR seeks to add a small amount more leftover from that PR.

The intent is to allow for more correct IR that the backends (in particular AMDGPU) can treat more aptly for optimisations and code correctness

1/3 required PRs to enable declare target to mapping, should look at PR 3/3 to check for full green passes (this one will fail a number due to some dependencies).

Co-authored-by: Raghu Maddhipatla [email protected]

Author: agozillon

llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp

@@ -7561,8 +7561,12 @@ static Expected<Function *> createOutlinedFunction(
     // preceding mapped arguments that refer to the same global that may be
     // seperate segments. To prevent this, we defer global processing until all
     // other processing has been performed.
+<<<<<<< HEAD
     if (llvm::isa<llvm::GlobalValue, llvm::GlobalObject, llvm::GlobalVariable>(
             removeASCastIfPresent(Input))) {
+=======
+    if (llvm::isa<llvm::GlobalValue, llvm::GlobalObject, llvm::GlobalVariable>(removeASCastIfPresent(Input))) {
+>>>>>>> 65492890a185 ([Flang][OpenMP] Additional global address space modifications for device)
       DeferredReplacement.push_back(std::make_pair(Input, InputCopy));
       continue;
     }