Add RAII semantics for curr_init_type_

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -2946,9 +2946,8 @@ void Converter::ConvertVarInit(clang::QualType qual_type, clang::Expr *expr) {
     if (auto *lambda = clang::dyn_cast<clang::LambdaExpr>(
             expr->IgnoreUnlessSpelledInSource())) {
       PushExprKind push(*this, ExprKind::AddrOf);
-      curr_init_type_.push(qual_type);
+      PushInitType init_type(*this, qual_type);
       VisitLambdaExpr(lambda);
-      curr_init_type_.pop();
       return;
     }
   }
@@ -2965,21 +2964,18 @@ void Converter::ConvertVarInit(clang::QualType qual_type, clang::Expr *expr) {
     {
       PushParen paren(*this);
       StrCat(token::kStar);
-      curr_init_type_.push(qual_type);
+      PushInitType init_type(*this, qual_type);
       Convert(expr);
-      curr_init_type_.pop();
     }
     StrCat(".clone()");
   } else if (IsReferenceType(expr) || qual_type->isFunctionPointerType()) {
     PushExprKind push(*this, ExprKind::AddrOf);
-    curr_init_type_.push(qual_type);
+    PushInitType init_type(*this, qual_type);
     Convert(expr);
-    curr_init_type_.pop();
   } else {
     PushExprKind push(*this, ExprKind::RValue);
-    curr_init_type_.push(qual_type);
+    PushInitType init_type(*this, qual_type);
     Convert(expr);
-    curr_init_type_.pop();
   }
   if (qual_type->isReferenceType() && !IsReferenceType(expr)) {
     StrCat(keyword::kAs);
@@ -3053,9 +3049,11 @@ void Converter::ConvertArraySubscript(clang::Expr *base, clang::Expr *idx,
 
 void Converter::ConvertAssignment(clang::Expr *lhs, clang::Expr *rhs,
                                   std::string_view assign_operator) {
-  curr_init_type_.push(lhs->getType());
-  auto lhs_as_string = ConvertLValue(lhs);
-  curr_init_type_.pop();
+  std::string lhs_as_string;
+  {
+    PushInitType init_type(*this, lhs->getType());
+    lhs_as_string = ConvertLValue(lhs);
+  }
   auto rhs_as_string = ConvertFreshRValue(rhs);
 
   PushBrace brace(*this, !isVoid());

cpp2rust/converter/converter.h

@@ -518,6 +518,19 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
     std::stack<BreakTarget> &stack_;
   };
 
+  class PushInitType {
+  public:
+    PushInitType(Converter &c, clang::QualType type) : c_(c) {
+      c_.curr_init_type_.push(type);
+    }
+    ~PushInitType() { c_.curr_init_type_.pop(); }
+    PushInitType(const PushInitType &) = delete;
+    PushInitType &operator=(const PushInitType &) = delete;
+
+  private:
+    Converter &c_;
+  };
+
   std::unordered_set<const clang::VarDecl *> map_iter_decls_;
 
   struct ScopedMapIterDecl {

cpp2rust/converter/models/converter_refcount.cpp

@@ -1664,6 +1664,7 @@ void ConverterRefCount::ConvertVarInit(clang::QualType qual_type,
   bool is_ref = qual_type->isReferenceType();
   in_function_formals_ = true;
   PushConversionKind push(*this, ConversionKind::Unboxed, is_ref);
+  PushInitType init_type(*this, qual_type);
   StrCat(BoxValue((is_ref || qual_type->isFunctionPointerType())
                       ? ConvertFreshPointer(expr)
                       : ConvertFreshRValue(expr)));