[clang] [lldb] [llvm] [mlir] [lldb][Core] Remove pointless condition (PR #89480)
Troy-Butler wrote: I apologize - I'm not sure how this happened. I was careful to refresh my fork/clone before starting on this issue, but somehow not all of the files were updated, and now my PR requests are getting wires crossed. I think it would be safest for me to close this issue, delete my existing fork/clone, and start fresh. https://github.com/llvm/llvm-project/pull/89480 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [lldb] [llvm] [mlir] [lldb][Core] Remove pointless condition (PR #89480)
https://github.com/Troy-Butler closed https://github.com/llvm/llvm-project/pull/89480 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [lldb] [llvm] [mlir] [lldb][Core] Remove pointless condition (PR #89480)
https://github.com/JDevlieghere requested changes to this pull request. +1 on what Cyndy said. The lldb change itself looks fine. https://github.com/llvm/llvm-project/pull/89480 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [lldb] [llvm] [mlir] [lldb][Core] Remove pointless condition (PR #89480)
cyndyishida wrote: It appears your PR branch is based on a stale version of the target `llvm/main` branch, resulting in more commits than what this PR intended for. Please merge in the target branch and resolve any conflicts. https://github.com/llvm/llvm-project/pull/89480 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [lldb] [llvm] [mlir] [lldb][Core] Remove pointless condition (PR #89480)
llvmbot wrote:
@llvm/pr-subscribers-clang
Author: Troy Butler (Troy-Butler)
Changes
Addresses issue #85984
---
Full diff: https://github.com/llvm/llvm-project/pull/89480.diff
6 Files Affected:
- (modified) clang/include/clang/StaticAnalyzer/Core/PathSensitive/Store.h
(+2-2)
- (modified) lldb/source/Core/Debugger.cpp (-3)
- (modified) llvm/lib/TextAPI/TextStub.cpp (+2-2)
- (modified) llvm/lib/Transforms/InstCombine/InstCombineInternal.h (+1-1)
- (modified) llvm/lib/Transforms/Vectorize/VPlan.h (+2-2)
- (modified) mlir/lib/Dialect/SparseTensor/Transforms/Utils/SparseTensorLevel.h
(+3-3)
``diff
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 Values,
- const Expr *E, unsigned Count,
+ const Expr *Ex, unsigned Count,
const LocationContext *LCtx,
const CallEvent *Call,
InvalidatedSymbols ,
RegionAndSymbolInvalidationTraits ,
- InvalidatedRegions *InvalidatedTopLevel,
+ InvalidatedRegions *TopLevelRegions,
InvalidatedRegions *Invalidated) = 0;
/// enterStackFrame - Let the StoreManager to do something when execution
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
_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.
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 {
static void mapping(IO , ExportSection ) {
const auto *Ctx = reinterpret_cast(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 {
template <> struct MappingTraits {
static void mapping(IO , UndefinedSection ) {
const auto *Ctx = reinterpret_cast(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);
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
[clang] [lldb] [llvm] [mlir] [lldb][Core] Remove pointless condition (PR #89480)
llvmbot wrote:
@llvm/pr-subscribers-lldb
Author: Troy Butler (Troy-Butler)
Changes
Addresses issue #85984
---
Full diff: https://github.com/llvm/llvm-project/pull/89480.diff
6 Files Affected:
- (modified) clang/include/clang/StaticAnalyzer/Core/PathSensitive/Store.h
(+2-2)
- (modified) lldb/source/Core/Debugger.cpp (-3)
- (modified) llvm/lib/TextAPI/TextStub.cpp (+2-2)
- (modified) llvm/lib/Transforms/InstCombine/InstCombineInternal.h (+1-1)
- (modified) llvm/lib/Transforms/Vectorize/VPlan.h (+2-2)
- (modified) mlir/lib/Dialect/SparseTensor/Transforms/Utils/SparseTensorLevel.h
(+3-3)
``diff
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 Values,
- const Expr *E, unsigned Count,
+ const Expr *Ex, unsigned Count,
const LocationContext *LCtx,
const CallEvent *Call,
InvalidatedSymbols ,
RegionAndSymbolInvalidationTraits ,
- InvalidatedRegions *InvalidatedTopLevel,
+ InvalidatedRegions *TopLevelRegions,
InvalidatedRegions *Invalidated) = 0;
/// enterStackFrame - Let the StoreManager to do something when execution
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
_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.
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 {
static void mapping(IO , ExportSection ) {
const auto *Ctx = reinterpret_cast(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 {
template <> struct MappingTraits {
static void mapping(IO , UndefinedSection ) {
const auto *Ctx = reinterpret_cast(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);
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
[clang] [lldb] [llvm] [mlir] [lldb][Core] Remove pointless condition (PR #89480)
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
Date: Mon, 25 Mar 2024 13:28:45 -0400
Subject: [PATCH 1/4] [LLVM][LIB] Refactor Redundant Condition
Signed-off-by: Troy-Butler
---
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 {
static void mapping(IO , ExportSection ) {
const auto *Ctx = reinterpret_cast(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 {
template <> struct MappingTraits {
static void mapping(IO , UndefinedSection ) {
const auto *Ctx = reinterpret_cast(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
Date: Mon, 25 Mar 2024 13:28:45 -0400
Subject: [PATCH 2/4] [LLVM][TextAPI] Refactor Redundant Condition
Signed-off-by: Troy-Butler
---
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 {
static void mapping(IO , ExportSection ) {
const auto *Ctx = reinterpret_cast(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 {
template <> struct MappingTraits {
static void mapping(IO , UndefinedSection ) {
const auto *Ctx = reinterpret_cast(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
Date: Thu, 18 Apr 2024 15:47:14 -0400
Subject: [PATCH 3/4] Fix Definition Mismatches
Signed-off-by: Troy-Butler
---
.../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 Values,
- const Expr *E, unsigned Count,
+ const Expr *Ex, unsigned Count,
const LocationContext *LCtx,
const CallEvent *Call,
InvalidatedSymbols ,
RegionAndSymbolInvalidationTraits ,
- 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,
