@@ -2561,7 +2561,6 @@ function abstract_eval_setglobalonce!(interp::AbstractInterpreter, sv::AbsIntSta
2561
2561
end
2562
2562
end
2563
2563
2564
-
2565
2564
function abstract_eval_replaceglobal! (interp:: AbstractInterpreter , sv:: AbsIntState , saw_latestworld:: Bool , argtypes:: Vector{Any} )
2566
2565
if length (argtypes) in (5 , 6 , 7 )
2567
2566
(M, s, x, v) = argtypes[2 ], argtypes[3 ], argtypes[4 ], argtypes[5 ]
@@ -3624,7 +3623,7 @@ end
3624
3623
3625
3624
function global_assignment_rt_exct (interp:: AbstractInterpreter , sv:: AbsIntState , saw_latestworld:: Bool , g:: GlobalRef , @nospecialize (newty))
3626
3625
if saw_latestworld
3627
- return Pair {Any,Any} (newty, Union{ ErrorException, TypeError} )
3626
+ return Pair {Any,Any} (newty, ErrorException)
3628
3627
end
3629
3628
(valid_worlds, ret) = scan_partitions ((interp, _, partition)-> global_assignment_binding_rt_exct (interp, partition, newty), interp, g, sv. world)
3630
3629
update_valid_age! (sv, valid_worlds)
@@ -3641,10 +3640,10 @@ function global_assignment_binding_rt_exct(interp::AbstractInterpreter, partitio
3641
3640
ty = kind == PARTITION_KIND_DECLARED ? Any : partition_restriction (partition)
3642
3641
wnewty = widenconst (newty)
3643
3642
if ! hasintersect (wnewty, ty)
3644
- return Pair {Any,Any} (Bottom, TypeError )
3643
+ return Pair {Any,Any} (Bottom, ErrorException )
3645
3644
elseif ! (wnewty <: ty )
3646
3645
retty = tmeet (typeinf_lattice (interp), newty, ty)
3647
- return Pair {Any,Any} (retty, TypeError )
3646
+ return Pair {Any,Any} (retty, ErrorException )
3648
3647
end
3649
3648
return Pair {Any,Any} (newty, Bottom)
3650
3649
end
0 commit comments