Merge pull request #63294 from hyp/eng/ntd-crash-fix

hyp · web-flow · commit fe6e8ecbe0a5 · 2023-01-29T10:40:25.000-08:00
[interop] verify that a C++ record is a Swift nominal type before try…
diff --git a/lib/ClangImporter/ImportDecl.cpp b/lib/ClangImporter/ImportDecl.cpp
@@ -2611,7 +2611,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
`@@ -2611,7 +2611,8 @@ namespace {`
`2611`	`2611`	`conformToCxxSequenceIfNeeded(Impl, nominalDecl, decl);`
`2612`	`2612`	`}`
`2613`	`2613`
`2614`		`- addExplicitProtocolConformances(cast<NominalTypeDecl>(result));`
	`2614`	`+ if (auto *ntd = dyn_cast<NominalTypeDecl>(result))`
	`2615`	`+ addExplicitProtocolConformances(ntd);`
`2615`	`2616`
`2616`	`2617`	`return result;`
`2617`	`2618`	`}`
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`