[NFC] Rename types to mention optional

Author: j-hui

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

@@ -27,23 +27,23 @@ struct HasZeroSizedField {
   void set_c(short c) { this->c = c; }
 };
 
-struct ReuseFieldPadding {
+struct ReuseOptionalFieldPadding {
   [[no_unique_address]] std::optional<int> a = {2};
   char c;
   char get_c() const { return c; }
   void set_c(char c) { this->c = c; }
-  int offset() const { return offsetof(ReuseFieldPadding, c); }
+  int offset() const { return offsetof(ReuseOptionalFieldPadding, c); }
   std::optional<int> getOptional() { return a; }
 };
 
 using OptInt = std::optional<int>;
 
-struct ReuseFieldPaddingWithTypedef {
+struct ReuseOptionalFieldPaddingWithTypedef {
   [[no_unique_address]] OptInt a;
   char c;
   char get_c() const { return c; }
   void set_c(char c) { this->c = c; }
-  int offset() const { return offsetof(ReuseFieldPadding, c); }
+  int offset() const { return offsetof(ReuseOptionalFieldPadding, c); }
 };
 
 

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

@@ -24,12 +24,12 @@ FieldsTestSuite.test("Zero sized field") {
   expectEqual(s.b.getNum(), 42)
 }
 
-FieldsTestSuite.test("Field padding reused") {
-  var s = ReuseFieldPadding()
+FieldsTestSuite.test("Optional field padding reused") {
+  var s = ReuseOptionalFieldPadding()
   let opt = s.getOptional()
   expectEqual(Int(opt.pointee), 2)
   s.c = 5
-  expectEqual(Int(s.offset()),  MemoryLayout<ReuseFieldPadding>.offset(of: \.c)!)
+  expectEqual(Int(s.offset()),  MemoryLayout<ReuseOptionalFieldPadding>.offset(of: \.c)!)
   expectEqual(s.c, 5)
   expectEqual(s.get_c(), 5)
   s.set_c(6)
@@ -40,10 +40,10 @@ FieldsTestSuite.test("Field padding reused") {
   expectEqual(s2.get_c(), 6)
 }
 
-FieldsTestSuite.test("Typedef'd field padding reused") {
-  var s = ReuseFieldPaddingWithTypedef()
+FieldsTestSuite.test("Typedef'd optional field padding reused") {
+  var s = ReuseOptionalFieldPaddingWithTypedef()
   s.c = 5
-  expectEqual(Int(s.offset()),  MemoryLayout<ReuseFieldPadding>.offset(of: \.c)!)
+  expectEqual(Int(s.offset()),  MemoryLayout<ReuseOptionalFieldPadding>.offset(of: \.c)!)
   expectEqual(s.c, 5)
   expectEqual(s.get_c(), 5)
   s.set_c(6)