From 4baf315985ffd49af29d45af18f1db3045dc14b5 Mon Sep 17 00:00:00 2001 From: Jennifer Yu Date: Mon, 12 Feb 2024 20:42:32 -0800 Subject: [PATCH] Fix conflicts. 1> fix conflicts. 2> Revert 5c9f7682b090. See: https://github.com/KhronosGroup/SPIRV-LLVM-Translator/issues/2357 https://github.com/intel/llvm/issues/12698 --- clang/lib/CodeGen/CGAtomic.cpp | 6 ------ llvm/lib/IR/BasicBlock.cpp | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/clang/lib/CodeGen/CGAtomic.cpp b/clang/lib/CodeGen/CGAtomic.cpp index a97d2d3f131fc..d86997172b038 100644 --- a/clang/lib/CodeGen/CGAtomic.cpp +++ b/clang/lib/CodeGen/CGAtomic.cpp @@ -1087,15 +1087,9 @@ RValue CodeGenFunction::EmitAtomicExpr(AtomicExpr *E) { Args.add(RValue::get(CastToGenericAddrSpace(Val1.getPointer(), E->getVal1()->getType())), getContext().VoidPtrTy); -<<<<<<< HEAD - - AddDirectArgument(*this, Args, UseOptimizedLibcall, Val2.getPointer(), - MemTy, E->getExprLoc(), TInfo.Width); -======= Args.add(RValue::get(CastToGenericAddrSpace(Val2.getPointer(), E->getVal2()->getType())), getContext().VoidPtrTy); ->>>>>>> 5fdd094837c6d8437803ebf3ccc91c3d494a2ac8 Args.add(RValue::get(Order), getContext().IntTy); Order = OrderFail; break; diff --git a/llvm/lib/IR/BasicBlock.cpp b/llvm/lib/IR/BasicBlock.cpp index bf02eba9fb448..fe9d0d08c5fe9 100644 --- a/llvm/lib/IR/BasicBlock.cpp +++ b/llvm/lib/IR/BasicBlock.cpp @@ -34,7 +34,7 @@ cl::opt UseNewDbgInfoFormat("experimental-debuginfo-iterators", cl::desc("Enable communicating debuginfo positions " "through iterators, eliminating intrinsics"), - cl::init(true)); + cl::init(false)); DPMarker *BasicBlock::createMarker(Instruction *I) { assert(IsNewDbgInfoFormat &&