clippy: missing_transmute_annotations

jeffwashington · May 14, 2024 · 01b5fe5 · 01b5fe5
1 parent 44f6cbd
commit 01b5fe5
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 8 deletions.
diff --git a/program-test/src/lib.rs b/program-test/src/lib.rs
@@ -90,8 +90,12 @@ thread_local! {
     static INVOKE_CONTEXT: RefCell<Option<usize>> = const { RefCell::new(None) };
 }
 fn set_invoke_context(new: &mut InvokeContext) {
-    INVOKE_CONTEXT
-        .with(|invoke_context| unsafe { invoke_context.replace(Some(transmute::<_, usize>(new))) });
+    INVOKE_CONTEXT.with(|invoke_context| unsafe {
+        invoke_context.replace(Some(transmute::<
+            &mut solana_program_runtime::invoke_context::InvokeContext<'_>,
+            usize,
+        >(new)))
+    });
 }
 fn get_invoke_context<'a, 'b>() -> &'a mut InvokeContext<'b> {
     let ptr = INVOKE_CONTEXT.with(|invoke_context| match *invoke_context.borrow() {

diff --git a/programs/bpf_loader/src/lib.rs b/programs/bpf_loader/src/lib.rs
@@ -1335,7 +1335,16 @@ fn execute<'a, 'b: 'a>(
 ) -> Result<(), Box<dyn std::error::Error>> {
     // We dropped the lifetime tracking in the Executor by setting it to 'static,
     // thus we need to reintroduce the correct lifetime of InvokeContext here again.
-    let executable = unsafe { mem::transmute::<_, &'a Executable<InvokeContext<'b>>>(executable) };
+    let executable = unsafe {
+        mem::transmute::<
+            &solana_rbpf::elf::Executable<
+                solana_program_runtime::invoke_context::InvokeContext<'_>,
+            >,
+            &solana_rbpf::elf::Executable<
+                solana_program_runtime::invoke_context::InvokeContext<'_>,
+            >,
+        >(executable)
+    };
     let log_collector = invoke_context.get_log_collector();
     let transaction_context = &invoke_context.transaction_context;
     let instruction_context = transaction_context.get_current_instruction_context()?;

diff --git a/programs/loader-v4/src/lib.rs b/programs/loader-v4/src/lib.rs
@@ -146,8 +146,16 @@ fn execute<'a, 'b: 'a>(
 ) -> Result<(), Box<dyn std::error::Error>> {
     // We dropped the lifetime tracking in the Executor by setting it to 'static,
     // thus we need to reintroduce the correct lifetime of InvokeContext here again.
-    let executable =
-        unsafe { std::mem::transmute::<_, &'a Executable<InvokeContext<'b>>>(executable) };
+    let executable = unsafe {
+        std::mem::transmute::<
+            &solana_rbpf::elf::Executable<
+                solana_program_runtime::invoke_context::InvokeContext<'_>,
+            >,
+            &solana_rbpf::elf::Executable<
+                solana_program_runtime::invoke_context::InvokeContext<'_>,
+            >,
+        >(executable)
+    };
     let log_collector = invoke_context.get_log_collector();
     let stack_height = invoke_context.get_stack_height();
     let transaction_context = &invoke_context.transaction_context;

diff --git a/programs/sbf/rust/invoke/src/processor.rs b/programs/sbf/rust/invoke/src/processor.rs
@@ -1158,7 +1158,7 @@ fn process_instruction(
             let mut lamports = account.lamports();
             account
                 .lamports
-                .replace(unsafe { mem::transmute(&mut lamports) });
+                .replace(unsafe { mem::transmute::<&mut u64, &mut u64>(&mut lamports) });
             let callee_program_id = accounts[CALLEE_PROGRAM_INDEX].key;
 
             invoke(

diff --git a/unified-scheduler-logic/src/lib.rs b/unified-scheduler-logic/src/lib.rs
@@ -316,8 +316,12 @@ mod utils {
         #[cfg_attr(miri, ignore)]
         fn test_ub_illegally_created_multiple_tokens() {
             // Unauthorized token minting!
-            let mut token1 = unsafe { mem::transmute(()) };
-            let mut token2 = unsafe { mem::transmute(()) };
+            let mut token1 = unsafe {
+                mem::transmute::<(), crate::utils::Token<crate::utils::tests::FakeQueue>>(())
+            };
+            let mut token2 = unsafe {
+                mem::transmute::<(), crate::utils::Token<crate::utils::tests::FakeQueue>>(())
+            };
 
             let queue = TokenCell::new(FakeQueue {
                 v: Vec::with_capacity(20),