Changes in val.rs

1b59b579 - Add support for map type (#12216)

Mon, 09 Mar 2026 23:34:21 +0000

Add support for map type (#12216)* Add support for map typeSigned-off-by: Yordis Prieto * Add Map and MapEntry classes to support key/value pairs in component modelThis commit introduces the Map and MapEntry classes, enabling the representation of map values in the component model. The Map class allows for the creation and iteration of key/value pairs, enhancing the functionality of the wasmtime component API. Additionally, the .gitignore file is updated to exclude build artifacts from the crates/c-api directory.* Add wasm_component_model_map configuration support* Format code* Format C code* Enhance component model to support HashMap typeThis commit introduces support for HashMap in the component model, allowing maps to be represented as list> in the canonical ABI. It includes implementations for the ComponentType, Lower, and Lift traits for HashMap, enabling type checking, lowering to flat representations, and lifting from memory. Additionally, the maximum depth for type generation in the fuzzing utility is updated to accommodate the new map type.* Refactor component configuration to introduce map supportThis commit removes the previous wasm features configuration and adds new functions for creating a map-configured engine. The `map_config` and `map_engine` functions are introduced to facilitate the use of the component model with maps in tests, ensuring that the engine is properly configured for map types in the component model.* Add new WAST test for map types and remove map type definitions from existing testsThis commit introduces a new WAST test file specifically for testing various map types in the component model. Additionally, it removes the redundant map type definitions from the existing types.wast file to streamline the test suite.* Update component fuzzing and dynamic tests to replace call_and_post_return with call* Format code* Refactor HashMap usage in typed.rs to use wasmtime_environ collections* Fix HashMap initialization and insertion to handle potential errors in typed.rs* Refactor HashMap handling in typed.rs to use lower_map_iter for improved iteration and memory management. Introduce new implementations for ComponentType, Lower, and Lift traits for std::collections::HashMap, enhancing support for map types in the component model.* Fix map adapter trampoline compilation and alignment bugsThe translate_map function had two categories of bugs preventing mapadapter trampolines from working:1. Wasm stack discipline: local_set_new_tmp emits LocalSet which pops from the stack, but was called when the stack was empty (to "pre-allocate" locals). Fixed by computing values first, then calling local_set_new_tmp to consume them—matching translate_list's pattern. Also removed an erroneous LocalTee that left an orphan value on the stack. Affected: src_byte_len, dst_byte_len, cur_src_ptr, cur_dst_ptr.2. Pointer advancement: after value translation, the pointer still points at the value start. The code only advanced by trailing padding instead of value_size + trailing_padding, causing every loop iteration to re-read the same memory.Also fixes entry layout to use proper record alignment rules (entryalign = max(key_align, value_align), value at aligned offset).* Refactor map entry layout calculations to use canonical ABI* Remove unnecessary clone of map pairs during loweringVal::Map already holds Vec<(Val, Val)> which derefs to &[(Val, Val)],matching lower_map's signature directly. The intermediate Vec allocationand deep clone of every key/value pair was redundant.* Deduplicate map lift logic between HashMap implementations* Deduplicate list and map sequence translation scaffolding* Fix cargo fmt formatting issues* Deduplicate map typecheck logic* Deduplicate map lowering with linear_lower_map_to_flat and linear_lower_map_to_memory helpers* Clean up lift_try_map: use drop, move TryHashMap import to module scope* Fix CI: arbtest overflow and no-std HashMap lift_map- component_fuzz: use saturating_sub in generate_hashable_key to prevent underflow when fuel is 0 and Enum variant is chosen- typed: remove incorrect ? operators in lift_map for hashbrown::HashMap (with_capacity and insert don't return Result)* Store map tuple layout in TypeMapCompute map entry ABI and value offsets once during type building, and reuse that metadata in runtime map lift/lower paths instead of recalculating tuple layout at each call site.* Refactor map ABI argument passingBundle map lift/lower layout and type metadata into a small MapAbi32 helper so map helper calls stay concise without changing behavior.* Fix CI: enable component_model_map in fuzzing and handle map in arbitrary_valThe fuzzer's component_api oracle was generating map types but the enginedidn't have the map feature enabled, and arbitrary_val had no arm forType::Map. Enable component_model_map in the store helper (matching howcomponent_model_async is forced on) and implement arbitrary value generationfor map types.---------Signed-off-by: Yordis Prieto List of files: /wasmtime-44.0.1/crates/c-api/src/component/val.rs

39ec36ca - Fill out type information for components in C API (#11937)

Wed, 05 Nov 2025 18:56:02 +0000

Fill out type information for components in C API (#11937)* Fill out type information for components in C APII've concluded that I'll want this for wasmtime-py so this fills outtype reflection for various items in the C API. This then additionallyextends the C++ API as well.prtest:full* Update crates/c-api/include/wasmtime/component/types/func.hCo-authored-by: Joel Dice ---------Co-authored-by: Joel Dice List of files: /wasmtime-44.0.1/crates/c-api/src/component/val.rs

dbc21cde - Support resources in the C API of Wasmtime (#11920)

Wed, 22 Oct 2025 23:40:44 +0000

Support resources in the C API of Wasmtime (#11920)This commit builds on #11885 to build out support for resources incomponents in the C API of Wasmtime. Support is effectively the same asin Rust except more things are behind pointers and `ResourceDynamic` isused under the hood instead of `Resource` due to the lack ofmonomorphization. Tests have been updated to go through some varioussituations of ensuring that guest and host resources are representableand can be manipulated. List of files: /wasmtime-44.0.1/crates/c-api/src/component/val.rs

cde2e04f - Fill out more of the C++ API for components (#11889)

Tue, 21 Oct 2025 19:27:10 +0000

Fill out more of the C++ API for components (#11889)* capi: Add a C++ API for `component::Linker`Just a bare-bones API for now with functionality that's possible to fillout. Notably instantiation and defining functions is not yet possible inC++. Some more feature-parity is also added with the core linkers aswell.* capi: Add bindings for component instances* capi: Delete wasip2.h header fileUpon reflection I realize that this is not actually necessary and isotherwise a duplicate of the functionality in `wasi.h`. All of thefunctionality in `wasi.h` is already supported to power WASIp2-definedAPIs in a linker, which is enabled by the `WasiView` trait redirectingto the `WasiView for WasiP1Ctx` implementation. This is similar to howthe `wasmtime` CLI works where a P1 context is always created and thenit's conditionally used for either core wasm or components.Effectively this is a deletion of duplicate functionality in the C APIbut no underlying functionality is lost. Translating information topreexisting WASI calls will work the same as using the wasip2 APIs before.* capi: Start bindings for component functions* capi: Bind component values in the C++ API* capi: Finish bindings for component functions/linkersAll the pieces are now in place to use the C++ API in testing.* Fix compilation of CLI* Fix compile on MSVC* Try again to fix msvc compat* Fix `get_f32` and `get_f64` return values* Fix signed return values* Remove no-longer-needed `capi_transfer` function* Try to fix msvc again* Remove std::optional constructor of `Val`* Fix another namespace clash on msvc* One day I surely may understand a fraction of either C++ or MSVC, buttoday is not that day.* Document internal macro* Add other internal docs List of files: /wasmtime-44.0.1/crates/c-api/src/component/val.rs

b221fca7 - update `component-model-async` plumbing (#11123)

Thu, 03 Jul 2025 22:03:59 +0000

update `component-model-async` plumbing (#11123)* [DO NOT MERGE] update `component-model-async` plumbingThis pulls in the latest Component Model async ABI code from the`wasip3-prototyping` repo, including various API refactors and spec updates.This includes all the changes to the `wasmtime` crate from `wasip3-prototyping`_except_ that the `concurrent` submodule and child submodules contain onlynon-functional stubs. For that reason, and the fact thate.g. `Func::call_async` is now implemented in terms of `Func::call_concurrent`,most of the component model tests are failing. This commit is not meant to bemerged as-is; a follow-up commit (to be PR'd separately) will contain the real`concurrent` implementation, at which point the tests will pass again. I'msplitting these into separate PRs to make review easier.Signed-off-by: Joel Dice * Undo wit-bindgen changesNo longer necessary after other refactors* Move back to crates.io-based wit-bindgen* Undo upgrade of http-body-util(deferred for future PR)* Add back in arbitrary use of asyncLooks like it may have been lost by accident* Make imports more conventional for Wasmtime* Some minor changes* Privatize a component field* Cut down a bit on #[cfg]* Undo a no-longer-necessary `pub`* add doc comments for `{Future,Stream,ErrorContext}Any`Signed-off-by: Joel Dice * rename `concurrent` stub module to `concurrent_disabled`...and avoid panicking in the stubs.Signed-off-by: Joel Dice * fix test regressionSigned-off-by: Joel Dice * revert `call_async` and `post_return_impl` changesThese will need to wait until the `component-model-async` feature is fullyimplemented.Signed-off-by: Joel Dice * remove unused structSigned-off-by: Joel Dice * add `Options::callback` fieldThis isn't used yet, but will be used when the real `component-model-async`implementation is merged.Signed-off-by: Joel Dice * Remove no-longer-needed feature* Trim reexports from WasmtimeSome of these are no longer needed or can be avoided with small changes.Some deps are likely needed in the next commit but they'll be best addedthere.* Update test expectations* More trimming of Cargo.toml* Defer `*Buffer` traits to next PRNot needed for this PR I believe.* Use conventional Wasmtime imports + remove dummy_waker* Reduce duplication in `*_disabled`* Remove some unncessary bounds* Remove some `for<'a>` bounds where unnecessary* Remove another bound* Defer more functions to the next PR`drop_fibers` is different in the next PR, so defer it to then.* Remove some reexports no longer necessaryBindings generation changed awhile back so these aren't needed, deferthe implementations to the next PR.* Remove unnecessary dropThis was already moved to `run_manual_drop_routines`* Defer a `pub(crate)` to a future PR* Expand comments in traphandlers* Defer some types to the next PR* Update linker documentation* Add `Send`/`Sync` bounds to `ComponentType`This commit is extracted from from review of #11123 and #11127. Whilenot literally present in those PRs it's my own personal conclusion thatit's best to just go ahead and add these bounds at the "base" of thecomponent trait hierarchy. The current implementation in #11123 addsbounds in many locations and this would remove the need to add boundseverywhere and instead have everything inherited through the `Lift` and`Lower` traits.This raises the question of: why? The main conclusion that I've reachedleading to this change is that Wasmtime currently will store `R`, areturn value, on the stack during the lowering process back into linearmemory. This might involve allocation, however, meaning that wasm can beinvoked and a context switch could happen. For Wasmtime's `unsafe impl`of `Send` and `Sync` on fibers to be sound it requires that thisstack-local variable is also `Send` and `Sync` as it's an entirelyuser-provided type. Thus I've concluded that for results it's alwaysrequired for these to be both `Send` and `Sync` (or at the very least,`Send`).Given that I've gone ahead and updated to require both `Send` and `Sync`for both params and results. This is not expected to actually have anyimpact in practice since all primitives are already `Send`/`Sync` (minus`Rc` impls all removed here) and all `bindgen!`-generated types arecompositions of `Send`/`Sync` primitives meaning that they're also`Send` and `Sync`.* Remove some now-unnecessary bounds* Fix build after #11160* Remove some now-unnecessary duplicate bounds* Uncomment test that now works* Undo accidental doc wrap* Clarify comment on `Value` typesDon't leave `TODO` in public-facing documentation ideally* Actually resolve the conflict (forgot to commit)* Avoid returning boxed futures in APIs* Defer making constructors more public to a future PR* Make a method name more conventional* Refactor `linear_lift_into_from_memory`* Drop the `max_count` parameter in favor of slicing the `WasmList` itself. Avoids situations such as what happens if `max_count` is larger than the length of the list.* Don't have the default implementation collect to a vector and then push all that onto a different vector. Instead push each item individually through `extend`.* De-indent a block of code added* Remove unsafety from `prepare_call`Mostly move the parameters themselves to the closure to avoid rawpointers/drop/etc.This will have the consequence of in the future `call_async` is going tonow require `Params: 'static` but that seems more-or-less inevitable atthis point.* Go back to returning box, alas.* Apply same treatment to lift functionMake it a closure and reduce some levels of indirection of the variousfunctions in play.* Refactor `lower_params` to require less context.Relax the bounds on the closure specified since it's immediately calledand then additionally take out parameters/captures that the closure cancarry itself.* Don't pass extraneous `Instance` parameterThis can now be inferred from `Func`.* Clean up some SAFETY comments* Generalize the signature of `lift_results`* Move `lift_results` function to `Func`Also rename the lift/lower helpers to `with_{lift,lower}_context`* Remove parameter from `with_lift_context`Like `with_lower_context` this is fine to capture in the closure passedin.* Simplify the dynamic lifting logicDon't call `with_lift_context` in two locations, only call it once witha dynamic parameter.* Refactor away the `Func::lift_results_sync` helper* Use `with_lift_context` in `call_raw`* Simplify a call to `Func::call_unchecked_raw`* Ungate `with_lift_context` to fix non-cm-async build* Fix compile (bad cherry-pick conflict resolution)* Use `with_lower_context` in `call_raw`Trying to unify the async/concurrent paths as much as possible.* Move params out of `call_raw`Let closures capture the params, no need to thread it through as anunnecessary argument.* Clean up unsafety in `Func::call_raw`* Accurately mark `call_raw` itself as `unsafe`, then document why callers should be safe.* Don't have one large `unsafe` block in `call_raw`, instead split it up with separate safety comments.* Move a one-off type definition closer to its use* Avoid intermediate allocations in dynamic calls* Simplify a future-return site* Deduplicate checking parameter count* Simplify a future invocation with `?`* Simplify a variable declaration* Simplify some function signatures* Remove outdated safety comment* Refactor to not require `Params: 'static` on `call_async`* Remove no-longer-necessary SAFETY comment* Fix typos* Add a fast-path with no `Box` for sync host functionsSpeeds up host calls by ~20% and puts them back on parity with thebeforehand numbers Wasmtime has.* Synchronize signatures of async/concurrent dynamic callsUse slices for both instead of vecs for one and slices for the other.Required some slight rejiggering. Apparently one can solve a closureproblem with another closure, then one surely has no more closureproblems.* Fix non-cm-async build---------Signed-off-by: Joel Dice Co-authored-by: Alex Crichton List of files: /wasmtime-44.0.1/crates/c-api/src/component/val.rs

9a26c101 - c-api: component-model: Flags type (#10873)

Fri, 30 May 2025 21:34:36 +0000

c-api: component-model: Flags type (#10873)* c-api: component-model: Flags type* Hand make `wasm_name_t::default()` implementation List of files: /wasmtime-44.0.1/crates/c-api/src/component/val.rs

90a2351b - c-api: component-model: Result types (#10864)

Fri, 30 May 2025 04:51:13 +0000

c-api: component-model: Result types (#10864) List of files: /wasmtime-44.0.1/crates/c-api/src/component/val.rs

fa89f323 - c-api: component-model: Enum and option values (#10858)

Thu, 29 May 2025 15:29:10 +0000

c-api: component-model: Enum and option values (#10858)* c-api: component-model: Enum values* c-api: component-model: Option values List of files: /wasmtime-44.0.1/crates/c-api/src/component/val.rs

53701b21 - c-api: component-model: Function post return, more values (#10841)

Tue, 27 May 2025 21:16:06 +0000

c-api: component-model: Function post return, more values (#10841)* c-api: component-model: `wasmtime_component_post_return()`* c-api: component-model: Tuple values* c-api: component-model: Variant valuesThis required `wasmtime_component_val_new()` List of files: /wasmtime-44.0.1/crates/c-api/src/component/val.rs

b2c64de1 - c-api: component-model: Values and function calling (#10697)

Fri, 23 May 2025 14:05:50 +0000

c-api: component-model: Values and function calling (#10697)* c-api: component-model: Primitive values* c-api: component-model: Function calling* A test* Take args as mut to avoid copying* String and char* Rethink value ownership semantics, add list values* Record values* Make take Rust values as refs in `::from()` functionsLater we can provide implementations that take it as a value to avoidcopying* Define host functions* `wasmtime_component_valrecord_new()`* Use `u32` instead of `char` as its not ffi safe* Test records and strings in c-api -> vm -> host func -> vm -> c-api* `wasmtime_component_vallist_new()`* Test lists* Fix formatting* Use existing `declare_vecs` construct* Add rest of helper functions* Add documentation* Fix multiline comments* Third time's the charm* Fourth time's the charm prtest:full* Doxygen file headers* Fix other missing documentation* Small fix to docs List of files: /wasmtime-44.0.1/crates/c-api/src/component/val.rs