Hoist static locals to module scope

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -1338,7 +1338,8 @@ bool Converter::VisitCompoundStmt(clang::CompoundStmt *stmt) {
 
 bool Converter::VisitDeclStmt(clang::DeclStmt *stmt) {
   for (auto *decl : stmt->decls()) {
-    if (clang::isa<clang::TagDecl>(decl)) {
+    auto *var = clang::dyn_cast<clang::VarDecl>(decl);
+    if (clang::isa<clang::TagDecl>(decl) || (var && var->isStaticLocal())) {
       Buffer buf(*this);
       Convert(decl);
       hoisted_records_ += std::move(buf).str();

tests/unit/static_local.cpp

@@ -11,7 +11,17 @@ int foo() {
   return kX1 + kX2 + static_i;
 }
 
+int from_local_class() {
+  static int x = 3;
+  struct S {
+    int get() const { return ++x; }
+  };
+  return S{}.get() + S{}.get();
+}
+
 int main() {
   assert(foo() + foo() + foo() == 15);
+  assert(from_local_class() == 9);
+  assert(from_local_class() == 13);
   return 0;
 }