Merge branch 'master' into standard-ifdefs

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -3573,6 +3573,14 @@ bool Converter::VisitInitListExpr(clang::InitListExpr *expr) {
 
     StrCat(GetUnsafeTypeAsString(qual_type));
     PushBrace brace(*this);
+    if (record->isUnion()) {
+      auto *field = expr->getInitializedFieldInUnion();
+      assert(field && expr->getNumInits() == 1);
+      StrCat(GetNamedDeclAsString(field), token::kColon);
+      ConvertFieldInit(field, expr->getInit(0));
+      SetFreshType(qual_type);
+      return false;
+    }
     int i = 0;
     for (const auto *field : record->fields()) {
       StrCat(GetNamedDeclAsString(field), token::kColon);

cpp2rust/converter/converter_lib.cpp

@@ -214,6 +214,14 @@ bool IsUnionArrayMember(const clang::Expr *base) {
   return false;
 }
 
+clang::Expr *SubscriptedArray(clang::Expr *base) {
+  while (auto *sub = clang::dyn_cast<clang::ArraySubscriptExpr>(
+             base->IgnoreImplicit())) {
+    base = sub->getBase();
+  }
+  return base;
+}
+
 // TODO: this will be gone when the AST matcher lands
 std::tuple<clang::MemberExpr *, clang::RecordDecl *, std::string>
 ReplaceNonUniformLibcField(clang::MemberExpr *expr) {

cpp2rust/converter/converter_lib.h

@@ -57,6 +57,8 @@ bool IsInMainFile(const clang::Decl *decl);
 
 bool IsUnionArrayMember(const clang::Expr *base);
 
+clang::Expr *SubscriptedArray(clang::Expr *base);
+
 std::tuple<clang::MemberExpr *, clang::RecordDecl *, std::string>
 ReplaceNonUniformLibcField(clang::MemberExpr *expr);