Fix conflicts.

1> fix conflicts. 2> Revert 5c9f768. See: KhronosGroup/SPIRV-LLVM-Translator#2357 #12698
intel · Feb 13, 2024 · 4baf315 · 4baf315
1 parent 4cf0104
commit 4baf315
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git 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
@@ -34,7 +34,7 @@ cl::opt<bool>
     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 &&