Resolve of merge (conflict) 41c5608 Fix the use of report_fatal_error…

… '"master"' -> '"xmain-web"' (23 commits) (KhronosGroup#29) * Resolve of merge (conflict) 41c5608 Fix the use of report_fatal_error '"master"' -> '"xmain-web"' (23 commits) CONFLICT (content): Merge conflict in lib/SPIRV/SPIRVUtil.cpp CONFLICT (content): Merge conflict in lib/SPIRV/SPIRVLowerBitCastToNonStandardType.cpp commit 41c5608 Author: Nikita Kornev <[email protected]> Date: Thu Oct 7 10:17:45 2021 +0300 Fix the use of report_fatal_error * Resolve of merge (conflict) 41c5608 Fix the use of report_fatal_error '"master"' -> '"xmain-web"' (23 commits) CONFLICT (content): Merge conflict in lib/SPIRV/SPIRVUtil.cpp CONFLICT (content): Merge conflict in lib/SPIRV/SPIRVLowerBitCastToNonStandardType.cpp commit 41c5608 Author: Nikita Kornev <[email protected]> Date: Thu Oct 7 10:17:45 2021 +0300 Fix the use of report_fatal_error Co-authored-by: iclsrc <[email protected]>
vmaksimo · Oct 11, 2021 · 63a9204 · 63a9204
1 parent 872c424
commit 63a9204
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/lib/SPIRV/SPIRVLowerBitCastToNonStandardType.cpp b/lib/SPIRV/SPIRVLowerBitCastToNonStandardType.cpp
@@ -170,16 +170,10 @@ class SPIRVLowerBitCastToNonStandardTypePass
         if (SrcVecTy) {
           uint64_t NumElemsInSrcVec = SrcVecTy->getElementCount().getValue();
           if (!isValidVectorSize(NumElemsInSrcVec))
-<<<<<<< HEAD
-            report_fatal_error(Twine("Unsupported vector type with the size of: " +
-                                   std::to_string(NumElemsInSrcVec)),
-                               false);
-=======
             report_fatal_error(
                 llvm::Twine("Unsupported vector type with the size of: " +
                             std::to_string(NumElemsInSrcVec)),
                 false);
->>>>>>> 41c5608d48d86595679a4f85126c3e0b9620d79e
         }
         VectorType *DestVecTy = getVectorType(BC->getDestTy());
         if (DestVecTy) {

diff --git a/lib/SPIRV/SPIRVUtil.cpp b/lib/SPIRV/SPIRVUtil.cpp
@@ -317,11 +317,7 @@ Function *getOrCreateFunction(Module *M, Type *RetTy, ArrayRef<Type *> ArgTypes,
     raw_string_ostream SS(S);
     SS << "Error: Attempt to redefine function: " << *F << " => " << *FT
        << '\n';
-<<<<<<< HEAD
-    report_fatal_error(Twine(SS.str()), false);
-=======
     report_fatal_error(llvm::Twine(SS.str()), false);
->>>>>>> 41c5608d48d86595679a4f85126c3e0b9620d79e
   }
   if (!F || F->getFunctionType() != FT) {
     auto NewF =