inference: fix lattice for unusual InterConditional return and Const Bool representations (#57080)

Fixes #54886
Rule introduced by 55cee67

(cherry picked from commit 4e13e0e)

Author: vtjnash

base/compiler/abstractinterpretation.jl

@@ -3065,7 +3065,7 @@ function typeinf_local(interp::AbstractInterpreter, frame::InferenceState)
                     rt = abstract_eval_value(interp, stmt.val, currstate, frame)
                     rt = widenreturn(rt, BestguessInfo(interp, bestguess, nargs, slottypes, currstate))
                     # narrow representation of bestguess slightly to prepare for tmerge with rt
-                    if rt isa InterConditional && bestguess isa Const
+                    if rt isa InterConditional && bestguess isa Const && bestguess.val isa Bool
                         let slot_id = rt.slot
                             old_id_type = slottypes[slot_id]
                             if bestguess.val === true && rt.elsetype !== Bottom
@@ -3074,6 +3074,15 @@ function typeinf_local(interp::AbstractInterpreter, frame::InferenceState)
                                 bestguess = InterConditional(slot_id, Bottom, old_id_type)
                             end
                         end
+                    # or narrow representation of rt slightly to prepare for tmerge with bestguess
+                    elseif bestguess isa InterConditional && rt isa Const && rt.val isa Bool
+                        slot_id = bestguess.slot
+                        old_id_type = widenconditional(slottypes[slot_id])
+                        if rt.val === true && bestguess.elsetype !== Bottom
+                            rt = InterConditional(slot_id, old_id_type, Bottom)
+                        elseif rt.val === false && bestguess.thentype !== Bottom
+                            rt = InterConditional(slot_id, Bottom, old_id_type)
+                        end
                     end
                     # copy limitations to return value
                     if !isempty(frame.pclimitations)

base/compiler/typelattice.jl

@@ -427,6 +427,13 @@ end
         end
         a = Bool
     elseif isa(b, ConditionalT)
+        if isa(a, Const) && isa(a.val, Bool)
+           if (a.val === true && b.thentype === Any && b.elsetype === Bottom) ||
+              (a.val === false && b.elsetype === Any && b.thentype === Bottom)
+               # this Conditional contains distinctly no lattice information, and is simply an alternative representation of the Const Bool used for internal tracking purposes
+               return true
+           end
+        end
         return false
     end
     return ⊑(widenlattice(lattice), a, b)

test/compiler/inference.jl

@@ -2675,6 +2675,26 @@ vacond(cnd, va...) = cnd ? va : 0
     vacond(isa(x, Tuple{Int,Int}), x, x)
 end |> only == Union{Int,Tuple{Any,Any}}
 
+let A = Core.Const(true)
+    B = Core.InterConditional(2, Tuple, Union{})
+    C = Core.InterConditional(2, Any, Union{})
+    L = ipo_lattice(Core.Compiler.NativeInterpreter())
+    @test !⊑(L, A, B)
+    @test ⊑(L, B, A)
+    @test tmerge(L, A, B) == C
+    @test ⊑(L, A, C)
+end
+function tail_is_ntuple((@nospecialize t::Tuple))
+    if unknown
+        t isa Tuple
+    else
+        tail_is_ntuple(t)
+    end
+end
+tail_is_ntuple_val((@nospecialize t::Tuple)) = Val(tail_is_ntuple(t))
+@test Base.return_types(tail_is_ntuple, (Tuple,)) |> only === Bool
+@test Base.return_types(tail_is_ntuple_val, (Tuple,)) |> only === Val{true}
+
 # https://github.com/JuliaLang/julia/issues/47435
 is_closed_ex(e::InvalidStateException) = true
 is_closed_ex(e) = false