needs_autoref -> is_index_base

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -3702,7 +3702,7 @@ std::string Converter::ConvertPlaceholder(clang::Expr *expr, clang::Expr *arg,
     Buffer buf(*this);
     PushExplicitAutoref autoref(
         *this,
-        ph_ctx.needs_autoref
+        ph_ctx.is_index_base
             ? std::optional(ph_ctx.access == TranslationRule::Access::kWrite)
             : std::nullopt);
     ConvertDeref(arg);
@@ -3779,7 +3779,7 @@ std::string Converter::ConvertIRFragment(
           .maps_to_rust_ptr = Mapper::MapsToPointer(arg->getType()),
           .declared_in_rule_as_rust_ptr =
               Mapper::ParamIsPointer(GetCalleeOrExpr(expr), arg_idx),
-          .needs_autoref = ph->needs_autoref,
+          .is_index_base = ph->is_index_base,
       };
       result += ConvertPlaceholder(expr, arg, ph_ctx);
     } else if (auto *mc =

cpp2rust/converter/converter.h

@@ -185,7 +185,7 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
     bool is_cpp_ptr;
     bool maps_to_rust_ptr;
     bool declared_in_rule_as_rust_ptr;
-    bool needs_autoref;
+    bool is_index_base;
 
     bool needs_materialization() const {
       return materialize_ctx && materialize_idx >= 0 &&

cpp2rust/converter/translation_rule.cpp

@@ -48,7 +48,7 @@ ParsePlaceholderFragmentJSON(const llvm::json::Object &obj) {
   return {
       (unsigned)*obj.getInteger("arg"),
       ParseAccessJSON(*access),
-      obj.getBoolean("needs_autoref").value_or(false),
+      obj.getBoolean("is_index_base").value_or(false),
   };
 }
 

cpp2rust/converter/translation_rule.h

@@ -26,7 +26,7 @@ enum class Access { kRead, kWrite, kMove };
 struct PlaceholderFragment {
   unsigned n; // "a0", "a1", ...
   Access access;
-  bool needs_autoref = false;
+  bool is_index_base = false;
 
   void dump() const;
 };

rule-preprocessor/src/ir.rs

@@ -140,7 +140,7 @@ pub struct PlaceholderInner {
     pub arg: i32,
     pub access: Access,
     #[serde(default, skip_serializing_if = "std::ops::Not::not")]
-    pub needs_autoref: bool,
+    pub is_index_base: bool,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]

rule-preprocessor/src/semantic.rs

@@ -220,7 +220,7 @@ impl<'a, 'tcx> AstVisitor<'a, 'tcx> {
                     if p.access == Access::Unknown {
                         p.access = context;
                     }
-                    p.needs_autoref = true;
+                    p.is_index_base = true;
                 });
             return;
         }

rule-preprocessor/src/syntactic.rs

@@ -190,7 +190,7 @@ impl<'a> FragmentCtx<'a> {
                     placeholder: PlaceholderInner {
                         arg: token.text()[1..].parse().unwrap_or(0),
                         access,
-                        needs_autoref: false,
+                        is_index_base: false,
                     },
                 });
                 return;

rules/string/ir_refcount.json

@@ -11,7 +11,7 @@
               "placeholder": {
                 "arg": 0,
                 "access": "read",
-                "needs_autoref": true
+                "is_index_base": true
               }
             },
             {

rules/string/ir_unsafe.json

@@ -11,7 +11,7 @@
               "placeholder": {
                 "arg": 0,
                 "access": "read",
-                "needs_autoref": true
+                "is_index_base": true
               }
             },
             {
@@ -1196,7 +1196,7 @@
         "placeholder": {
           "arg": 0,
           "access": "write",
-          "needs_autoref": true
+          "is_index_base": true
         }
       },
       {

rules/vector/ir_refcount.json

@@ -2099,7 +2099,7 @@
               "placeholder": {
                 "arg": 0,
                 "access": "read",
-                "needs_autoref": true
+                "is_index_base": true
               }
             },
             {