commit 4e1bc13fce7b66c6ce7986a37080100f02b4600e
author Googler <no-reply@google.com> Mon Dec 06 10:10:42 2021 +0000
committer Marcel Hlopko <hlopko@google.com> Fri Mar 25 22:05:09 2022 +0000
tree 89becfae1b0fe646f33b42e3f5d88ac1f3bd9546
parent 209b10a23c4d7edbdf9958fd6b0c86181ff81145

Populate Func::lifetime_params and RsType::lifetime_args.

Next steps:
- Implement codegen
- Map nullable pointers with lifetimes to Option<&>

PiperOrigin-RevId: 414384204

rs_bindings_from_cc/ir.h

diff --git a/rs_bindings_from_cc/ir.h b/rs_bindings_from_cc/ir.h
index ec3ecdb..a4ffbf9 100644
--- a/rs_bindings_from_cc/ir.h
+++ b/rs_bindings_from_cc/ir.h
@@ -32,6 +32,8 @@
 namespace internal {
 inline constexpr absl::string_view kRustPtrMut = "*mut";
 inline constexpr absl::string_view kRustPtrConst = "*const";
+inline constexpr absl::string_view kRustRefMut = "&mut";
+inline constexpr absl::string_view kRustRefConst = "&";
 inline constexpr absl::string_view kCcPtr = "*";
 inline constexpr absl::string_view kCcLValueRef = "&";
 inline constexpr int kJsonIndent = 2;
@@ -169,26 +171,47 @@
                       CcType{std::move(cc_name), cc_decl_id}};
   }
 
-  static MappedType PointerTo(MappedType pointee_type) {
-    absl::string_view rs_name = pointee_type.cc_type.is_const
-                                    ? internal::kRustPtrConst
-                                    : internal::kRustPtrMut;
+  static MappedType PointerTo(MappedType pointee_type,
+                              std::optional<LifetimeId> lifetime,
+                              bool nullable = true) {
+    absl::string_view rs_name;
+    // TODO(mboehme): Map nullable pointers with lifetimes to
+    // Option<&> / Option<&mut>
+    if (lifetime.has_value() && !nullable) {
+      rs_name = pointee_type.cc_type.is_const ? internal::kRustRefConst
+                                              : internal::kRustRefMut;
+    } else {
+      rs_name = pointee_type.cc_type.is_const ? internal::kRustPtrConst
+                                              : internal::kRustPtrMut;
+    }
     auto pointer_type =
         Simple(std::string(rs_name), std::string(internal::kCcPtr));
+    if (lifetime.has_value()) {
+      pointer_type.rs_type.lifetime_args.push_back(*std::move(lifetime));
+    }
     pointer_type.rs_type.type_args.push_back(std::move(pointee_type.rs_type));
     pointer_type.cc_type.type_args.push_back(std::move(pointee_type.cc_type));
     return pointer_type;
   }
 
-  static MappedType LValueReferenceTo(MappedType pointee_type) {
-    absl::string_view rs_name = pointee_type.cc_type.is_const
-                                    ? internal::kRustPtrConst
-                                    : internal::kRustPtrMut;
-    auto pointer_type =
+  static MappedType LValueReferenceTo(MappedType pointee_type,
+                                      std::optional<LifetimeId> lifetime) {
+    absl::string_view rs_name;
+    if (lifetime.has_value()) {
+      rs_name = pointee_type.cc_type.is_const ? internal::kRustRefConst
+                                              : internal::kRustRefMut;
+    } else {
+      rs_name = pointee_type.cc_type.is_const ? internal::kRustPtrConst
+                                              : internal::kRustPtrMut;
+    }
+    auto reference_type =
         Simple(std::string(rs_name), std::string(internal::kCcLValueRef));
-    pointer_type.rs_type.type_args.push_back(std::move(pointee_type.rs_type));
-    pointer_type.cc_type.type_args.push_back(std::move(pointee_type.cc_type));
-    return pointer_type;
+    if (lifetime.has_value()) {
+      reference_type.rs_type.lifetime_args.push_back(*std::move(lifetime));
+    }
+    reference_type.rs_type.type_args.push_back(std::move(pointee_type.rs_type));
+    reference_type.cc_type.type_args.push_back(std::move(pointee_type.cc_type));
+    return reference_type;
   }
 
   bool IsVoid() const { return rs_type.name == "()"; }