[ClangImporter] Handle swift_wrapper annotated typedefs, skip CGFloats when importing const values

Author: kubamracek

lib/ClangImporter/ImportDecl.cpp

@@ -4620,13 +4620,21 @@ namespace {
               ImportDiagnosticAdder(Impl, decl, decl->getLocation()),
               isInSystemModule(dc), Bridgeability::None, ImportTypeAttrs());
 
-          auto convertKind = ConstantConvertKind::None;
-          if (decl->getType()->isEnumeralType())
-            convertKind = ConstantConvertKind::Construction;
-
-          result = synthesizer.createConstant(
-              name, dc, type, *val, convertKind, isStatic, decl,
-              importer::convertClangAccess(decl->getAccess()));
+          // FIXME: Handle CGFloat too.
+          if (!type->isCGFloat()) {
+            auto convertKind = ConstantConvertKind::None;
+            // Request conversions on enums, and swift_wrapper((enum/struct))
+            // types
+            if (decl->getType()->isEnumeralType())
+              convertKind = ConstantConvertKind::Construction;
+            else if (findSwiftNewtype(decl, Impl.getClangSema(),
+                                      Impl.CurrentVersion))
+              convertKind = ConstantConvertKind::Construction;
+
+            result = synthesizer.createConstant(
+                name, dc, type, *val, convertKind, isStatic, decl,
+                importer::convertClangAccess(decl->getAccess()));
+          }
         }
       }
 

test/ClangImporter/const_values.swift

@@ -40,6 +40,11 @@ struct MyStruct {
 __attribute__((swift_name("MyStruct.static_const_int_as_a_member")))
 static const int static_const_int_as_a_member = 42;
 
+typedef int ImportAsStruct __attribute__((swift_wrapper(struct)));
+static const ImportAsStruct ImportAsStructFoo = 123;
+typedef int ImportAsEnum __attribute__((swift_wrapper(enum)));
+static const ImportAsEnum ImportAsEnumFoo = 123;
+
 //--- main.swift
 func foo() {
   print(MACRO_INT)
@@ -64,6 +69,9 @@ func foo() {
   print(static_const_enum)
 
   print(MyStruct.static_const_int_as_a_member)
+
+  print(ImportAsStruct.foo)
+  print(ImportAsEnum.foo)
 }
 
 // Globals that don't get their value imported stay as public_external: