Merge pull request #40771 from CodaFi/field-hockey

[5.6] Always Import FieldDecls from Records

Author: CodaFi

lib/ClangImporter/ImportDecl.cpp

@@ -9769,13 +9769,21 @@ void ClangImporter::Implementation::loadAllMembersOfRecordDecl(
   llvm::SmallVector<Decl *, 16> members;
   for (const clang::Decl *m : clangRecord->decls()) {
     auto nd = dyn_cast<clang::NamedDecl>(m);
+    if (!nd)
+      continue;
+
     // Currently, we don't import unnamed bitfields.
     if (isa<clang::FieldDecl>(m) &&
         cast<clang::FieldDecl>(m)->isUnnamedBitfield())
       continue;
 
-    if (nd && nd == nd->getCanonicalDecl() &&
-        nd->getDeclContext() == clangRecord &&
+    // Make sure we always pull in record fields. Everything else had better
+    // be canonical. Note that this check mostly catches nested C++ types since
+    // we import nested C struct types by C's usual convention of chucking them
+    // into the global namespace.
+    const bool isCanonicalInContext =
+        (isa<clang::FieldDecl>(nd) || nd == nd->getCanonicalDecl());
+    if (isCanonicalInContext && nd->getDeclContext() == clangRecord &&
         isVisibleClangEntry(nd))
       insertMembersAndAlternates(nd, members);
   }

test/Interop/Cxx/templates/class-template-instantiation.swift

@@ -18,7 +18,8 @@ TemplatesTestSuite.test("with-swift-type") {
   expectEqual(wrappedMagicNumber.getValuePlusArg(8), 21)
 }
 
-TemplatesTestSuite.test("with-c++-type-calling-method-on-arg") {
+TemplatesTestSuite.test("with-c++-type-calling-method-on-arg")
+  .skip(.watchOSSimulatorAny("rdar://problem/87262809")).code {
   let i1 = IntWrapper(value: 42)
   let i2 = IntWrapper(value: 12)
   var wrappedMagicNumber = MagicWrapper<IntWrapper>(t: i1)

test/Interop/Cxx/templates/class-template-uninstantiatable-members-irgen.swift

@@ -4,7 +4,7 @@ import ClassTemplateInstantiationErrors
 
 // CHECK-LABEL: define {{.*}}void @"$s4main23instantiateValidMembersyyF"()
 // CHECK: call i32 @{{_ZN21CannotBeInstantiantedI10IntWrapperE8incValueEv|"\?incValue@\?\$CannotBeInstantianted@UIntWrapper@@@@QEAAHXZ"}}(%struct.CannotBeInstantianted*
-// CHECK: call i32 @{{_ZN21CannotBeInstantiantedI10IntWrapperE8incValueES0_|"\?incValue@\?\$CannotBeInstantianted@UIntWrapper@@@@QEAAHUIntWrapper@@@Z"}}(%struct.CannotBeInstantianted* {{.*}}, {{i32|i64|\[1 x i32\]|\%struct\.IntWrapper\* byval\(\%struct\.IntWrapper\)}}
+// CHECK: call i32 @{{_ZN21CannotBeInstantiantedI10IntWrapperE8incValueES0_|"\?incValue@\?\$CannotBeInstantianted@UIntWrapper@@@@QEAAHUIntWrapper@@@Z"}}(%struct.CannotBeInstantianted*
 // CHECK: ret void
 
 // CHECK-LABEL: define {{.*}}i32 @{{_ZN21CannotBeInstantiantedI10IntWrapperE8incValueEv|"\?incValue@\?\$CannotBeInstantianted@UIntWrapper@@@@QEAAHXZ"}}(%struct.CannotBeInstantianted*