Skip to content

Commit b2f4e80

Browse files
authored
Merge pull request #74224 from apple/egorzhdan/6.0-frt-duplicate-metadata-accessor
🍒[cxx-interop][IRGen] Emit type metadata accessors correctly
2 parents a0bb875 + b4673a2 commit b2f4e80

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

lib/IRGen/MetadataRequest.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1112,9 +1112,6 @@ MetadataAccessStrategy irgen::getTypeMetadataAccessStrategy(CanType type) {
11121112
assert(type->hasUnboundGenericType());
11131113
}
11141114

1115-
if (type->isForeignReferenceType())
1116-
return MetadataAccessStrategy::PublicUniqueAccessor;
1117-
11181115
if (requiresForeignTypeMetadata(nominal))
11191116
return MetadataAccessStrategy::ForeignAccessor;
11201117

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// RUN: %empty-directory(%t)
2+
// RUN: split-file %s %t
3+
// RUN: %target-build-swift -I %S/Inputs %t/main.swift %t/second.swift -cxx-interoperability-mode=default -Xfrontend -disable-availability-checking
4+
5+
// XFAIL: OS=windows-msvc
6+
7+
//--- main.swift
8+
import ReferenceCounted
9+
10+
protocol P1 {}
11+
extension GlobalCount : P1 {}
12+
13+
//--- second.swift
14+
import ReferenceCounted
15+
16+
protocol P2 {}
17+
extension GlobalCount : P2 {}

0 commit comments

Comments
 (0)