adjust to JuliaLang/julia#51754

aviatesk · Nov 20, 2023 · 98072a0 · 98072a0
1 parent 0f4a484
commit 98072a0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/abstractinterpret/typeinfer.jl b/src/abstractinterpret/typeinfer.jl
@@ -639,7 +639,9 @@ function CC.abstract_eval_special_value(analyzer::AbstractAnalyzer, @nospecializ
                 # in this call graph, but it's highly possible this is a toplevel callsite
                 # and we take a risk here since we can't enter the analysis otherwise
                 val = getglobal(mod, name)
-                @static if VERSION ≥ v"1.11.0-DEV.797"
+                @static if VERSION ≥ v"1.11.0-DEV.945"
+                ret = CC.RTEffects(isa(val, AbstractGlobal) ? val.t : Const(val), ret.exct, ret.effects)
+                elseif VERSION ≥ v"1.11.0-DEV.797"
                 ret = CC.RTEffects(isa(val, AbstractGlobal) ? val.t : Const(val), ret.effects)
                 else
                 ret = isa(val, AbstractGlobal) ? val.t : Const(val)
@@ -675,7 +677,11 @@ end
 function CC.abstract_eval_statement(analyzer::AbstractAnalyzer, @nospecialize(e), vtypes::VarTable, sv::InferenceState)
     if istoplevel(sv)
         if get_concretized(analyzer)[get_currpc(sv)]
+            @static if VERSION ≥ v"1.11.0-DEV.945"
+            return CC.RTEffects(Any, Any, CC.Effects()) # bail out if it has been interpreted by `ConcreteInterpreter`
+            else
             return Any # bail out if it has been interpreted by `ConcreteInterpreter`
+            end
         end
     end
 

diff --git a/src/analyzers/jetanalyzer.jl b/src/analyzers/jetanalyzer.jl
@@ -365,8 +365,13 @@ function CC.concrete_eval_eligible(analyzer::JETAnalyzer,
     @nospecialize(f), result::MethodCallResult, arginfo::ArgInfo, sv::InferenceState)
     if CC.is_nothrow(result.effects)
         neweffects = CC.Effects(result.effects; nonoverlayed=true)
+        @static if VERSION ≥ v"1.11.0-DEV.945"
+        newresult = MethodCallResult(result.rt, result.exct, result.edgecycle, result.edgelimited,
+                                     result.edge, neweffects)
+        else
         newresult = MethodCallResult(result.rt, result.edgecycle, result.edgelimited,
                                      result.edge, neweffects)
+        end
         res = @invoke CC.concrete_eval_eligible(analyzer::AbstractAnalyzer,
             f::Any, newresult::MethodCallResult, arginfo::ArgInfo, sv::InferenceState)
         @static if VERSION ≥ v"1.10.0-DEV.1345"
@@ -453,8 +458,9 @@ end
     ret = @invoke CC.abstract_eval_basic_statement(analyzer::AbstractAnalyzer,
         stmt::Any, pc_vartable::VarTable, frame::InferenceState)
     if isexpr(stmt, :(=)) && (lhs = stmt.args[1]; isa(lhs, GlobalRef))
+        rt = @static VERSION ≥ v"1.11.0-DEV.945" ? ret.rt : ret.type
         ReportPass(analyzer)(InvalidGlobalAssignmentError, analyzer,
-            frame, lhs.mod, lhs.name, ret.type)
+            frame, lhs.mod, lhs.name, rt)
     end
     return ret
 end