[cxx-interop] Do not crash when emitting layout of std::string

lib/IRGen/GenStruct.cpp

@@ -1461,12 +1461,12 @@ class ClangRecordLowering {
     unsigned fieldOffset = layout.getFieldOffset(clangField->getFieldIndex());
     assert(!clangField->isBitField());
     Size offset( SubobjectAdjustment.getValue() + fieldOffset / 8);
-    std::optional<Size> dataSize;
+    std::optional<clang::CharUnits> dataSize;
     if (clangField->hasAttr<clang::NoUniqueAddressAttr>()) {
       if (const auto *rd = clangField->getType()->getAsRecordDecl()) {
         // Clang can store the next field in the padding of this one.
         const auto &fieldLayout = ClangContext.getASTRecordLayout(rd);
-        dataSize = Size(fieldLayout.getDataSize().getQuantity());
+        dataSize = fieldLayout.getDataSize();
       }
     }
 
@@ -1480,9 +1480,10 @@ class ClangRecordLowering {
     }
 
     // Otherwise, add it as an opaque blob.
-    auto fieldSize = isZeroSized ? clang::CharUnits::Zero() : ClangContext.getTypeSizeInChars(clangField->getType());
-    return addOpaqueField(offset,
-                          dataSize.value_or(Size(fieldSize.getQuantity())));
+    auto fieldTypeSize = ClangContext.getTypeSizeInChars(clangField->getType());
+    auto fieldSize = isZeroSized ? clang::CharUnits::Zero()
+                                 : dataSize.value_or(fieldTypeSize);
+    return addOpaqueField(offset, Size(fieldSize.getQuantity()));
   }
 
   /// Add opaque storage for bitfields spanning the given range of bits.

test/Interop/Cxx/class/Inputs/member-variables.h

@@ -83,4 +83,21 @@ inline int takesZeroSizedInCpp(HasZeroSizedField x) {
   return x.a;
 }
 
+/// Not imported into Swift.
+struct EmptyNotImported {
+  char : 0;
+
+  EmptyNotImported() = default;
+  EmptyNotImported(const EmptyNotImported &) = delete;
+  EmptyNotImported(EmptyNotImported &&) = delete;
+};
+
+struct LastFieldNoUniqueAddress {
+  char c;
+  [[no_unique_address]] EmptyNotImported p0;
+
+  LastFieldNoUniqueAddress(const LastFieldNoUniqueAddress &other) {}
+  LastFieldNoUniqueAddress(LastFieldNoUniqueAddress &&other) {}
+};
+
 #endif

test/Interop/Cxx/class/zero-sized-field.swift

@@ -83,4 +83,14 @@ FieldsTestSuite.test("Non-standard-layout field padding in templated class reuse
   expectEqual(s2.get_c(), 6)
 }
 
+FieldsTestSuite.test("Last field is no unique address") {
+  var s = LastFieldNoUniqueAddress()
+
+  s.c = 5
+  expectEqual(s.c, 5)
+
+  s.c = 6
+  expectEqual(s.c, 6)
+}
+
 runAllTests()