wip

Signed-off-by: Cyrill Leutwiler <bigcyrill@hotmail.com>

CHANGELOG.md

@@ -4,6 +4,15 @@
 
 This is a development pre-release.
 
+Supported `polkadot-sdk` rev:`c29e72a8628835e34deb6aa7db9a78a2e4eabcee`
+
+### Added
+
+### Changed
+
+### Fixed
+- Constructors avoid storing zero sized immutable data on exit.
+
 ## v0.1.0-dev.13
 
 This is a development pre-release.

crates/benchmarks/BENCHMARKS.md

@@ -15,58 +15,58 @@
 
 ### Baseline
 
-|         | `EVM`                   | `PVMInterpreter`                 |
+|         | `EVM`                    | `PVMInterpreter`                 |
-|:--------|:------------------------|:-------------------------------- |
+|:--------|:-------------------------|:-------------------------------- |
-| **`0`** | `3.36 us` (✅ **1.00x**) | `11.84 us` (❌ *3.52x slower*)    |
+| **`0`** | `10.08 us` (✅ **1.00x**) | `10.32 us` (✅ **1.02x slower**)  |
 
 ### OddPorduct
 
-|              | `EVM`                    | `PVMInterpreter`                 |
+|              | `EVM`                     | `PVMInterpreter`                 |
-|:-------------|:-------------------------|:-------------------------------- |
+|:-------------|:--------------------------|:-------------------------------- |
-| **`10000`**  | `3.11 ms` (✅ **1.00x**)  | `1.53 ms` (🚀 **2.03x faster**)   |
+| **`10000`**  | `3.60 ms` (✅ **1.00x**)   | `1.57 ms` (🚀 **2.28x faster**)   |
-| **`100000`** | `30.70 ms` (✅ **1.00x**) | `15.54 ms` (🚀 **1.98x faster**)  |
+| **`100000`** | `34.72 ms` (✅ **1.00x**)  | `14.82 ms` (🚀 **2.34x faster**)  |
-| **`300000`** | `92.68 ms` (✅ **1.00x**) | `45.47 ms` (🚀 **2.04x faster**)  |
+| **`300000`** | `105.01 ms` (✅ **1.00x**) | `44.11 ms` (🚀 **2.38x faster**)  |
 
 ### TriangleNumber
 
 |              | `EVM`                    | `PVMInterpreter`                 |
 |:-------------|:-------------------------|:-------------------------------- |
-| **`10000`**  | `2.29 ms` (✅ **1.00x**)  | `1.09 ms` (🚀 **2.11x faster**)   |
+| **`10000`**  | `2.43 ms` (✅ **1.00x**)  | `1.12 ms` (🚀 **2.17x faster**)   |
-| **`100000`** | `22.84 ms` (✅ **1.00x**) | `10.66 ms` (🚀 **2.14x faster**)  |
+| **`100000`** | `24.20 ms` (✅ **1.00x**) | `10.86 ms` (🚀 **2.23x faster**)  |
-| **`360000`** | `82.29 ms` (✅ **1.00x**) | `37.01 ms` (🚀 **2.22x faster**)  |
+| **`360000`** | `88.69 ms` (✅ **1.00x**) | `38.46 ms` (🚀 **2.31x faster**)  |
 
 ### FibonacciRecursive
 
 |          | `EVM`                     | `PVMInterpreter`                  |
 |:---------|:--------------------------|:--------------------------------- |
-| **`12`** | `135.67 us` (✅ **1.00x**) | `125.02 us` (✅ **1.09x faster**)  |
+| **`12`** | `144.17 us` (✅ **1.00x**) | `150.85 us` (✅ **1.05x slower**)  |
-| **`16`** | `903.75 us` (✅ **1.00x**) | `762.79 us` (✅ **1.18x faster**)  |
+| **`16`** | `938.71 us` (✅ **1.00x**) | `922.11 us` (✅ **1.02x faster**)  |
-| **`20`** | `6.12 ms` (✅ **1.00x**)   | `4.96 ms` (✅ **1.23x faster**)    |
+| **`20`** | `6.54 ms` (✅ **1.00x**)   | `6.20 ms` (✅ **1.05x faster**)    |
-| **`24`** | `42.05 ms` (✅ **1.00x**)  | `33.86 ms` (✅ **1.24x faster**)   |
+| **`24`** | `45.73 ms` (✅ **1.00x**)  | `41.98 ms` (✅ **1.09x faster**)   |
 
 ### FibonacciIterative
 
 |           | `EVM`                    | `PVMInterpreter`                 |
 |:----------|:-------------------------|:-------------------------------- |
-| **`64`**  | `15.04 us` (✅ **1.00x**) | `29.45 us` (❌ *1.96x slower*)    |
+| **`64`**  | `23.00 us` (✅ **1.00x**) | `31.88 us` (❌ *1.39x slower*)    |
-| **`128`** | `26.36 us` (✅ **1.00x**) | `42.19 us` (❌ *1.60x slower*)    |
+| **`128`** | `35.28 us` (✅ **1.00x**) | `42.43 us` (❌ *1.20x slower*)    |
-| **`256`** | `48.61 us` (✅ **1.00x**) | `65.71 us` (❌ *1.35x slower*)    |
+| **`256`** | `60.12 us` (✅ **1.00x**) | `61.20 us` (✅ **1.02x slower**)  |
 
 ### FibonacciBinet
 
 |           | `EVM`                    | `PVMInterpreter`                 |
 |:----------|:-------------------------|:-------------------------------- |
-| **`64`**  | `15.22 us` (✅ **1.00x**) | `41.46 us` (❌ *2.72x slower*)    |
+| **`64`**  | `23.01 us` (✅ **1.00x**) | `47.74 us` (❌ *2.07x slower*)    |
-| **`128`** | `17.05 us` (✅ **1.00x**) | `42.84 us` (❌ *2.51x slower*)    |
+| **`128`** | `25.44 us` (✅ **1.00x**) | `49.67 us` (❌ *1.95x slower*)    |
-| **`256`** | `19.00 us` (✅ **1.00x**) | `44.36 us` (❌ *2.34x slower*)    |
+| **`256`** | `28.66 us` (✅ **1.00x**) | `53.01 us` (❌ *1.85x slower*)    |
 
 ### SHA1
 
 |           | `EVM`                     | `PVMInterpreter`                  |
 |:----------|:--------------------------|:--------------------------------- |
-| **`1`**   | `110.04 us` (✅ **1.00x**) | `216.11 us` (❌ *1.96x slower*)    |
+| **`1`**   | `135.87 us` (✅ **1.00x**) | `243.75 us` (❌ *1.79x slower*)    |
-| **`64`**  | `209.04 us` (✅ **1.00x**) | `309.48 us` (❌ *1.48x slower*)    |
+| **`64`**  | `258.45 us` (✅ **1.00x**) | `355.70 us` (❌ *1.38x slower*)    |
-| **`512`** | `903.65 us` (✅ **1.00x**) | `980.49 us` (✅ **1.09x slower**)  |
+| **`512`** | `1.10 ms` (✅ **1.00x**)   | `1.09 ms` (✅ **1.01x faster**)    |
 
 ---
 Made with [criterion-table](https://github.com/nu11ptr/criterion-table)

crates/integration/codesize.json

@@ -1,10 +1,10 @@
 {
-  "Baseline": 1443,
+  "Baseline": 950,
-  "Computation": 2788,
+  "Computation": 2262,
-  "DivisionArithmetics": 9748,
+  "DivisionArithmetics": 8915,
-  "ERC20": 19150,
+  "ERC20": 17233,
-  "Events": 2201,
+  "Events": 1628,
-  "FibonacciIterative": 2041,
+  "FibonacciIterative": 1485,
-  "Flipper": 2691,
+  "Flipper": 2132,
-  "SHA1": 8997
+  "SHA1": 8381
 }

crates/llvm-context/src/polkavm/const/mod.rs

@@ -9,6 +9,9 @@ pub static XLEN: usize = revive_common::BIT_LENGTH_X32;
 /// The calldata size global variable name.
 pub static GLOBAL_CALLDATA_SIZE: &str = "calldatasize";
 
+/// The spill buffer global variable name.
+pub static GLOBAL_ADDRESS_SPILL_BUFFER: &str = "address_spill_buffer";
+
 /// The deployer call header size that consists of:
 /// - bytecode hash (32 bytes)
 pub const DEPLOYER_CALL_HEADER_SIZE: usize = revive_common::BYTE_LENGTH_WORD;

crates/llvm-context/src/polkavm/context/argument.rs

@@ -4,61 +4,98 @@
 #[derive(Debug, Clone)]
 pub struct Argument<'ctx> {
     /// The actual LLVM operand.
-    pub value: inkwell::values::BasicValueEnum<'ctx>,
+    pub value: Value<'ctx>,
     /// The original AST value. Used mostly for string literals.
     pub original: Option<String>,
     /// The preserved constant value, if available.
     pub constant: Option<num::BigUint>,
 }
 
+/// The function argument can be either a pointer or a integer value.
+/// This disambiguation allows for lazy loading of variables.
+#[derive(Clone, Debug)]
+pub enum Value<'ctx> {
+    Register(inkwell::values::BasicValueEnum<'ctx>),
+    Pointer {
+        pointer: crate::polkavm::context::Pointer<'ctx>,
+        id: String,
+    },
+}
+
 impl<'ctx> Argument<'ctx> {
-    /// The calldata offset argument index.
+    /// A shortcut constructor for register arguments.
-    pub const ARGUMENT_INDEX_CALLDATA_OFFSET: usize = 0;
+    pub fn value(value: inkwell::values::BasicValueEnum<'ctx>) -> Self {
-
-    /// The calldata length argument index.
-    pub const ARGUMENT_INDEX_CALLDATA_LENGTH: usize = 1;
-
-    /// A shortcut constructor.
-    pub fn new(value: inkwell::values::BasicValueEnum<'ctx>) -> Self {
         Self {
-            value,
+            value: Value::Register(value),
             original: None,
             constant: None,
         }
     }
 
-    /// A shortcut constructor.
+    /// A shortcut constructor for stack arguments.
-    pub fn new_with_original(
+    pub fn pointer(pointer: crate::polkavm::context::Pointer<'ctx>, id: String) -> Self {
-        value: inkwell::values::BasicValueEnum<'ctx>,
-        original: String,
-    ) -> Self {
         Self {
-            value,
+            value: Value::Pointer { pointer, id },
-            original: Some(original),
+            original: None,
             constant: None,
         }
     }
 
-    /// A shortcut constructor.
+    /// Set the original decleratation value.
-    pub fn new_with_constant(
+    pub fn with_original(mut self, original: String) -> Self {
-        value: inkwell::values::BasicValueEnum<'ctx>,
+        self.original = Some(original);
-        constant: num::BigUint,
+        self
-    ) -> Self {
+    }
-        Self {
+
-            value,
+    /// Set the constant value.
-            original: None,
+    pub fn with_constant(mut self, constant: num::BigUint) -> Self {
-            constant: Some(constant),
+        self.constant = Some(constant);
-        }
+        self
     }
 
     /// Returns the inner LLVM value.
-    pub fn to_llvm(&self) -> inkwell::values::BasicValueEnum<'ctx> {
+    ///
-        self.value
+    /// Panics if `self` is a pointer argument.
+    pub fn _to_llvm_value(&self) -> inkwell::values::BasicValueEnum<'ctx> {
+        match &self.value {
+            Value::Register(value) => *value,
+            Value::Pointer { .. } => unreachable!("invalid register value access"),
+        }
+    }
+
+    /// Access the underlying value.
+    ///
+    /// Will emit a stack load if `self` is a pointer argument.
+    pub fn access<D: crate::polkavm::Dependency + Clone>(
+        &self,
+        context: &crate::polkavm::context::Context<'ctx, D>,
+    ) -> anyhow::Result<inkwell::values::BasicValueEnum<'ctx>> {
+        match &self.value {
+            Value::Register(value) => Ok(*value),
+            Value::Pointer { pointer, id } => context.build_load(*pointer, id),
+        }
+    }
+
+    /// Access the underlying value.
+    ///
+    /// Will emit a stack load if `self` is a pointer argument.
+    pub fn as_pointer<D: crate::polkavm::Dependency + Clone>(
+        &self,
+        context: &crate::polkavm::context::Context<'ctx, D>,
+    ) -> anyhow::Result<crate::polkavm::context::Pointer<'ctx>> {
+        match &self.value {
+            Value::Register(value) => {
+                let pointer = context.build_alloca_at_entry(context.word_type(), "pvm_arg");
+                context.build_store(pointer, *value)?;
+                Ok(pointer)
+            }
+            Value::Pointer { pointer, .. } => Ok(*pointer),
+        }
     }
 }
 
 impl<'ctx> From<inkwell::values::BasicValueEnum<'ctx>> for Argument<'ctx> {
     fn from(value: inkwell::values::BasicValueEnum<'ctx>) -> Self {
-        Self::new(value)
+        Self::value(value)
     }
 }

crates/llvm-context/src/polkavm/context/function/runtime/entry.rs

@@ -31,6 +31,14 @@ impl Entry {
             context.xlen_type().get_undef(),
         );
 
+        let address_type = context.integer_type(revive_common::BIT_LENGTH_ETH_ADDRESS);
+        context.set_global(
+            crate::polkavm::GLOBAL_ADDRESS_SPILL_BUFFER,
+            address_type,
+            AddressSpace::Stack,
+            address_type.const_zero(),
+        );
+
         Ok(())
     }
 

crates/llvm-context/src/polkavm/context/mod.rs

@@ -750,7 +750,9 @@ where
         address: inkwell::values::IntValue<'ctx>,
     ) -> anyhow::Result<Pointer<'ctx>> {
         let address_type = self.integer_type(revive_common::BIT_LENGTH_ETH_ADDRESS);
-        let address_pointer = self.build_alloca_at_entry(address_type, "address_pointer");
+        let address_pointer = self
+            .get_global(crate::polkavm::GLOBAL_ADDRESS_SPILL_BUFFER)?
+            .into();
         let address_truncated =
             self.builder()
                 .build_int_truncate(address, address_type, "address_truncated")?;
@@ -771,27 +773,49 @@ where
             .into())
     }
 
-    /// Builds a stack load instruction.
+    /// Builds a stack load instruction with a direct assignment.
     /// Sets the alignment to 256 bits for the stack and 1 bit for the heap, parent, and child.
-    pub fn build_load(
+    pub fn build_load_assign(
         &self,
         pointer: Pointer<'ctx>,
         name: &str,
-    ) -> anyhow::Result<inkwell::values::BasicValueEnum<'ctx>> {
+        assignment_pointer: &mut Option<inkwell::values::PointerValue<'ctx>>,
+    ) -> anyhow::Result<Option<inkwell::values::BasicValueEnum<'ctx>>> {
         match pointer.address_space {
             AddressSpace::Heap => {
-                let name = <PolkaVMLoadHeapWordFunction as RuntimeFunction<D>>::NAME;
                 let declaration =
                     <PolkaVMLoadHeapWordFunction as RuntimeFunction<D>>::declaration(self);
-                let arguments = [self
+                match assignment_pointer.take() {
-                    .builder()
+                    Some(assignment_pointer) => {
-                    .build_ptr_to_int(pointer.value, self.xlen_type(), "offset_ptrtoint")?
+                        let arguments = [
-                    .as_basic_value_enum()];
+                            self.builder()
-                Ok(self
+                                .build_ptr_to_int(
-                    .build_call(declaration, &arguments, "heap_load")
+                                    pointer.value,
-                    .unwrap_or_else(|| {
+                                    self.xlen_type(),
-                        panic!("revive runtime function {name} should return a value")
+                                    "offset_ptrtoint",
-                    }))
+                                )?
+                                .as_basic_value_enum(),
+                            assignment_pointer.into(),
+                        ];
+                        self.build_call(declaration, &arguments, "heap_load");
+                        Ok(None)
+                    }
+                    None => {
+                        let pointer = self.build_alloca_at_entry(self.word_type(), "pointer");
+                        let arguments = [
+                            self.builder()
+                                .build_ptr_to_int(
+                                    pointer.value,
+                                    self.xlen_type(),
+                                    "offset_ptrtoint",
+                                )?
+                                .as_basic_value_enum(),
+                            pointer.value.into(),
+                        ];
+                        self.build_call(declaration, &arguments, "heap_load");
+                        Ok(Some(self.build_load(pointer, "storage_value")?))
+                    }
+                }
             }
             AddressSpace::Stack => {
                 let value = self
@@ -804,11 +828,23 @@ where
                     .set_alignment(revive_common::BYTE_LENGTH_STACK_ALIGN as u32)
                     .expect("Alignment is valid");
 
-                Ok(value)
+                Ok(Some(value))
             }
         }
     }
 
+    /// Builds a stack load instruction.
+    /// Sets the alignment to 256 bits for the stack and 1 bit for the heap, parent, and child.
+    pub fn build_load(
+        &self,
+        pointer: Pointer<'ctx>,
+        name: &str,
+    ) -> anyhow::Result<inkwell::values::BasicValueEnum<'ctx>> {
+        Ok(self
+            .build_load_assign(pointer, name, &mut None)?
+            .expect("without an assignment pointer loads return a value"))
+    }
+
     /// Builds a stack store instruction.
     /// Sets the alignment to 256 bits for the stack and 1 bit for the heap, parent, and child.
     pub fn build_store<V>(&self, pointer: Pointer<'ctx>, value: V) -> anyhow::Result<()>

crates/llvm-context/src/polkavm/context/pointer/heap.rs

@@ -2,6 +2,8 @@
 
 use inkwell::values::BasicValueEnum;
 
+use crate::polkavm::context::address_space::AddressSpace;
+use crate::polkavm::context::pointer::Pointer;
 use crate::polkavm::context::runtime::RuntimeFunction;
 use crate::polkavm::context::Context;
 use crate::polkavm::Dependency;
@@ -17,9 +19,13 @@ where
     const NAME: &'static str = "__revive_load_heap_word";
 
     fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context
+        context.void_type().fn_type(
-            .word_type()
+            &[
-            .fn_type(&[context.xlen_type().into()], false)
+                context.xlen_type().into(),
+                context.llvm().ptr_type(Default::default()).into(),
+            ],
+            false,
+        )
     }
 
     fn emit_body<'ctx>(
@@ -27,6 +33,7 @@ where
         context: &mut Context<'ctx, D>,
     ) -> anyhow::Result<Option<BasicValueEnum<'ctx>>> {
         let offset = Self::paramater(context, 0).into_int_value();
+        let assignment_pointer = Self::paramater(context, 1).into_pointer_value();
         let length = context
             .xlen_type()
             .const_int(revive_common::BYTE_LENGTH_WORD as u64, false);
@@ -42,7 +49,11 @@ where
             .expect("Alignment is valid");
 
         let swapped_value = context.build_byte_swap(value)?;
-        Ok(Some(swapped_value))
+        context.build_store(
+            Pointer::new(context.word_type(), AddressSpace::Stack, assignment_pointer),
+            swapped_value,
+        )?;
+        Ok(None)
     }
 }
 

crates/llvm-context/src/polkavm/context/pointer/storage.rs

@@ -2,6 +2,8 @@
 
 use inkwell::values::BasicValueEnum;
 
+use crate::polkavm::context::address_space::AddressSpace;
+use crate::polkavm::context::pointer::Pointer;
 use crate::polkavm::context::runtime::RuntimeFunction;
 use crate::polkavm::context::Context;
 use crate::polkavm::Dependency;
@@ -17,20 +19,27 @@ where
     const NAME: &'static str = "__revive_load_storage_word";
 
     fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context
+        context.void_type().fn_type(
-            .word_type()
+            &[
-            .fn_type(&[context.word_type().into()], false)
+                context.llvm().ptr_type(Default::default()).into(),
+                context.llvm().ptr_type(Default::default()).into(),
+            ],
+            false,
+        )
     }
 
     fn emit_body<'ctx>(
         &self,
         context: &mut Context<'ctx, D>,
     ) -> anyhow::Result<Option<BasicValueEnum<'ctx>>> {
-        Ok(Some(emit_load(
+        let key = Self::paramater(context, 0);
-            context,
+        let assignment_pointer = Self::paramater(context, 1).into_pointer_value();
-            Self::paramater(context, 0),
+        let value = emit_load(context, key, false)?;
-            false,
+        context.build_store(
-        )?))
+            Pointer::new(context.word_type(), AddressSpace::Stack, assignment_pointer),
+            value,
+        )?;
+        Ok(None)
     }
 }
 
@@ -59,7 +68,7 @@ where
     fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
         context
             .word_type()
-            .fn_type(&[context.word_type().into()], false)
+            .fn_type(&[context.llvm().ptr_type(Default::default()).into()], false)
     }
 
     fn emit_body<'ctx>(
@@ -94,7 +103,10 @@ where
 
     fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
         context.void_type().fn_type(
-            &[context.word_type().into(), context.word_type().into()],
+            &[
+                context.llvm().ptr_type(Default::default()).into(),
+                context.llvm().ptr_type(Default::default()).into(),
+            ],
             false,
         )
     }
@@ -138,7 +150,10 @@ where
 
     fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
         context.void_type().fn_type(
-            &[context.word_type().into(), context.word_type().into()],
+            &[
+                context.llvm().ptr_type(Default::default()).into(),
+                context.llvm().ptr_type(Default::default()).into(),
+            ],
             false,
         )
     }
@@ -173,9 +188,17 @@ where
 
 fn emit_load<'ctx, D: Dependency + Clone>(
     context: &mut Context<'ctx, D>,
-    mut key: BasicValueEnum<'ctx>,
+    key: BasicValueEnum<'ctx>,
     transient: bool,
 ) -> anyhow::Result<BasicValueEnum<'ctx>> {
+    let mut key = context.build_load(
+        super::Pointer::new(
+            context.word_type(),
+            Default::default(),
+            key.into_pointer_value(),
+        ),
+        "key",
+    )?;
     if !transient {
         key = context.build_byte_swap(key)?;
     }
@@ -217,10 +240,26 @@ fn emit_load<'ctx, D: Dependency + Clone>(
 
 fn emit_store<'ctx, D: Dependency + Clone>(
     context: &mut Context<'ctx, D>,
-    mut key: BasicValueEnum<'ctx>,
+    key: BasicValueEnum<'ctx>,
-    mut value: BasicValueEnum<'ctx>,
+    value: BasicValueEnum<'ctx>,
     transient: bool,
 ) -> anyhow::Result<()> {
+    let mut key = context.build_load(
+        super::Pointer::new(
+            context.word_type(),
+            Default::default(),
+            key.into_pointer_value(),
+        ),
+        "key",
+    )?;
+    let mut value = context.build_load(
+        super::Pointer::new(
+            context.word_type(),
+            Default::default(),
+            value.into_pointer_value(),
+        ),
+        "key",
+    )?;
     if !transient {
         key = context.build_byte_swap(key)?;
         value = context.build_byte_swap(value)?;

crates/llvm-context/src/polkavm/evm/bitwise.rs

@@ -63,7 +63,6 @@ where
     let non_overflow_block = context.append_basic_block("shift_left_non_overflow");
     let join_block = context.append_basic_block("shift_left_join");
 
-    let result_pointer = context.build_alloca(context.word_type(), "shift_left_result_pointer");
     let condition_is_overflow = context.builder().build_int_compare(
         inkwell::IntPredicate::UGT,
         shift,
@@ -73,7 +72,6 @@ where
     context.build_conditional_branch(condition_is_overflow, overflow_block, non_overflow_block)?;
 
     context.set_basic_block(overflow_block);
-    context.build_store(result_pointer, context.word_const(0))?;
     context.build_unconditional_branch(join_block);
 
     context.set_basic_block(non_overflow_block);
@@ -81,11 +79,17 @@ where
         context
             .builder()
             .build_left_shift(value, shift, "shift_left_non_overflow_result")?;
-    context.build_store(result_pointer, value)?;
     context.build_unconditional_branch(join_block);
 
     context.set_basic_block(join_block);
-    context.build_load(result_pointer, "shift_left_result")
+    let result = context
+        .builder()
+        .build_phi(context.word_type(), "shift_left_value")?;
+    result.add_incoming(&[
+        (&value, non_overflow_block),
+        (&context.word_const(0), overflow_block),
+    ]);
+    Ok(result.as_basic_value())
 }
 
 /// Translates the bitwise shift right.
@@ -101,7 +105,6 @@ where
     let non_overflow_block = context.append_basic_block("shift_right_non_overflow");
     let join_block = context.append_basic_block("shift_right_join");
 
-    let result_pointer = context.build_alloca(context.word_type(), "shift_right_result_pointer");
     let condition_is_overflow = context.builder().build_int_compare(
         inkwell::IntPredicate::UGT,
         shift,
@@ -111,7 +114,6 @@ where
     context.build_conditional_branch(condition_is_overflow, overflow_block, non_overflow_block)?;
 
     context.set_basic_block(overflow_block);
-    context.build_store(result_pointer, context.word_const(0))?;
     context.build_unconditional_branch(join_block);
 
     context.set_basic_block(non_overflow_block);
@@ -121,11 +123,17 @@ where
         false,
         "shift_right_non_overflow_result",
     )?;
-    context.build_store(result_pointer, value)?;
     context.build_unconditional_branch(join_block);
 
     context.set_basic_block(join_block);
-    context.build_load(result_pointer, "shift_right_result")
+    let result = context
+        .builder()
+        .build_phi(context.word_type(), "shift_right_value")?;
+    result.add_incoming(&[
+        (&value, non_overflow_block),
+        (&context.word_const(0), overflow_block),
+    ]);
+    Ok(result.as_basic_value())
 }
 
 /// Translates the arithmetic bitwise shift right.
@@ -145,8 +153,6 @@ where
     let non_overflow_block = context.append_basic_block("shift_right_arithmetic_non_overflow");
     let join_block = context.append_basic_block("shift_right_arithmetic_join");
 
-    let result_pointer =
-        context.build_alloca(context.word_type(), "shift_right_arithmetic_result_pointer");
     let condition_is_overflow = context.builder().build_int_compare(
         inkwell::IntPredicate::UGT,
         shift,
@@ -174,11 +180,9 @@ where
     )?;
 
     context.set_basic_block(overflow_positive_block);
-    context.build_store(result_pointer, context.word_const(0))?;
     context.build_unconditional_branch(join_block);
 
     context.set_basic_block(overflow_negative_block);
-    context.build_store(result_pointer, context.word_type().const_all_ones())?;
     context.build_unconditional_branch(join_block);
 
     context.set_basic_block(non_overflow_block);
@@ -188,11 +192,21 @@ where
         true,
         "shift_right_arithmetic_non_overflow_result",
     )?;
-    context.build_store(result_pointer, value)?;
     context.build_unconditional_branch(join_block);
 
     context.set_basic_block(join_block);
-    context.build_load(result_pointer, "shift_right_arithmetic_result")
+    let result = context
+        .builder()
+        .build_phi(context.word_type(), "shift_arithmetic_right_value")?;
+    result.add_incoming(&[
+        (&value, non_overflow_block),
+        (
+            &context.word_type().const_all_ones(),
+            overflow_negative_block,
+        ),
+        (&context.word_const(0), overflow_block),
+    ]);
+    Ok(result.as_basic_value())
 }
 
 /// Translates the `byte` instruction, extracting the byte of `operand_2`

crates/llvm-context/src/polkavm/evm/context.rs

@@ -2,6 +2,7 @@
 
 use inkwell::values::BasicValue;
 
+use crate::polkavm::context::pointer::Pointer;
 use crate::polkavm::context::Context;
 use crate::polkavm::Dependency;
 
@@ -49,7 +50,9 @@ where
     D: Dependency + Clone,
 {
     let address_type = context.integer_type(revive_common::BIT_LENGTH_ETH_ADDRESS);
-    let address_pointer = context.build_alloca_at_entry(address_type, "origin_address");
+    let address_pointer: Pointer<'_> = context
+        .get_global(crate::polkavm::GLOBAL_ADDRESS_SPILL_BUFFER)?
+        .into();
     context.build_store(address_pointer, address_type.const_zero())?;
     context.build_runtime_call(
         revive_runtime_api::polkavm_imports::ORIGIN,
@@ -97,13 +100,13 @@ where
     D: Dependency + Clone,
 {
     let output_pointer = context.build_alloca_at_entry(context.word_type(), "blockhash_out_ptr");
-    let index_ptr = context.build_alloca_at_entry(context.word_type(), "blockhash_index_ptr");
+    let index_pointer = context.build_alloca_at_entry(context.word_type(), "blockhash_index_ptr");
-    context.build_store(index_ptr, index)?;
+    context.build_store(index_pointer, index)?;
 
     context.build_runtime_call(
         revive_runtime_api::polkavm_imports::BLOCK_HASH,
         &[
-            index_ptr.to_int(context).into(),
+            index_pointer.to_int(context).into(),
             output_pointer.to_int(context).into(),
         ],
     );
@@ -127,10 +130,9 @@ pub fn coinbase<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let pointer = context.build_alloca_at_entry(
+    let pointer: Pointer<'_> = context
-        context.integer_type(revive_common::BIT_LENGTH_ETH_ADDRESS),
+        .get_global(crate::polkavm::GLOBAL_ADDRESS_SPILL_BUFFER)?
-        "coinbase_output",
+        .into();
-    );
     context.build_runtime_call(
         revive_runtime_api::polkavm_imports::BLOCK_AUTHOR,
         &[pointer.to_int(context).into()],
@@ -155,10 +157,9 @@ pub fn address<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let pointer = context.build_alloca_at_entry(
+    let pointer: Pointer<'_> = context
-        context.integer_type(revive_common::BIT_LENGTH_ETH_ADDRESS),
+        .get_global(crate::polkavm::GLOBAL_ADDRESS_SPILL_BUFFER)?
-        "address_output",
+        .into();
-    );
     context.build_runtime_call(
         revive_runtime_api::polkavm_imports::ADDRESS,
         &[pointer.to_int(context).into()],
@@ -173,10 +174,9 @@ pub fn caller<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let pointer = context.build_alloca_at_entry(
+    let pointer: Pointer<'_> = context
-        context.integer_type(revive_common::BIT_LENGTH_ETH_ADDRESS),
+        .get_global(crate::polkavm::GLOBAL_ADDRESS_SPILL_BUFFER)?
-        "address_output",
+        .into();
-    );
     context.build_runtime_call(
         revive_runtime_api::polkavm_imports::CALLER,
         &[pointer.to_int(context).into()],

crates/llvm-context/src/polkavm/evm/create.rs

@@ -119,10 +119,8 @@ where
                 _ => error,
             })?;
     if contract_path.as_str() == parent {
-        return Ok(Argument::new_with_constant(
+        return Ok(Argument::value(context.word_const(0).as_basic_value_enum())
-            context.word_const(0).as_basic_value_enum(),
+            .with_constant(num::BigUint::zero()));
-            num::BigUint::zero(),
-        ));
     } else if identifier.ends_with("_deployed") && code_type == CodeType::Runtime {
         anyhow::bail!("type({}).runtimeCode is not supported", identifier);
     }
@@ -131,7 +129,7 @@ where
     let hash_value = context
         .word_const_str_hex(hash_string.as_str())
         .as_basic_value_enum();
-    Ok(Argument::new_with_original(hash_value, hash_string))
+    Ok(Argument::value(hash_value).with_original(hash_string))
 }
 
 /// Translates the deploy call header size instruction. the header consists of
@@ -160,10 +158,8 @@ where
                 _ => error,
             })?;
     if contract_path.as_str() == parent {
-        return Ok(Argument::new_with_constant(
+        return Ok(Argument::value(context.word_const(0).as_basic_value_enum())
-            context.word_const(0).as_basic_value_enum(),
+            .with_constant(num::BigUint::zero()));
-            num::BigUint::zero(),
-        ));
     } else if identifier.ends_with("_deployed") && code_type == CodeType::Runtime {
         anyhow::bail!("type({}).runtimeCode is not supported", identifier);
     }
@@ -172,5 +168,5 @@ where
     let size_value = context
         .word_const(crate::polkavm::DEPLOYER_CALL_HEADER_SIZE as u64)
         .as_basic_value_enum();
-    Ok(Argument::new_with_constant(size_value, size_bigint))
+    Ok(Argument::value(size_value).with_constant(size_bigint))
 }

crates/llvm-context/src/polkavm/evm/ether_gas.rs

@@ -28,7 +28,7 @@ pub fn value<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let output_pointer = context.build_alloca(context.value_type(), "value_transferred");
+    let output_pointer = context.build_alloca_at_entry(context.value_type(), "value_transferred");
     context.build_store(output_pointer, context.word_const(0))?;
     context.build_runtime_call(
         revive_runtime_api::polkavm_imports::VALUE_TRANSFERRED,
@@ -46,8 +46,7 @@ where
     D: Dependency + Clone,
 {
     let address_pointer = context.build_address_argument_store(address)?;
-
+    let balance_pointer = context.build_alloca_at_entry(context.word_type(), "balance_pointer");
-    let balance_pointer = context.build_alloca(context.word_type(), "balance_pointer");
     let balance = context.builder().build_ptr_to_int(
         balance_pointer.value,
         context.xlen_type(),
@@ -69,7 +68,7 @@ pub fn self_balance<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let balance_pointer = context.build_alloca(context.word_type(), "balance_pointer");
+    let balance_pointer = context.build_alloca_at_entry(context.word_type(), "balance_pointer");
     let balance = context.builder().build_ptr_to_int(
         balance_pointer.value,
         context.xlen_type(),

crates/llvm-context/src/polkavm/evm/memory.rs

@@ -29,7 +29,8 @@ where
 pub fn load<'ctx, D>(
     context: &mut Context<'ctx, D>,
     offset: inkwell::values::IntValue<'ctx>,
-) -> anyhow::Result<inkwell::values::BasicValueEnum<'ctx>>
+    assignment_pointer: &mut Option<inkwell::values::PointerValue<'ctx>>,
+) -> anyhow::Result<Option<inkwell::values::BasicValueEnum<'ctx>>>
 where
     D: Dependency + Clone,
 {
@@ -40,7 +41,7 @@ where
         offset,
         "memory_load_pointer",
     );
-    context.build_load(pointer, "memory_load_result")
+    context.build_load_assign(pointer, "memory_load_result", assignment_pointer)
 }
 
 /// Translates the `mstore` instruction.

crates/llvm-context/src/polkavm/evm/storage.rs

@@ -3,6 +3,7 @@
 use crate::polkavm::context::runtime::RuntimeFunction;
 use crate::polkavm::context::Context;
 use crate::polkavm::Dependency;
+use crate::PolkaVMArgument;
 use crate::PolkaVMLoadStorageWordFunction;
 use crate::PolkaVMLoadTransientStorageWordFunction;
 use crate::PolkaVMStoreStorageWordFunction;
@@ -11,30 +12,49 @@ use crate::PolkaVMStoreTransientStorageWordFunction;
 /// Translates the storage load.
 pub fn load<'ctx, D>(
     context: &mut Context<'ctx, D>,
-    position: inkwell::values::IntValue<'ctx>,
+    position: &PolkaVMArgument<'ctx>,
-) -> anyhow::Result<inkwell::values::BasicValueEnum<'ctx>>
+    assignment_pointer: &mut Option<inkwell::values::PointerValue<'ctx>>,
+) -> anyhow::Result<Option<inkwell::values::BasicValueEnum<'ctx>>>
 where
     D: Dependency + Clone,
 {
-    let name = <PolkaVMLoadStorageWordFunction as RuntimeFunction<D>>::NAME;
+    let _name = <PolkaVMLoadStorageWordFunction as RuntimeFunction<D>>::NAME;
     let declaration = <PolkaVMLoadStorageWordFunction as RuntimeFunction<D>>::declaration(context);
-    let arguments = [position.into()];
+    match assignment_pointer.take() {
-    Ok(context
+        Some(assignment_pointer) => {
-        .build_call(declaration, &arguments, "storage_load")
+            let arguments = [
-        .unwrap_or_else(|| panic!("runtime function {name} should return a value")))
+                position.as_pointer(context)?.value.into(),
+                assignment_pointer.into(),
+            ];
+            context.build_call(declaration, &arguments, "storage_load");
+            Ok(None)
+        }
+        None => {
+            let pointer = context.build_alloca_at_entry(context.word_type(), "pointer");
+            let arguments = [
+                position.as_pointer(context)?.value.into(),
+                pointer.value.into(),
+            ];
+            context.build_call(declaration, &arguments, "storage_load");
+            Ok(Some(context.build_load(pointer, "storage_value")?))
+        }
+    }
 }
 
 /// Translates the storage store.
 pub fn store<'ctx, D>(
     context: &mut Context<'ctx, D>,
-    position: inkwell::values::IntValue<'ctx>,
+    position: &PolkaVMArgument<'ctx>,
-    value: inkwell::values::IntValue<'ctx>,
+    value: &PolkaVMArgument<'ctx>,
 ) -> anyhow::Result<()>
 where
     D: Dependency + Clone,
 {
     let declaration = <PolkaVMStoreStorageWordFunction as RuntimeFunction<D>>::declaration(context);
-    let arguments = [position.into(), value.into()];
+    let arguments = [
+        position.as_pointer(context)?.value.into(),
+        value.as_pointer(context)?.value.into(),
+    ];
     context.build_call(declaration, &arguments, "storage_store");
     Ok(())
 }
@@ -42,13 +62,13 @@ where
 /// Translates the transient storage load.
 pub fn transient_load<'ctx, D>(
     context: &mut Context<'ctx, D>,
-    position: inkwell::values::IntValue<'ctx>,
+    position: &PolkaVMArgument<'ctx>,
 ) -> anyhow::Result<inkwell::values::BasicValueEnum<'ctx>>
 where
     D: Dependency + Clone,
 {
     let name = <PolkaVMLoadTransientStorageWordFunction as RuntimeFunction<D>>::NAME;
-    let arguments = [position.into()];
+    let arguments = [position.as_pointer(context)?.value.into()];
     let declaration =
         <PolkaVMLoadTransientStorageWordFunction as RuntimeFunction<D>>::declaration(context);
     Ok(context
@@ -59,15 +79,18 @@ where
 /// Translates the transient storage store.
 pub fn transient_store<'ctx, D>(
     context: &mut Context<'ctx, D>,
-    position: inkwell::values::IntValue<'ctx>,
+    position: &PolkaVMArgument<'ctx>,
-    value: inkwell::values::IntValue<'ctx>,
+    value: &PolkaVMArgument<'ctx>,
 ) -> anyhow::Result<()>
 where
     D: Dependency + Clone,
 {
     let declaration =
         <PolkaVMStoreTransientStorageWordFunction as RuntimeFunction<D>>::declaration(context);
-    let arguments = [position.into(), value.into()];
+    let arguments = [
+        position.as_pointer(context)?.value.into(),
+        value.as_pointer(context)?.value.into(),
+    ];
     context.build_call(declaration, &arguments, "transient_storage_store");
     Ok(())
 }

crates/solidity/src/test_utils.rs

@@ -92,7 +92,7 @@ pub fn build_solidity_with_options(
         SolcStandardJsonInputSettingsSelection::new_required(),
         SolcStandardJsonInputSettingsOptimizer::new(
             solc_optimizer_enabled,
-            None,
+            optimizer_settings.middle_end_as_string().chars().last(),
             &solc_version.default,
             false,
         ),
@@ -102,16 +102,21 @@ pub fn build_solidity_with_options(
 
     let mut output = solc.standard_json(input, None, vec![], None)?;
 
+    let debug_config = revive_llvm_context::DebugConfig::new(
+        None,
+        optimizer_settings.middle_end_as_string() != "z",
+    );
+
     let project = Project::try_from_standard_json_output(
         &output,
         sources,
         libraries,
         &solc_version,
-        &DEBUG_CONFIG,
+        &debug_config,
     )?;
 
     let build: crate::Build =
-        project.compile(optimizer_settings, false, DEBUG_CONFIG, Default::default())?;
+        project.compile(optimizer_settings, false, debug_config, Default::default())?;
     build.write_to_standard_json(&mut output, &solc_version)?;
 
     Ok(output)

crates/solidity/src/yul/parser/statement/assignment.rs

@@ -121,11 +121,6 @@ where
     ) -> anyhow::Result<()> {
         context.set_debug_location(self.location.line, 0, None)?;
 
-        let value = match self.initializer.into_llvm(context)? {
-            Some(value) => value,
-            None => return Ok(()),
-        };
-
         if self.bindings.len() == 1 {
             let identifier = self.bindings.remove(0);
             let pointer = context
@@ -139,13 +134,31 @@ where
                         identifier.inner,
                     )
                 })?;
-            context.build_store(pointer, value.to_llvm())?;
+
+            let mut assignment_pointer = Some(pointer.value);
+            let value = match self
+                .initializer
+                .into_llvm(context, &mut assignment_pointer)?
+            {
+                Some(value) => value,
+                None => return Ok(()),
+            };
+
+            if assignment_pointer.is_some() {
+                context.build_store(pointer, value.access(context)?)?;
+            }
+
             return Ok(());
         }
 
-        let llvm_type = value.to_llvm().into_struct_value().get_type();
+        let value = match self.initializer.into_llvm(context, &mut None)? {
+            Some(value) => value,
+            None => return Ok(()),
+        };
+        let value = value.access(context)?;
+        let llvm_type = value.into_struct_value().get_type();
         let tuple_pointer = context.build_alloca(llvm_type, "assignment_pointer");
-        context.build_store(tuple_pointer, value.to_llvm())?;
+        context.build_store(tuple_pointer, value)?;
 
         for (index, binding) in self.bindings.into_iter().enumerate() {
             context.set_debug_location(self.location.line, 0, None)?;

crates/solidity/src/yul/parser/statement/block.rs

@@ -184,7 +184,7 @@ where
                     block.into_llvm(context)?;
                 }
                 Statement::Expression(expression) => {
-                    expression.into_llvm(context)?;
+                    expression.into_llvm(context, &mut None)?;
                 }
                 Statement::VariableDeclaration(statement) => statement.into_llvm(context)?,
                 Statement::Assignment(statement) => statement.into_llvm(context)?,

crates/solidity/src/yul/parser/statement/expression/function_call/mod.rs

@@ -118,6 +118,7 @@ impl FunctionCall {
     pub fn into_llvm<'ctx, D>(
         mut self,
         context: &mut revive_llvm_context::PolkaVMContext<'ctx, D>,
+        assignment_pointer: &mut Option<inkwell::values::PointerValue<'ctx>>,
     ) -> anyhow::Result<Option<inkwell::values::BasicValueEnum<'ctx>>>
     where
         D: revive_llvm_context::PolkaVMDependency + Clone,
@@ -128,7 +129,10 @@ impl FunctionCall {
             Name::UserDefined(name) => {
                 let mut values = Vec::with_capacity(self.arguments.len());
                 for argument in self.arguments.into_iter().rev() {
-                    let value = argument.into_llvm(context)?.expect("Always exists").value;
+                    let value = argument
+                        .into_llvm(context, &mut None)?
+                        .expect("Always exists")
+                        .access(context)?;
                     values.push(value);
                 }
                 values.reverse();
@@ -413,8 +417,8 @@ impl FunctionCall {
                 revive_llvm_context::polkavm_evm_memory::load(
                     context,
                     arguments[0].into_int_value(),
+                    assignment_pointer,
                 )
-                .map(Some)
             }
             Name::MStore => {
                 let arguments = self.pop_arguments_llvm::<D, 2>(context)?;
@@ -461,36 +465,33 @@ impl FunctionCall {
             }
 
             Name::SLoad => {
-                let arguments = self.pop_arguments_llvm::<D, 1>(context)?;
+                let arguments = self.pop_arguments::<D, 1>(context)?;
                 revive_llvm_context::polkavm_evm_storage::load(
                     context,
-                    arguments[0].into_int_value(),
+                    &arguments[0],
+                    assignment_pointer,
                 )
-                .map(Some)
             }
             Name::SStore => {
-                let arguments = self.pop_arguments_llvm::<D, 2>(context)?;
+                let arguments = self.pop_arguments::<D, 2>(context)?;
                 revive_llvm_context::polkavm_evm_storage::store(
                     context,
-                    arguments[0].into_int_value(),
+                    &arguments[0],
-                    arguments[1].into_int_value(),
+                    &arguments[1],
                 )
                 .map(|_| None)
             }
             Name::TLoad => {
-                let arguments = self.pop_arguments_llvm::<D, 1>(context)?;
+                let arguments = self.pop_arguments::<D, 1>(context)?;
-                revive_llvm_context::polkavm_evm_storage::transient_load(
+                revive_llvm_context::polkavm_evm_storage::transient_load(context, &arguments[0])
-                    context,
+                    .map(Some)
-                    arguments[0].into_int_value(),
-                )
-                .map(Some)
             }
             Name::TStore => {
-                let arguments = self.pop_arguments_llvm::<D, 2>(context)?;
+                let arguments = self.pop_arguments::<D, 2>(context)?;
                 revive_llvm_context::polkavm_evm_storage::transient_store(
                     context,
-                    arguments[0].into_int_value(),
+                    &arguments[0],
-                    arguments[1].into_int_value(),
+                    &arguments[1],
                 )
                 .map(|_| None)
             }
@@ -514,7 +515,7 @@ impl FunctionCall {
                 let offset = context.solidity_mut().allocate_immutable(key.as_str())
                     / revive_common::BYTE_LENGTH_WORD;
                 let index = context.xlen_type().const_int(offset as u64, false);
-                let value = arguments[2].value.into_int_value();
+                let value = arguments[2].access(context)?.into_int_value();
                 revive_llvm_context::polkavm_evm_immutable::store(context, index, value)
                     .map(|_| None)
             }
@@ -720,13 +721,13 @@ impl FunctionCall {
             Name::Call => {
                 let arguments = self.pop_arguments::<D, 7>(context)?;
 
-                let gas = arguments[0].value.into_int_value();
+                let gas = arguments[0].access(context)?.into_int_value();
-                let address = arguments[1].value.into_int_value();
+                let address = arguments[1].access(context)?.into_int_value();
-                let value = arguments[2].value.into_int_value();
+                let value = arguments[2].access(context)?.into_int_value();
-                let input_offset = arguments[3].value.into_int_value();
+                let input_offset = arguments[3].access(context)?.into_int_value();
-                let input_size = arguments[4].value.into_int_value();
+                let input_size = arguments[4].access(context)?.into_int_value();
-                let output_offset = arguments[5].value.into_int_value();
+                let output_offset = arguments[5].access(context)?.into_int_value();
-                let output_size = arguments[6].value.into_int_value();
+                let output_size = arguments[6].access(context)?.into_int_value();
 
                 let simulation_address: Vec<Option<num::BigUint>> = arguments
                     .into_iter()
@@ -750,12 +751,12 @@ impl FunctionCall {
             Name::StaticCall => {
                 let arguments = self.pop_arguments::<D, 6>(context)?;
 
-                let gas = arguments[0].value.into_int_value();
+                let gas = arguments[0].access(context)?.into_int_value();
-                let address = arguments[1].value.into_int_value();
+                let address = arguments[1].access(context)?.into_int_value();
-                let input_offset = arguments[2].value.into_int_value();
+                let input_offset = arguments[2].access(context)?.into_int_value();
-                let input_size = arguments[3].value.into_int_value();
+                let input_size = arguments[3].access(context)?.into_int_value();
-                let output_offset = arguments[4].value.into_int_value();
+                let output_offset = arguments[4].access(context)?.into_int_value();
-                let output_size = arguments[5].value.into_int_value();
+                let output_size = arguments[5].access(context)?.into_int_value();
 
                 let simulation_address: Vec<Option<num::BigUint>> = arguments
                     .into_iter()
@@ -779,12 +780,12 @@ impl FunctionCall {
             Name::DelegateCall => {
                 let arguments = self.pop_arguments::<D, 6>(context)?;
 
-                let gas = arguments[0].value.into_int_value();
+                let gas = arguments[0].access(context)?.into_int_value();
-                let address = arguments[1].value.into_int_value();
+                let address = arguments[1].access(context)?.into_int_value();
-                let input_offset = arguments[2].value.into_int_value();
+                let input_offset = arguments[2].access(context)?.into_int_value();
-                let input_size = arguments[3].value.into_int_value();
+                let input_size = arguments[3].access(context)?.into_int_value();
-                let output_offset = arguments[4].value.into_int_value();
+                let output_offset = arguments[4].access(context)?.into_int_value();
-                let output_size = arguments[5].value.into_int_value();
+                let output_size = arguments[5].access(context)?.into_int_value();
 
                 let simulation_address: Vec<Option<num::BigUint>> = arguments
                     .into_iter()
@@ -845,7 +846,8 @@ impl FunctionCall {
                 })?;
 
                 revive_llvm_context::polkavm_evm_create::contract_hash(context, identifier)
-                    .map(|argument| Some(argument.value))
+                    .and_then(|argument| argument.access(context))
+                    .map(Some)
             }
             Name::DataSize => {
                 let mut arguments = self.pop_arguments::<D, 1>(context)?;
@@ -855,7 +857,8 @@ impl FunctionCall {
                 })?;
 
                 revive_llvm_context::polkavm_evm_create::header_size(context, identifier)
-                    .map(|argument| Some(argument.value))
+                    .and_then(|argument| argument.access(context))
+                    .map(Some)
             }
             Name::DataCopy => {
                 let arguments = self.pop_arguments_llvm::<D, 3>(context)?;
@@ -989,7 +992,12 @@ impl FunctionCall {
     {
         let mut arguments = Vec::with_capacity(N);
         for expression in self.arguments.drain(0..N).rev() {
-            arguments.push(expression.into_llvm(context)?.expect("Always exists").value);
+            arguments.push(
+                expression
+                    .into_llvm(context, &mut None)?
+                    .expect("Always exists")
+                    .access(context)?,
+            );
         }
         arguments.reverse();
 
@@ -1006,7 +1014,11 @@ impl FunctionCall {
     {
         let mut arguments = Vec::with_capacity(N);
         for expression in self.arguments.drain(0..N).rev() {
-            arguments.push(expression.into_llvm(context)?.expect("Always exists"));
+            arguments.push(
+                expression
+                    .into_llvm(context, &mut None)?
+                    .expect("Always exists"),
+            );
         }
         arguments.reverse();
 

crates/solidity/src/yul/parser/statement/expression/literal.rs

@@ -97,9 +97,7 @@ impl Literal {
                     BooleanLiteral::True => num::BigUint::one(),
                 };
 
-                Ok(revive_llvm_context::PolkaVMArgument::new_with_constant(
+                Ok(revive_llvm_context::PolkaVMArgument::value(value).with_constant(constant))
-                    value, constant,
-                ))
             }
             LexicalLiteral::Integer(inner) => {
                 let r#type = self.yul_type.unwrap_or_default().into_llvm(context);
@@ -127,9 +125,7 @@ impl Literal {
                 }
                 .expect("Always valid");
 
-                Ok(revive_llvm_context::PolkaVMArgument::new_with_constant(
+                Ok(revive_llvm_context::PolkaVMArgument::value(value).with_constant(constant))
-                    value, constant,
-                ))
             }
             LexicalLiteral::String(inner) => {
                 let string = inner.inner;
@@ -200,10 +196,10 @@ impl Literal {
                 };
 
                 if hex_string.len() > revive_common::BYTE_LENGTH_WORD * 2 {
-                    return Ok(revive_llvm_context::PolkaVMArgument::new_with_original(
+                    return Ok(revive_llvm_context::PolkaVMArgument::value(
                         r#type.const_zero().as_basic_value_enum(),
-                        string,
+                    )
-                    ));
+                    .with_original(string));
                 }
 
                 if hex_string.len() < revive_common::BYTE_LENGTH_WORD * 2 {
@@ -220,9 +216,7 @@ impl Literal {
                     )
                     .expect("The value is valid")
                     .as_basic_value_enum();
-                Ok(revive_llvm_context::PolkaVMArgument::new_with_original(
+                Ok(revive_llvm_context::PolkaVMArgument::value(value).with_original(string))
-                    value, string,
-                ))
             }
         }
     }

crates/solidity/src/yul/parser/statement/expression/mod.rs

@@ -101,6 +101,7 @@ impl Expression {
     pub fn into_llvm<'ctx, D>(
         self,
         context: &mut revive_llvm_context::PolkaVMContext<'ctx, D>,
+        assignment_pointer: &mut Option<inkwell::values::PointerValue<'ctx>>,
     ) -> anyhow::Result<Option<revive_llvm_context::PolkaVMArgument<'ctx>>>
     where
         D: revive_llvm_context::PolkaVMDependency + Clone,
@@ -119,36 +120,28 @@ impl Expression {
                 })
                 .map(Some),
             Self::Identifier(identifier) => {
+                let id = identifier.inner;
+
                 let pointer = context
                     .current_function()
                     .borrow()
-                    .get_stack_pointer(identifier.inner.as_str())
+                    .get_stack_pointer(&id)
                     .ok_or_else(|| {
-                        anyhow::anyhow!(
+                        anyhow::anyhow!("{} Undeclared variable `{}`", identifier.location, id)
-                            "{} Undeclared variable `{}`",
-                            identifier.location,
-                            identifier.inner,
-                        )
                     })?;
 
-                let constant = context
+                let constant = context.current_function().borrow().yul().get_constant(&id);
-                    .current_function()
-                    .borrow()
-                    .yul()
-                    .get_constant(identifier.inner.as_str());
 
-                let value = context.build_load(pointer, identifier.inner.as_str())?;
+                let argument = revive_llvm_context::PolkaVMArgument::pointer(pointer, id);
 
-                match constant {
+                Ok(Some(match constant {
-                    Some(constant) => Ok(Some(
+                    Some(constant) => argument.with_constant(constant),
-                        revive_llvm_context::PolkaVMArgument::new_with_constant(value, constant),
+                    _ => argument,
-                    )),
+                }))
-                    None => Ok(Some(value.into())),
-                }
             }
             Self::FunctionCall(call) => Ok(call
-                .into_llvm(context)?
+                .into_llvm(context, assignment_pointer)?
-                .map(revive_llvm_context::PolkaVMArgument::new)),
+                .map(revive_llvm_context::PolkaVMArgument::value)),
         }
     }
 }

crates/solidity/src/yul/parser/statement/for_loop.rs

@@ -76,9 +76,9 @@ where
         context.set_basic_block(condition_block);
         let condition = self
             .condition
-            .into_llvm(context)?
+            .into_llvm(context, &mut None)?
             .expect("Always exists")
-            .to_llvm()
+            .access(context)?
             .into_int_value();
         let condition = context.builder().build_int_z_extend_or_bit_cast(
             condition,

crates/solidity/src/yul/parser/statement/if_conditional.rs

@@ -55,9 +55,9 @@ where
     fn into_llvm(self, context: &mut revive_llvm_context::PolkaVMContext<D>) -> anyhow::Result<()> {
         let condition = self
             .condition
-            .into_llvm(context)?
+            .into_llvm(context, &mut None)?
             .expect("Always exists")
-            .to_llvm()
+            .access(context)?
             .into_int_value();
         let condition = context.builder().build_int_z_extend_or_bit_cast(
             condition,

crates/solidity/src/yul/parser/statement/switch/mod.rs

@@ -123,7 +123,7 @@ where
     D: revive_llvm_context::PolkaVMDependency + Clone,
 {
     fn into_llvm(self, context: &mut revive_llvm_context::PolkaVMContext<D>) -> anyhow::Result<()> {
-        let scrutinee = self.expression.into_llvm(context)?;
+        let scrutinee = self.expression.into_llvm(context, &mut None)?;
 
         if self.cases.is_empty() {
             if let Some(block) = self.default {
@@ -137,7 +137,7 @@ where
 
         let mut branches = Vec::with_capacity(self.cases.len());
         for (index, case) in self.cases.into_iter().enumerate() {
-            let constant = case.literal.into_llvm(context)?.to_llvm();
+            let constant = case.literal.into_llvm(context)?.access(context)?;
 
             let expression_block = context
                 .append_basic_block(format!("switch_case_branch_{}_block", index + 1).as_str());
@@ -161,7 +161,10 @@ where
 
         context.set_basic_block(current_block);
         context.builder().build_switch(
-            scrutinee.expect("Always exists").to_llvm().into_int_value(),
+            scrutinee
+                .expect("Always exists")
+                .access(context)?
+                .into_int_value(),
             default_block,
             branches.as_slice(),
         )?;

crates/solidity/src/yul/parser/statement/variable_declaration.rs

@@ -110,8 +110,9 @@ where
                 .borrow_mut()
                 .insert_stack_pointer(identifier.inner.clone(), pointer);
 
+            let mut assignment_pointer = Some(pointer.value);
             let value = if let Some(expression) = self.expression {
-                match expression.into_llvm(context)? {
+                match expression.into_llvm(context, &mut assignment_pointer)? {
                     Some(mut value) => {
                         if let Some(constant) = value.constant.take() {
                             context
@@ -121,14 +122,16 @@ where
                                 .insert_constant(identifier.inner.clone(), constant);
                         }
 
-                        value.to_llvm()
+                        value.access(context)?
                     }
                     None => r#type.const_zero().as_basic_value_enum(),
                 }
             } else {
                 r#type.const_zero().as_basic_value_enum()
             };
-            context.build_store(pointer, value)?;
+            if assignment_pointer.is_some() {
+                context.build_store(pointer, value)?;
+            }
             return Ok(());
         }
 
@@ -156,7 +159,7 @@ where
             None => return Ok(()),
         };
         let location = expression.location();
-        let expression = match expression.into_llvm(context)? {
+        let expression = match expression.into_llvm(context, &mut None)? {
             Some(expression) => expression,
             None => return Ok(()),
         };
@@ -175,7 +178,8 @@ where
                 .collect::<Vec<inkwell::types::BasicTypeEnum<'ctx>>>()
                 .as_slice(),
         );
-        if expression.value.get_type() != llvm_type.as_basic_type_enum() {
+        let value = expression.access(context)?;
+        if value.get_type() != llvm_type.as_basic_type_enum() {
             anyhow::bail!(
                 "{} Assignment to {:?} received an invalid number of arguments",
                 location,
@@ -183,7 +187,7 @@ where
             );
         }
         let pointer = context.build_alloca(llvm_type, "bindings_pointer");
-        context.build_store(pointer, expression.to_llvm())?;
+        context.build_store(pointer, value)?;
 
         for (index, binding) in self.bindings.into_iter().enumerate() {
             let pointer = context.build_gep(