Fix load and store for ByValPair values with differently sized components

1 files changed, 15 insertions, 0 deletions

diff --git a/example/std_example.rs b/example/std_example.rs
index ce74efee8a8..805a51ec219 100644
--- a/example/std_example.rs
+++ b/example/std_example.rs
@@ -17,6 +17,9 @@ fn main() {
     ONCE.call_once(|| {});
 
     LoopState::Continue(()) == LoopState::Break(());
+
+    // Make sure ByValPair values with differently sized components are correctly passed
+    map(None::<(u8, Box<Instruction>)>);
 }
 
 #[derive(PartialEq)]
@@ -24,3 +27,15 @@ enum LoopState {
     Continue(()),
     Break(())
 }
+
+pub enum Instruction {
+    Increment,
+    Loop,
+}
+
+fn map(a: Option<(u8, Box<Instruction>)>) -> Option<Box<Instruction>> {
+    match a {
+        None => None,
+        Some((_, instr)) => Some(instr),
+    }
+}