[mlir] [llvm] [lldb] [libcxx] [clang-tools-extra] [libc] [clang] [openmp] [compiler-rt] [libunwind] [flang] [lld] [libcxxabi] Fix Logical expression used for merged conditional if in FlattenCFG pass (PR #72522)

[Matt Arsenault via cfe-commits]

================
@@ -25,13 +25,13 @@ define void @test_not_crash(i32 %in_a) #0 {
 entry:
   %cmp0 = icmp eq i32 %in_a, -1
   %cmp1 = icmp ne i32 %in_a, 0
-  %cond0 = and i1 %cmp0, %cmp1
+  %cond0 = or i1 %cmp0, %cmp1
----------------
arsenm wrote:

Original tests still changing? Needs new copies 

https://github.com/llvm/llvm-project/pull/72522