fixup! [SimplifyCFG] Handle that first matched eq cond in if chain can be Extra condition.

andjo403 · andjo403 · commit 289325dc74e1 · 2025-08-22T22:22:10.000+02:00
diff --git a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp
@@ -592,7 +592,7 @@ struct ConstantComparesGatherer {
   /// Try to set the current value used for the comparison, it succeeds only if
   /// it wasn't set before or if the new value is the same as the old one
   bool setValueOnce(Value *NewVal) {
-    if (IgnoreFirstMatch && NewVal) {
+    if (IgnoreFirstMatch) {
       IgnoreFirstMatch = false;
       return false;
     }
@@ -601,7 +601,7 @@ struct ConstantComparesGatherer {
       return false;
     }
     CompValue = NewVal;
-    return (CompValue != nullptr);
+    return true;
   }
 
   /// Try to match Instruction "I" as a comparison against a constant and

Original file line number	Diff line number	Diff line change
`@@ -592,7 +592,7 @@ struct ConstantComparesGatherer {`
`592`	`592`	`/// Try to set the current value used for the comparison, it succeeds only if`
`593`	`593`	`/// it wasn't set before or if the new value is the same as the old one`
`594`	`594`	`bool setValueOnce(Value *NewVal) {`
`595`		`- if (IgnoreFirstMatch && NewVal) {`
	`595`	`+ if (IgnoreFirstMatch) {`
`596`	`596`	`IgnoreFirstMatch = false;`
`597`	`597`	`return false;`
`598`	`598`	`}`
`@@ -601,7 +601,7 @@ struct ConstantComparesGatherer {`
`601`	`601`	`return false;`
`602`	`602`	`}`
`603`	`603`	`CompValue = NewVal;`
`604`		`- return (CompValue != nullptr);`
	`604`	`+ return true;`
`605`	`605`	`}`
`606`	`606`
`607`	`607`	`/// Try to match Instruction "I" as a comparison against a constant and`