Don't bailout on no-value phinodes to fix illegal instruction problem

JuliaLang · Apr 28, 2022 · 9d5a93a · 9d5a93a
1 parent e3cb70e
commit 9d5a93a
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/base/compiler/ssair/irinterp.jl b/base/compiler/ssair/irinterp.jl
@@ -314,7 +314,7 @@ function _ir_abstract_constant_propagation(interp::AbstractInterpreter, mi_cache
             if idx == lstmt && process_terminator!(ip, bb, idx)
                 @goto residual_scan
             end
-            if ir.stmts[idx][:type] === Bottom
+            if typ === Bottom && !isa(inst, PhiNode)
                 break
             end
         end
@@ -330,7 +330,6 @@ function _ir_abstract_constant_propagation(interp::AbstractInterpreter, mi_cache
         lstmt = last(stmts)
         for idx = stmts
             inst = ir.stmts[idx][:inst]
-            typ = ir.stmts[idx][:type]
             for ur in userefs(inst)
                 val = ur[]
                 if isa(val, Argument)
@@ -354,7 +353,6 @@ function _ir_abstract_constant_propagation(interp::AbstractInterpreter, mi_cache
         lstmt = last(stmts)
         for idx = stmts
             inst = ir.stmts[idx][:inst]
-            typ = ir.stmts[idx][:type]
             for ur in userefs(inst)
                 val = ur[]
                 if isa(val, SSAValue)
@@ -391,7 +389,8 @@ function _ir_abstract_constant_propagation(interp::AbstractInterpreter, mi_cache
             continue
         end
         inst = ir.stmts[idx][:inst]
-        ultimate_rt = tmerge(ultimate_rt, argextype(inst.val, ir))
+        rt = argextype(inst.val, ir)
+        ultimate_rt = tmerge(ultimate_rt, rt)
     end
     return ultimate_rt
 end
@@ -405,6 +404,7 @@ function ir_abstract_constant_propagation(interp::AbstractInterpreter, mi_cache,
         Timings.exit_current_timer(inf_frame)
         return v
     else
-        return _ir_abstract_constant_propagation(interp, mi_cache, frame, mi, ir, argtypes)
+        T = _ir_abstract_constant_propagation(interp, mi_cache, frame, mi, ir, argtypes)
+        return T
     end
 end