support methods again

cpetig · Apr 22, 2024 · 685d5cc · 685d5cc
1 parent f1a0e9f
commit 685d5cc
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/crates/cpp/src/lib.rs b/crates/cpp/src/lib.rs
@@ -2362,14 +2362,16 @@ impl<'a, 'b> Bindgen for FunctionBindgen<'a, 'b> {
                 let op = &operands[0];
                 results.push(format!("{op}.get_handle()"));
             }
-            abi::Instruction::HandleLift { .. } => {
-                // does it make a difference whether we own or borrow?
-                // if so we could look at handle
+            abi::Instruction::HandleLift { handle, .. } => {
                 let op = &operands[0];
-                if self.gen.gen.opts.host_side() {
-                    results.push(format!("wit::ResourceExportBase{{{op}}}"));
-                } else {
-                    results.push(format!("wit::ResourceImportBase{{{op}}}"));
+                match (handle, self.gen.gen.opts.host_side()) {
+                    (Handle::Own(_), true) => {
+                        results.push(format!("wit::{RESOURCE_EXPORT_BASE_CLASS_NAME}{{{op}}}"))
+                    }
+                    (Handle::Own(_), false) => {
+                        results.push(format!("wit::{RESOURCE_IMPORT_BASE_CLASS_NAME}{{{op}}}"))
+                    }
+                    (Handle::Borrow(_), _) => results.push(op.clone()),
                 }
             }
             abi::Instruction::TupleLower { tuple, .. } => {