Skip to content

Commit f4ba16b

Browse files
committed
Check stores for different vptr names before eliminating.
1 parent 7e88377 commit f4ba16b

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

src/add_stores.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ function add_store!(
4646
end
4747
# add_pvar &= (name(first(parents(opp))) != pvar)
4848
end
49-
# @show add_pvar
5049
pushfirst!(vparents, parent)
5150
update_deps!(ldref, reduceddeps, parent)
5251
op = Operation( id, name(mpref), elementbytes, :setindex!, memstore, mpref )

src/operations.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ end
7272
loopdependencies(ref::ArrayReferenceMeta) = ref.ref.indices
7373
Base.convert(::Type{ArrayReference}, ref::ArrayReferenceMeta) = ref.ref
7474
Base.:(==)(x::ArrayReference, y::ArrayReference) = isequal(x, y)
75-
Base.:(==)(x::ArrayReferenceMeta, y::ArrayReferenceMeta) = isequal(x.ref, y.ref) && x.ptr === y.ptr
75+
Base.:(==)(x::ArrayReferenceMeta, y::ArrayReferenceMeta) = (x.ptr === y.ptr) && isequal(x.ref, y.ref)
7676

7777
# Errors preferable than silently working?
7878
Base.:(==)(x::ArrayReference, y::ArrayReferenceMeta) = x == y.ref
@@ -197,7 +197,7 @@ function matches(op1::Operation, op2::Operation)
197197
end
198198
op1.dependencies == op2.dependencies || return false
199199
op2.reduced_deps == op2.reduced_deps || return false
200-
if isload(op1)
200+
if accesses_memory(op1)
201201
op1.ref == op2.ref || return false
202202
end
203203
nparents = length(parents(op1))

0 commit comments

Comments
 (0)