Skip to content

Commit f6f769d

Browse files
committed
IRGen: Don't treat private visibility like internal
1 parent 0da0d10 commit f6f769d

File tree

5 files changed

+13
-15
lines changed

5 files changed

+13
-15
lines changed

lib/SIL/SIL.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,7 @@ FormalLinkage swift::getDeclLinkage(const ValueDecl *D) {
5757
return FormalLinkage::HiddenUnique;
5858
case AccessLevel::FilePrivate:
5959
case AccessLevel::Private:
60-
// Why "hidden" instead of "private"? Because the debugger may need to
61-
// access these symbols.
62-
return FormalLinkage::HiddenUnique;
60+
return FormalLinkage::Private;
6361
}
6462

6563
llvm_unreachable("Unhandled access level in switch.");

test/IRGen/access_control.sil

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ internal struct InternalStruct { var x: Int }
1212
// CHECK: @"$S14access_control14InternalStructVMf" = internal constant
1313

1414
private struct PrivateStruct { var x: Int }
15-
// CHECK: @"$S14access_control13PrivateStruct33_8F630B0A1EEF3ED34B761E3ED76C95A8LLVMn" = hidden constant
15+
// CHECK: @"$S14access_control13PrivateStruct33_8F630B0A1EEF3ED34B761E3ED76C95A8LLVMn" = internal constant
1616
// CHECK: @"$S14access_control13PrivateStruct33_8F630B0A1EEF3ED34B761E3ED76C95A8LLVMf" = internal constant
1717

1818
func local() {
1919
struct LocalStruct { var x: Int }
20-
// CHECK: @"$S14access_control5localyyF11LocalStructL_VMn" = hidden constant
20+
// CHECK: @"$S14access_control5localyyF11LocalStructL_VMn" = internal constant
2121
// CHECK: @"$S14access_control5localyyF11LocalStructL_VMf" = internal constant
2222
}
2323

2424
// CHECK: @"$S14access_control12PublicStructVN" = {{(protected )?}}alias
2525
// CHECK: @"$S14access_control14InternalStructVN" = hidden alias
26-
// CHECK: @"$S14access_control13PrivateStruct33_8F630B0A1EEF3ED34B761E3ED76C95A8LLVN" = hidden alias
27-
// CHECK: @"$S14access_control5localyyF11LocalStructL_VN" = hidden alias
26+
// CHECK: @"$S14access_control13PrivateStruct33_8F630B0A1EEF3ED34B761E3ED76C95A8LLVN" = internal alias
27+
// CHECK: @"$S14access_control5localyyF11LocalStructL_VN" = internal alias

test/IRGen/decls.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ func test1() {
2020
}
2121

2222
// Check that we emit nominal type descriptors for all types.
23-
// CHECK-DAG: @"$S5decls5test1yyF1aL_CMn" = hidden constant
24-
// CHECK-DAG: @"$S5decls5test1yyF1bL_CMn" = hidden constant
23+
// CHECK-DAG: @"$S5decls5test1yyF1aL_CMn" = internal constant
24+
// CHECK-DAG: @"$S5decls5test1yyF1bL_CMn" = internal constant
2525

test/IRGen/local_types.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public func topLevelIfConfig() {
5050
}
5151
#else
5252
public func topLevelIfConfig() {
53-
// CHECK-DAG: @"$S11local_types16topLevelIfConfigyyF17LocalClassEnabledL_CMm" = hidden global %objc_class
53+
// CHECK-DAG: @"$S11local_types16topLevelIfConfigyyF17LocalClassEnabledL_CMm" = internal global %objc_class
5454
class LocalClassEnabled {}
5555
}
5656
#endif
@@ -62,7 +62,7 @@ public struct NominalIfConfig {
6262
}
6363
#else
6464
public func method() {
65-
// CHECK-DAG: @"$S11local_types15NominalIfConfigV6methodyyF17LocalClassEnabledL_CMm" = hidden global %objc_class
65+
// CHECK-DAG: @"$S11local_types15NominalIfConfigV6methodyyF17LocalClassEnabledL_CMm" = internal global %objc_class
6666
class LocalClassEnabled {}
6767
}
6868
#endif
@@ -75,10 +75,10 @@ public func innerIfConfig() {
7575
class LocalClassDisabled {}
7676
}
7777
#else
78-
// CHECK-DAG: @"$S11local_types13innerIfConfigyyF17LocalClassEnabledL_CMm" = hidden global %objc_class
78+
// CHECK-DAG: @"$S11local_types13innerIfConfigyyF17LocalClassEnabledL_CMm" = internal global %objc_class
7979
class LocalClassEnabled {}
8080
func inner() {
81-
// CHECK-DAG: @"$S11local_types13innerIfConfigyyF0C0L0_yyF17LocalClassEnabledL_CMm" = hidden global %objc_class
81+
// CHECK-DAG: @"$S11local_types13innerIfConfigyyF0C0L0_yyF17LocalClassEnabledL_CMm" = internal global %objc_class
8282
class LocalClassEnabled {}
8383
}
8484
#endif

test/IRGen/nested_private_type_context_descriptor.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %target-swift-frontend -emit-ir -O -wmo %s | %FileCheck %s
22

3-
// CHECK-DAG: @"$S38nested_private_type_context_descriptor1X33{{.................................}}LLVMn" = hidden constant
4-
// CHECK-DAG: @"$S38nested_private_type_context_descriptor1X33{{.................................}}LLV1YVMn" = hidden constant
3+
// CHECK-DAG: @"$S38nested_private_type_context_descriptor1X33{{.................................}}LLVMn" = internal constant
4+
// CHECK-DAG: @"$S38nested_private_type_context_descriptor1X33{{.................................}}LLV1YVMn" = internal constant
55

66
fileprivate struct X {
77
fileprivate struct Y {}

0 commit comments

Comments
 (0)