From 63a92041782fe98df2ef3e33f9d563b34fc01c7a Mon Sep 17 00:00:00 2001 From: iclsrc Date: Sun, 10 Oct 2021 20:43:05 -0700 Subject: [PATCH] Resolve of merge (conflict) 41c5608d Fix the use of report_fatal_error '"master"' -> '"xmain-web"' (23 commits) (#29) * Resolve of merge (conflict) 41c5608d 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 41c5608d48d86595679a4f85126c3e0b9620d79e Author: Nikita Kornev Date: Thu Oct 7 10:17:45 2021 +0300 Fix the use of report_fatal_error * Resolve of merge (conflict) 41c5608d 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 41c5608d48d86595679a4f85126c3e0b9620d79e Author: Nikita Kornev Date: Thu Oct 7 10:17:45 2021 +0300 Fix the use of report_fatal_error Co-authored-by: iclsrc --- lib/SPIRV/SPIRVLowerBitCastToNonStandardType.cpp | 6 ------ lib/SPIRV/SPIRVUtil.cpp | 4 ---- 2 files changed, 10 deletions(-) diff --git a/lib/SPIRV/SPIRVLowerBitCastToNonStandardType.cpp b/lib/SPIRV/SPIRVLowerBitCastToNonStandardType.cpp index 67612309aa..ec2de2058d 100644 --- 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 index 9afc99970f..bd9cbeb309 100644 --- a/lib/SPIRV/SPIRVUtil.cpp +++ b/lib/SPIRV/SPIRVUtil.cpp @@ -317,11 +317,7 @@ Function *getOrCreateFunction(Module *M, Type *RetTy, ArrayRef 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 =