Clang importer: Global vars imported as static member properties are final.

Author: jckarter

lib/ClangImporter/ImportDecl.cpp

@@ -2797,6 +2797,11 @@ namespace {
                        Impl.importSourceLoc(decl->getLocation()),
                        name, type, dc);
 
+      // If imported as member, the member should be final.
+      if (dc->getAsClassOrClassExtensionContext())
+        result->getAttrs().add(new (Impl.SwiftContext)
+                                 FinalAttr(/*IsImplicit=*/true));
+
       if (!decl->hasExternalStorage())
         Impl.registerExternalDecl(result);
 

test/IDE/Inputs/custom-modules/ImportAsMemberC.h

@@ -29,3 +29,11 @@ extern const CCPowerSupplyRef kCCPowerSupplySemiModular
 
 #pragma clang arc_cf_code_audited end
 
+extern const double kCCPowerSupplyDefaultPower
+  __attribute__((swift_name("CCPowerSupply.defaultPower")));
+
+extern const _Nonnull CCPowerSupplyRef kCCPowerSupplyAC
+  __attribute__((swift_name("CCPowerSupply.AC")));
+
+extern const _Nullable CCPowerSupplyRef kCCPowerSupplyDC
+  __attribute__((swift_name("CCPowerSupply.DC")));

test/IDE/import_as_member_cf.swift

@@ -7,6 +7,9 @@
 // PRINTC:      extension CCPowerSupply {
 // PRINTC-NEXT:   /*not inherited*/ init(watts watts: Double)
 // PRINTC-NEXT:   class let semiModular: CCPowerSupply!
+// PRINTC-NEXT:   class let defaultPower: Double
+// PRINTC-NEXT:   class let AC: CCPowerSupply
+// PRINTC-NEXT:   class let DC: CCPowerSupply?
 // PRINTC-NEXT: }
 
 // PRINTC:      extension CCRefrigerator {

test/Interpreter/SDK/CGImportAsMember.swift

@@ -2,8 +2,6 @@
 // REQUIRES: executable_test
 // REQUIRES: OS=macosx
 
-// XFAIL: 
-
 import Foundation
 import CoreGraphics
 

test/SILGen/cf_members.swift

@@ -251,3 +251,12 @@ public func importAsProtocol(_ x: IAMProto_t) {
   // CHECK: function_ref @setSomeValue : $@convention(c) <τ_0_0 where τ_0_0 : IAMProto> (τ_0_0, Int32) -> Int32
   x.someValue = y
 }
+
+// CHECK-LABEL: sil @_TF10cf_members28importGlobalVarsAsProperties
+public func importGlobalVarsAsProperties()
+    -> (Double, CCPowerSupply, CCPowerSupply?) {
+  // CHECK: global_addr @kCCPowerSupplyDC
+  // CHECK: global_addr @kCCPowerSupplyAC
+  // CHECK: global_addr @kCCPowerSupplyDefaultPower
+  return (CCPowerSupply.defaultPower, CCPowerSupply.AC, CCPowerSupply.DC)
+}

test/SILGen/import_as_member_cf.swift

@@ -1,8 +1,6 @@
 // RUN: %target-swift-frontend -emit-silgen -I %S/../IDE/Inputs/custom-modules %s 2>&1 | FileCheck --check-prefix=SIL %s
 // REQUIRES: objc_interop
 
-// XFAIL:
-
 import ImportAsMember.C
 
 // SIL-LABEL: sil {{.*}}readSemiModularPowerSupply{{.*}}