[Shared-Everything] ArrayRMW and ArrayCmpxchg #7632
Conversation
src/ir/subtype-exprs.h
Outdated
| return; | ||
| } | ||
| auto array = curr->ref->type.getHeapType().getArray(); | ||
| self()->noteSubtype(curr->expected, array.element.type); |
There was a problem hiding this comment.
This doesn't seem right. The expected value should be allowed to be a supertype of the element type, so it should only be required to be a subtype of eq. I see this is wrong for StructCmpxchg as well.
There was a problem hiding this comment.
Fixed both. Though it seems the spec could be more strict here..?
There was a problem hiding this comment.
This way is actually better for us. See the discussion at WebAssembly/shared-everything-threads#92.
src/wasm/wasm.cpp
Outdated
| // Like ArrayRMW, but the most precise possible field type is the LUB of | ||
| // the expected and replacement values. | ||
| type = Type::getLeastUpperBound(expected->type, replacement->type); |
There was a problem hiding this comment.
This can be just replacement->type. I see this is wrong for StructCmpxchg as well.
src/ir/child-typer.h
Outdated
| auto type = ht->getArray().element.type; | ||
| note(&curr->ref, Type(*ht, Nullable)); | ||
| note(&curr->index, Type::i32); | ||
| note(&curr->expected, type); |
There was a problem hiding this comment.
This should be eqref if type is a reference and type otherwise. I see this is wrong for StructCmpxchg as well.
src/ir/subtype-exprs.h
Outdated
| @@ -337,7 +337,7 @@ struct SubtypingDiscoverer : public OverriddenVisitor<SubType> { | |||
| return; | |||
| } | |||
| const auto& fields = curr->ref->type.getHeapType().getStruct().fields; | |||
| self()->noteSubtype(curr->expected, fields[curr->index].type); | |||
| self()->noteSubtype(curr->expected, Type(HeapType::eq, Nullable)); | |||
There was a problem hiding this comment.
These should also only be if the field type is a reference.
No description provided.