commit d4dde0eecc3718672e6bf73fa4e90c5eb67c9135
author Devin Jeanpierre <jeanpierreda@google.com> Wed Oct 13 20:48:25 2021 +0000
committer Marcel Hlopko <hlopko@google.com> Fri Mar 25 21:58:17 2022 +0000
tree 3b96933132f9dfeef6278d6071bc9fe804120f1e
parent c6877bb06f2eaba02909f60f7813d18da073affe

Add the implicit `this` parameter to non-static member functions.

This should basically make them callable, unless they're inline -- those need different code generation.

PiperOrigin-RevId: 402913059

rs_bindings_from_cc/ast_visitor.cc

diff --git a/rs_bindings_from_cc/ast_visitor.cc b/rs_bindings_from_cc/ast_visitor.cc
index 504e78f..431c7f7 100644
--- a/rs_bindings_from_cc/ast_visitor.cc
+++ b/rs_bindings_from_cc/ast_visitor.cc
@@ -60,6 +60,20 @@
 bool AstVisitor::VisitFunctionDecl(clang::FunctionDecl* function_decl) {
   std::vector<FuncParam> params;
   bool success = true;
+  // non-static member functions receive an implicit `this` parameter.
+  if (auto* method_decl = llvm::dyn_cast<clang::CXXMethodDecl>(function_decl)) {
+    if (method_decl->isInstance()) {
+      auto param_type = ConvertType(method_decl->getThisType());
+      if (!param_type.ok()) {
+        ir_.items.push_back(UnsupportedItem{
+            .name = function_decl->getQualifiedNameAsString(),
+            .message = param_type.status().ToString(),
+            .source_loc = ConvertSourceLoc(method_decl->getBeginLoc())});
+        success = false;
+      }
+      params.push_back({*std::move(param_type), Identifier("__this")});
+    }
+  }
 
   for (const clang::ParmVarDecl* param : function_decl->parameters()) {
     auto param_type = ConvertType(param->getType());