From a7b691b54ca18bcf244a35a2b587a39fe7ef019a Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jsgf@fb.com>
Date: Fri, 17 Sep 2021 16:15:09 -0700
Subject: [PATCH] Add some helper templates to cxx.h

`rust::make_shared` - construct a type into a `std::shared_ptr`
`rust::make_unique` - construct a type into a `std::unique_ptr`
`rust::shared_as_mutable` - obtain a mutable reference to a `std::shared_ptr` value

These are used as follows:
```
mod ffi {
    extern "C++" {
        type MyTypeA;
        type MyTypeB;

        #[namespace = "rust"]
        #[cxx_name = "make_shared"]
        fn make_MyTypeA(arg1: u32, arg2: bool) -> SharedPtr<MyTypeA>;

        #[namespace = "rust"]
        #[cxx_name = "make_unique"]
        fn make_MyTypeB(arg1: u32, arg2: bool) -> UniquePtr<MyTypeB>;

	#[namespace = "rust"]
        #[cxx_name = "shared_as_mutable]
        unsafe fn make_mutable_MyTypeA(ptr: &SharedPtr<MyTypeA>) -> Pin<&mut MyTypeA>;
    }
}
```
---
 include/cxx.h | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/include/cxx.h b/include/cxx.h
index dffcb01ab..a816ca0a4 100644
--- a/include/cxx.h
+++ b/include/cxx.h
@@ -8,6 +8,7 @@
 #include <initializer_list>
 #include <iosfwd>
 #include <iterator>
+#include <memory>
 #include <new>
 #include <stdexcept>
 #include <string>
@@ -414,6 +415,32 @@ class Opaque {
 };
 #endif // CXXBRIDGE1_RUST_OPAQUE
 
+#ifndef CXXBRIDGE1_RUST_SHARED
+#define CXXBRIDGE1_RUST_SHARED
+// Helper to construct a type into a std::shared_ptr.
+template <typename T, typename... Targs>
+std::shared_ptr<T> make_shared(Targs... args) {
+  return std::make_shared<T>(args...);
+}
+
+// Unsafe function to give a Pin<&mut T> from a SharedPtr<T>.
+template <typename T>
+T& shared_as_mutable(std::shared_ptr<T> const &ptr) {
+  return *ptr;
+}
+#endif // CXXBRIDGE1_RUST_SHARED
+
+#ifndef CXXBRIDGE1_RUST_UNIQUE
+#define CXXBRIDGE1_RUST_UNIQUE
+#if __cplusplus >= 201402L // c++14
+// Helper to construct a type into a std::unique_ptr.
+template <typename T, typename... Targs>
+std::unique_ptr<T> make_unique(Targs... args) {
+  return std::make_unique<T>(args...);
+}
+#endif // c++14
+#endif // CXXBRIDGE1_RUST_UNIQUE
+
 template <typename T>
 std::size_t size_of();
 template <typename T>