[interop] verify that a C++ record is a Swift nominal type before trying to add explicit protocol conformances

hyp · hyp · commit 25bcd26f3b36 · 2023-01-29T06:32:03.000-08:00
This fixes the issue where we crashed printing foundation
diff --git a/lib/ClangImporter/ImportDecl.cpp b/lib/ClangImporter/ImportDecl.cpp
@@ -2588,7 +2588,8 @@ namespace {
         conformToCxxSequenceIfNeeded(Impl, nominalDecl, decl);
       }
 
-      addExplicitProtocolConformances(cast<NominalTypeDecl>(result));
+      if (auto *ntd = dyn_cast<NominalTypeDecl>(result))
+        addExplicitProtocolConformances(ntd);
 
       return result;
     }
diff --git a/test/Interop/Cxx/stdlib/print-foundation-module-interface.swift b/test/Interop/Cxx/stdlib/print-foundation-module-interface.swift
@@ -0,0 +1,3 @@
+// RUN: %target-swift-ide-test -print-module -module-to-print=Foundation -I %S/Inputs -source-filename=x -enable-experimental-cxx-interop -enable-objc-interop
+
+// REQUIRES: OS=macosx

Original file line number	Diff line number	Diff line change
`@@ -2588,7 +2588,8 @@ namespace {`
`2588`	`2588`	`conformToCxxSequenceIfNeeded(Impl, nominalDecl, decl);`
`2589`	`2589`	`}`
`2590`	`2590`
`2591`		`- addExplicitProtocolConformances(cast<NominalTypeDecl>(result));`
	`2591`	`+ if (auto *ntd = dyn_cast<NominalTypeDecl>(result))`
	`2592`	`+ addExplicitProtocolConformances(ntd);`
`2592`	`2593`
`2593`	`2594`	`return result;`
`2594`	`2595`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+// RUN: %target-swift-ide-test -print-module -module-to-print=Foundation -I %S/Inputs -source-filename=x -enable-experimental-cxx-interop -enable-objc-interop`
	`2`	`+`
	`3`	`+// REQUIRES: OS=macosx`