diff options
Diffstat (limited to 'llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp')
| -rw-r--r-- | llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp b/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp index 7e3ab7354fdf..5980ee35a5cd 100644 --- a/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp +++ b/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp @@ -7585,12 +7585,8 @@ 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))) { ->>>>>>> 1d1536f712a6 ([Flang][OpenMP] Additional global address space modifications for device) DeferredReplacement.push_back(std::make_pair(Input, InputCopy)); continue; } |