[ClangImporter] Don't import accessors of constants as 'open' if they're static

Author: kubamracek

lib/ClangImporter/SwiftDeclSynthesizer.cpp

@@ -426,7 +426,8 @@ ValueDecl *SwiftDeclSynthesizer::createConstant(Identifier name,
       /*ThrowsLoc=*/SourceLoc(), /*ThrownType=*/TypeLoc(),
       params, type, dc);
   func->setStatic(isStatic);
-  func->setAccess(getOverridableAccessLevel(dc));
+  func->setAccess(isStatic ? AccessLevel::Public
+                           : getOverridableAccessLevel(dc));
   func->setIsObjC(false);
   func->setIsDynamic(false);
 

test/ClangImporter/const_values_objc.swift

@@ -0,0 +1,29 @@
+// RUN: %empty-directory(%t/src)
+// RUN: split-file %s %t/src
+
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) %t/src/main.swift \
+// RUN:   -import-bridging-header %t/src/test.h \
+// RUN:   -module-name main -I %t -emit-sil | %FileCheck %s
+
+//--- test.h
+#include <objc/objc.h>
+
+@interface MyClass : NSObject
+@end
+
+__attribute__((swift_name("MyClass.value")))
+static const int MyClassValue = -1;
+
+//--- main.swift
+func foo() {
+  print(MyClass.value)
+}
+
+// CHECK:      sil shared [transparent] @$sSo7MyClassC5values5Int32VvgZ : $@convention(method) (@thick MyClass.Type) -> Int32 {
+// CHECK-NEXT: // %0 "self"
+// CHECK-NEXT: bb0(%0 : $@thick MyClass.Type):
+// CHECK-NEXT:   debug_value %0, let, name "self", argno 1
+// CHECK-NEXT:   %2 = integer_literal $Builtin.Int32, -1
+// CHECK-NEXT:   %3 = struct $Int32 (%2)
+// CHECK-NEXT:   return %3
+// CHECK-NEXT: }