fixup! datadeps: Validate ManyMemorySpan inner span lengths

Author: jpsamaroo

src/datadeps/remainders.jl

@@ -164,6 +164,7 @@ function compute_remainder_for_arg!(state::DataDepsState,
     end
 
     # Create our remainder as an interval tree over all target ainfos
+    VERIFY_SPAN_CURRENT_OBJECT[] = arg_w.arg
     remainder = IntervalTree{ManyMemorySpan{N}}(ManyMemorySpan{N}(ntuple(i -> target_ainfos[i][j], N)) for j in 1:nspans)
 
     # Create our tracker
@@ -227,6 +228,7 @@ function compute_remainder_for_arg!(state::DataDepsState,
             get_read_deps!(state, other_space, other_ainfo, write_num, tracker_other_space[2])
         end
     end
+    VERIFY_SPAN_CURRENT_OBJECT[] = nothing
 
     if isempty(tracker) || all(tracked->isempty(tracked[1]), values(tracker))
         return NoAliasing(), 0

src/utils/memory-span.jl

@@ -93,8 +93,9 @@ function span_diff(span1::ManyMemorySpan{N}, span2::ManyMemorySpan{N}) where N
     verify_span(span)
     return span
 end
+const VERIFY_SPAN_CURRENT_OBJECT = TaskLocalValue{Any}(()->nothing)
 function verify_span(span::ManyMemorySpan{N}) where N
-    @assert allequal(span_len, span.spans) "All spans must be the same: $(map(span_len, span.spans))"
+    @assert allequal(span_len, span.spans) "All spans must be the same: $(map(span_len, span.spans))\nWhile processing $(typeof(VERIFY_SPAN_CURRENT_OBJECT[]))"
 end
 
 struct ManyPair{N} <: Unsigned