threads: add WasmCompositeInnerType layer
#9520
Conversation
As in `wasm-tools`, push the type down a layer so that `WasmCompositeType` can be marked shared. This leaves several holes to be filled in by future commits (all marked with `TODO: handle shared`); in effect, this change allows `WasmCompositeType` to be marked shared but mostly does not wire up the sharedness during translation.
github-actions
bot
added
wasmtime:api
Subscribe to Label Actioncc @fitzgen
This issue or pull request has been labeled: "wasmtime:api", "wasmtime:ref-types"
Thus the following users have been cc'd because of the following labels:
To subscribe or unsubscribe from this label, edit the |
There was a problem hiding this comment.
I talked about this a bit with @abrown yesterday but I wanted to paste the conclusion here as well. My general worry as we propagate this up further is that it's accidentally easy to forget to check .shared which means that further down the road we might have a bug of "oh forgot to check .shared there". I'd prefer to continue to panic/error in variuos places where shared isn't handled today and I've commented a few of them here and there.
| assert!(!ty.composite_type.shared); | ||
| let gc_layout = match &ty.composite_type.inner { | ||
| wasmtime_environ::WasmCompositeInnerType::Func(_) => None, | ||
| wasmtime_environ::WasmCompositeInnerType::Array(a) => Some( | ||
| gc_runtime | ||
| .expect("must have a GC runtime to register array types") | ||
| .layouts() | ||
| .array_layout(a) | ||
| .into(), | ||
| ), | ||
| wasmtime_environ::WasmCompositeInnerType::Struct(s) => Some( | ||
| gc_runtime | ||
| .expect("must have a GC runtime to register array types") | ||
| .layouts() | ||
| .struct_layout(s) | ||
| .into(), | ||
| ), | ||
| }; |
There was a problem hiding this comment.
I ended up removing the refactor we used in this PR. Though indeed we could have done gc_runtime.map(...).flatten() and ended up with the same result, I'm concerned that @fitzgen probably is using these expects as an early warning sign for winch, e.g.
As in
wasm-tools, push the type down a layer so thatWasmCompositeTypecan be marked shared. This leaves several holes to be filled in by future commits (all marked withTODO: handle shared); in effect, this change allowsWasmCompositeTypeto be marked shared but mostly does not wire up the sharedness during translation.