diff --git a/polkadot/parachain/test-chains/basic_add/src/lib.rs b/polkadot/parachain/test-chains/basic_add/src/lib.rs index 723efb307f..7518072a1d 100644 --- a/polkadot/parachain/test-chains/basic_add/src/lib.rs +++ b/polkadot/parachain/test-chains/basic_add/src/lib.rs @@ -17,7 +17,13 @@ //! Basic parachain that adds a number as part of its state. #![cfg_attr(not(feature = "std"), no_std)] -#![cfg_attr(not(feature = "std"), feature(alloc, core_intrinsics, lang_items, panic_implementation, core_panic_info))] +#![cfg_attr( + not(feature = "std"), + feature( + alloc, core_intrinsics, lang_items, panic_implementation, core_panic_info, + alloc_error_handler + ) +)] #[cfg(not(feature = "std"))] extern crate alloc; diff --git a/polkadot/parachain/test-chains/basic_add/src/wasm.rs b/polkadot/parachain/test-chains/basic_add/src/wasm.rs index edf53dc46f..38a8aa81b5 100644 --- a/polkadot/parachain/test-chains/basic_add/src/wasm.rs +++ b/polkadot/parachain/test-chains/basic_add/src/wasm.rs @@ -16,7 +16,7 @@ //! Defines WASM module logic. -use core::{intrinsics, panic}; +use core::{intrinsics, panic, alloc}; use parachain::{self, ValidationResult}; use parachain::codec::Slicable; use super::{HeadData, BlockData}; @@ -29,9 +29,9 @@ pub fn panic(_info: &panic::PanicInfo) -> ! { } } -#[lang = "oom"] +#[alloc_error_handler] #[no_mangle] -pub fn oom() -> ! { +pub fn oom(_: alloc::Layout) -> ! { unsafe { intrinsics::abort(); } diff --git a/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm b/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm index 31556cad32..b81c6f9127 100644 Binary files a/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm and b/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm differ diff --git a/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm b/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm index 7d10ac489d..4430bf8545 100755 Binary files a/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm and b/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm differ