@@ -2565,7 +2565,6 @@ function abstract_eval_setglobalonce!(interp::AbstractInterpreter, sv::AbsIntSta
2565
2565
end
2566
2566
end
2567
2567
2568
-
2569
2568
function abstract_eval_replaceglobal! (interp:: AbstractInterpreter , sv:: AbsIntState , saw_latestworld:: Bool , argtypes:: Vector{Any} )
2570
2569
if length (argtypes) in (5 , 6 , 7 )
2571
2570
(M, s, x, v) = argtypes[2 ], argtypes[3 ], argtypes[4 ], argtypes[5 ]
@@ -3671,7 +3670,7 @@ end
3671
3670
3672
3671
function global_assignment_rt_exct (interp:: AbstractInterpreter , sv:: AbsIntState , saw_latestworld:: Bool , g:: GlobalRef , @nospecialize (newty))
3673
3672
if saw_latestworld
3674
- return Pair {Any,Any} (newty, Union{ ErrorException, TypeError} )
3673
+ return Pair {Any,Any} (newty, ErrorException)
3675
3674
end
3676
3675
(valid_worlds, ret) = scan_partitions ((interp, _, partition)-> global_assignment_binding_rt_exct (interp, partition, newty), interp, g, sv. world)
3677
3676
update_valid_age! (sv, valid_worlds)
@@ -3688,10 +3687,10 @@ function global_assignment_binding_rt_exct(interp::AbstractInterpreter, partitio
3688
3687
ty = kind == PARTITION_KIND_DECLARED ? Any : partition_restriction (partition)
3689
3688
wnewty = widenconst (newty)
3690
3689
if ! hasintersect (wnewty, ty)
3691
- return Pair {Any,Any} (Bottom, TypeError )
3690
+ return Pair {Any,Any} (Bottom, ErrorException )
3692
3691
elseif ! (wnewty <: ty )
3693
3692
retty = tmeet (typeinf_lattice (interp), newty, ty)
3694
- return Pair {Any,Any} (retty, TypeError )
3693
+ return Pair {Any,Any} (retty, ErrorException )
3695
3694
end
3696
3695
return Pair {Any,Any} (newty, Bottom)
3697
3696
end
0 commit comments