Merge pull request #73792 from apple/egorzhdan/is-frt-check

atrick · web-flow · commit 4a1662de3144 · 2024-05-22T08:31:02.000-07:00
[cxx-interop] Avoid treating some Obj-C types as foreign reference types
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
@@ -6438,7 +6438,14 @@ bool ClassDecl::walkSuperclasses(
 }
 
 bool ClassDecl::isForeignReferenceType() const {
-  return getClangDecl() && isa<clang::RecordDecl>(getClangDecl());
+  auto clangRecordDecl = dyn_cast_or_null<clang::RecordDecl>(getClangDecl());
+  if (!clangRecordDecl)
+    return false;
+
+  CxxRecordSemanticsKind kind = evaluateOrDefault(
+      getASTContext().evaluator,
+      CxxRecordSemantics({clangRecordDecl, getASTContext()}), {});
+  return kind == CxxRecordSemanticsKind::Reference;
 }
 
 bool ClassDecl::hasRefCountingAnnotations() const {

Original file line number	Diff line number	Diff line change
`@@ -6438,7 +6438,14 @@ bool ClassDecl::walkSuperclasses(`
`6438`	`6438`	`}`
`6439`	`6439`
`6440`	`6440`	`bool ClassDecl::isForeignReferenceType() const {`
`6441`		`- return getClangDecl() && isa<clang::RecordDecl>(getClangDecl());`
	`6441`	`+ auto clangRecordDecl = dyn_cast_or_null<clang::RecordDecl>(getClangDecl());`
	`6442`	`+ if (!clangRecordDecl)`
	`6443`	`+ return false;`
	`6444`	`+`
	`6445`	`+ CxxRecordSemanticsKind kind = evaluateOrDefault(`
	`6446`	`+ getASTContext().evaluator,`
	`6447`	`+ CxxRecordSemantics({clangRecordDecl, getASTContext()}), {});`
	`6448`	`+ return kind == CxxRecordSemanticsKind::Reference;`
`6442`	`6449`	`}`
`6443`	`6450`
`6444`	`6451`	`bool ClassDecl::hasRefCountingAnnotations() const {`