https://github.com/Troy-Butler created https://github.com/llvm/llvm-project/pull/89480
Addresses issue #85984 >From fba4b0556340a00c1e059a8abdba5fdd1b0e38ea Mon Sep 17 00:00:00 2001 From: Troy-Butler <squin...@outlook.com> Date: Mon, 25 Mar 2024 13:28:45 -0400 Subject: [PATCH 1/4] [LLVM][LIB] Refactor Redundant Condition Signed-off-by: Troy-Butler <squin...@outlook.com> --- llvm/lib/TextAPI/TextStub.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/llvm/lib/TextAPI/TextStub.cpp b/llvm/lib/TextAPI/TextStub.cpp index 0f742523f8207c..d903ba409360d6 100644 --- a/llvm/lib/TextAPI/TextStub.cpp +++ b/llvm/lib/TextAPI/TextStub.cpp @@ -276,7 +276,7 @@ namespace yaml { template <> struct MappingTraits<ExportSection> { static void mapping(IO &IO, ExportSection &Section) { const auto *Ctx = reinterpret_cast<TextAPIContext *>(IO.getContext()); - assert((!Ctx || (Ctx && Ctx->FileKind != FileType::Invalid)) && + assert((!Ctx || Ctx->FileKind != FileType::Invalid) && "File type is not set in YAML context"); IO.mapRequired("archs", Section.Architectures); @@ -298,7 +298,7 @@ template <> struct MappingTraits<ExportSection> { template <> struct MappingTraits<UndefinedSection> { static void mapping(IO &IO, UndefinedSection &Section) { const auto *Ctx = reinterpret_cast<TextAPIContext *>(IO.getContext()); - assert((!Ctx || (Ctx && Ctx->FileKind != FileType::Invalid)) && + assert((!Ctx || Ctx->FileKind != FileType::Invalid) && "File type is not set in YAML context"); IO.mapRequired("archs", Section.Architectures); >From 780151b741f5a992ee253f74f96cefbb2a2df960 Mon Sep 17 00:00:00 2001 From: Troy-Butler <squin...@outlook.com> Date: Mon, 25 Mar 2024 13:28:45 -0400 Subject: [PATCH 2/4] [LLVM][TextAPI] Refactor Redundant Condition Signed-off-by: Troy-Butler <squin...@outlook.com> --- llvm/lib/TextAPI/TextStub.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/llvm/lib/TextAPI/TextStub.cpp b/llvm/lib/TextAPI/TextStub.cpp index 0f742523f8207c..d903ba409360d6 100644 --- a/llvm/lib/TextAPI/TextStub.cpp +++ b/llvm/lib/TextAPI/TextStub.cpp @@ -276,7 +276,7 @@ namespace yaml { template <> struct MappingTraits<ExportSection> { static void mapping(IO &IO, ExportSection &Section) { const auto *Ctx = reinterpret_cast<TextAPIContext *>(IO.getContext()); - assert((!Ctx || (Ctx && Ctx->FileKind != FileType::Invalid)) && + assert((!Ctx || Ctx->FileKind != FileType::Invalid) && "File type is not set in YAML context"); IO.mapRequired("archs", Section.Architectures); @@ -298,7 +298,7 @@ template <> struct MappingTraits<ExportSection> { template <> struct MappingTraits<UndefinedSection> { static void mapping(IO &IO, UndefinedSection &Section) { const auto *Ctx = reinterpret_cast<TextAPIContext *>(IO.getContext()); - assert((!Ctx || (Ctx && Ctx->FileKind != FileType::Invalid)) && + assert((!Ctx || Ctx->FileKind != FileType::Invalid) && "File type is not set in YAML context"); IO.mapRequired("archs", Section.Architectures); >From 7315c8468ac411f73f1ba9c304aae7d6bdfa2132 Mon Sep 17 00:00:00 2001 From: Troy-Butler <squin...@outlook.com> Date: Thu, 18 Apr 2024 15:47:14 -0400 Subject: [PATCH 3/4] Fix Definition Mismatches Signed-off-by: Troy-Butler <squin...@outlook.com> --- .../include/clang/StaticAnalyzer/Core/PathSensitive/Store.h | 4 ++-- llvm/lib/Transforms/InstCombine/InstCombineInternal.h | 2 +- llvm/lib/Transforms/Vectorize/VPlan.h | 4 ++-- .../SparseTensor/Transforms/Utils/SparseTensorLevel.h | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/clang/include/clang/StaticAnalyzer/Core/PathSensitive/Store.h b/clang/include/clang/StaticAnalyzer/Core/PathSensitive/Store.h index fac0c04ae2caab..e60a49f68b7a0d 100644 --- a/clang/include/clang/StaticAnalyzer/Core/PathSensitive/Store.h +++ b/clang/include/clang/StaticAnalyzer/Core/PathSensitive/Store.h @@ -227,12 +227,12 @@ class StoreManager { /// information will not be used. virtual StoreRef invalidateRegions(Store store, ArrayRef<SVal> Values, - const Expr *E, unsigned Count, + const Expr *Ex, unsigned Count, const LocationContext *LCtx, const CallEvent *Call, InvalidatedSymbols &IS, RegionAndSymbolInvalidationTraits &ITraits, - InvalidatedRegions *InvalidatedTopLevel, + InvalidatedRegions *TopLevelRegions, InvalidatedRegions *Invalidated) = 0; /// enterStackFrame - Let the StoreManager to do something when execution diff --git a/llvm/lib/Transforms/InstCombine/InstCombineInternal.h b/llvm/lib/Transforms/InstCombine/InstCombineInternal.h index b9ad3a74007929..90293feb9c1b82 100644 --- a/llvm/lib/Transforms/InstCombine/InstCombineInternal.h +++ b/llvm/lib/Transforms/InstCombine/InstCombineInternal.h @@ -433,7 +433,7 @@ class LLVM_LIBRARY_VISIBILITY InstCombinerImpl final Value *foldAndOrOfICmpsOfAndWithPow2(ICmpInst *LHS, ICmpInst *RHS, Instruction *CxtI, bool IsAnd, bool IsLogical = false); - Value *matchSelectFromAndOr(Value *A, Value *B, Value *C, Value *D, + Value *matchSelectFromAndOr(Value *A, Value *C, Value *B, Value *D, bool InvertFalseVal = false); Value *getSelectCondition(Value *A, Value *B, bool ABIsTheSame); diff --git a/llvm/lib/Transforms/Vectorize/VPlan.h b/llvm/lib/Transforms/Vectorize/VPlan.h index 22173954f7cec0..bd327d5fb8b605 100644 --- a/llvm/lib/Transforms/Vectorize/VPlan.h +++ b/llvm/lib/Transforms/Vectorize/VPlan.h @@ -3070,8 +3070,8 @@ class VPlan { private: /// Add to the given dominator tree the header block and every new basic block /// that was created between it and the latch block, inclusive. - static void updateDominatorTree(DominatorTree *DT, BasicBlock *LoopLatchBB, - BasicBlock *LoopPreHeaderBB, + static void updateDominatorTree(DominatorTree *DT, BasicBlock *LoopHeaderBB, + BasicBlock *LoopLatchBB, BasicBlock *LoopExitBB); }; diff --git a/mlir/lib/Dialect/SparseTensor/Transforms/Utils/SparseTensorLevel.h b/mlir/lib/Dialect/SparseTensor/Transforms/Utils/SparseTensorLevel.h index 9f92eecdf75cb6..85ca22e937b457 100644 --- a/mlir/lib/Dialect/SparseTensor/Transforms/Utils/SparseTensorLevel.h +++ b/mlir/lib/Dialect/SparseTensor/Transforms/Utils/SparseTensorLevel.h @@ -283,9 +283,9 @@ class SparseIterator { }; /// Helper function to create a TensorLevel object from given `tensor`. -std::unique_ptr<SparseTensorLevel> makeSparseTensorLevel(OpBuilder &builder, - Location loc, Value t, - unsigned tid, Level l); +std::unique_ptr<SparseTensorLevel> makeSparseTensorLevel(OpBuilder &b, + Location l, Value t, + unsigned tid, Level lvl); /// Helper function to create a simple SparseIterator object that iterate over /// the SparseTensorLevel. >From 2177e7fb314c2d1be5f0f1b7e4c3aa29d7c8c9f2 Mon Sep 17 00:00:00 2001 From: Troy-Butler <squin...@outlook.com> Date: Fri, 19 Apr 2024 22:03:33 -0400 Subject: [PATCH 4/4] [lldb][Core] Remove pointless condition Signed-off-by: Troy-Butler <squin...@outlook.com> --- lldb/source/Core/Debugger.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/lldb/source/Core/Debugger.cpp b/lldb/source/Core/Debugger.cpp index ebd112110e5f2d..19b3cf3bbf46b1 100644 --- a/lldb/source/Core/Debugger.cpp +++ b/lldb/source/Core/Debugger.cpp @@ -1115,9 +1115,6 @@ void Debugger::RunIOHandlerSync(const IOHandlerSP &reader_sp) { IOHandlerSP top_reader_sp = reader_sp; while (top_reader_sp) { - if (!top_reader_sp) - break; - top_reader_sp->Run(); // Don't unwind past the starting point. _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits