Merge pull request swiftlang#30790 from MForster/import-const-members

Author: swift-ci

lib/ClangImporter/ImportDecl.cpp

@@ -3918,6 +3918,12 @@ namespace {
                               /*IsCaptureList*/false,
                               Impl.importSourceLoc(decl->getLocation()),
                               name, dc);
+      if (decl->getType().isConstQualified()) {
+        // Note that in C++ there are ways to change the values of const
+        // members, so we don't use WriteImplKind::Immutable storage.
+        assert(result->supportsMutation());
+        result->overwriteSetterAccess(AccessLevel::Private);
+      }
       result->setIsObjC(false);
       result->setIsDynamic(false);
       result->setInterfaceType(type);

test/Interop/Cxx/class/Inputs/member-variables.h

@@ -0,0 +1,4 @@
+class MyClass {
+public:
+  const int const_member = 23;
+};

test/Interop/Cxx/class/Inputs/module.modulemap

@@ -0,0 +1,3 @@
+module CxxMemberVariables {
+  header "member-variables.h"
+}

test/Interop/Cxx/class/member-variables-module-interface.swift

@@ -0,0 +1,6 @@
+// RUN: %target-swift-ide-test -print-module -module-to-print=CxxMemberVariables -I %S/Inputs -source-filename=x -enable-cxx-interop | %FileCheck %s
+
+// CHECK:      struct MyClass {
+// CHECK-NEXT:   var const_member: Int32 { get }
+// CHECK-NEXT:   init()
+// CHECK-NEXT: }

test/Interop/Cxx/class/member-variables-typechecker.swift

@@ -0,0 +1,6 @@
+// RUN: %target-typecheck-verify-swift -I %S/Inputs -enable-cxx-interop
+
+import CxxMemberVariables
+
+var s = MyClass()
+s.const_member = 42 // expected-error {{cannot assign to property: 'const_member' setter is inaccessible}}