[ClangImporter] Add more test coverage in ClangImporter/const_values.swift + ClangImporter/const_values_cxx.swift

Author: kubamracek

test/ClangImporter/const_values.swift

@@ -20,6 +20,15 @@ static const long static_const_long = 42;
 static const float static_const_float = 42.0;
 static const double static_const_double = 42.0;
 
+static const char static_const_char_array[4] = {1, 2, 3, 4};
+static const char *static_const_pointer = 0;
+
+typedef enum MyEnum: char {
+  MyEnumCase0 = 0, MyEnumCase1, MyEnumCase2
+} MyEnum;
+static const MyEnum static_const_enum = MyEnumCase1;
+
+
 //--- main.swift
 func foo() {
   print(MACRO_INT)
@@ -33,10 +42,17 @@ func foo() {
   print(static_const_long)
   print(static_const_float)
   print(static_const_double)
+
+  print(static_const_char_array)
+  print(static_const_pointer)
+
+  print(static_const_enum)
 }
 
-// Only 'static' cannot get the getter imported, because it's not guaranteed to be constant.
+// Globals that don't get their value imported stay as public_external:
 // CHECK: sil_global public_external @static_int : $Int32
+// CHECK: sil_global public_external [let] @static_const_char_array : $(Int8, Int8, Int8, Int8)
+// CHECK: sil_global public_external @static_const_pointer : $Optional<UnsafePointer<Int8>>
 
 // CHECK:      sil shared [transparent] @$sSC9MACRO_INTs5Int32Vvg : $@convention(thin) () -> Int32 {
 // CHECK-NEXT: bb0:
@@ -93,3 +109,5 @@ func foo() {
 // CHECK-NEXT:   %1 = struct $Double (%0)
 // CHECK-NEXT:   return %1
 // CHECK-NEXT: }
+
+// TODO: Add static_const_enum

test/ClangImporter/const_values_cxx.swift

@@ -0,0 +1,94 @@
+// RUN: %empty-directory(%t/src)
+// RUN: split-file %s %t/src
+
+// RUN: %target-swiftxx-frontend %t/src/main.swift \
+// RUN:   -import-bridging-header %t/src/test.h \
+// RUN:   -module-name main -I %t -emit-sil | %FileCheck %s
+
+//--- test.h
+
+const int const_int = 42;
+namespace Namespace {
+  const int namespaced_const_int = 42;
+}
+
+static inline int foo() { return 42; }
+const int not_really_constant = foo();
+
+constexpr int constexpr_func() { return 42; }
+constexpr int constexpr_int = constexpr_func();
+static constexpr int static_constexpr_int = constexpr_func();
+
+class MyClass {
+public:
+  const int class_const_int = 42; // member field, don't expect to import as a global, no CHECKs for this
+  static const int class_static_const_int = 42;
+};
+
+namespace OtherNamespace {
+  constexpr int namespaced_constexpr_int = constexpr_func();
+  static constexpr int namespaced_static_constexpr_int = constexpr_func();
+}
+class OtherClass {
+  static constexpr int class_static_constexpr_int = 42;
+};
+
+
+//--- main.swift
+func foo() {
+  print(const_int)
+  print(Namespace.namespaced_const_int)
+  print(not_really_constant)
+  print(constexpr_int)
+  print(static_constexpr_int)
+
+  // TODO: Non-top-level constexpr variables currently are not imported at all (would be imported as static members)
+  //print(OtherNamespace.namespaced_constexpr_int)
+  //print(OtherNamespace.namespaced_static_constexpr_int)
+  //print(MyClass.class_static_constexpr_int)
+
+  print(MyClass().class_const_int)
+  print(MyClass.class_static_const_int)
+}
+
+// Only imported as external declarations:
+// CHECK: sil_global public_external [let] @not_really_constant : $Int32
+
+// CHECK:      sil shared [transparent] @$sSo9const_ints5Int32Vvg : $@convention(thin) () -> Int32 {
+// CHECK-NEXT: bb0:
+// CHECK-NEXT:   %0 = integer_literal $Builtin.Int32, 42
+// CHECK-NEXT:   %1 = struct $Int32 (%0)
+// CHECK-NEXT:   return %1
+// CHECK-NEXT: }
+
+// CHECK:      sil shared [transparent] @$sSo9NamespaceO20namespaced_const_ints5Int32VvgZ : $@convention(method) (@thin Namespace.Type) -> Int32 {
+// CHECK-NEXT: // %0 "self"
+// CHECK-NEXT: bb0(%0 : $@thin Namespace.Type):
+// CHECK-NEXT:   debug_value %0, let, name "self", argno 1
+// CHECK-NEXT:   %2 = integer_literal $Builtin.Int32, 42
+// CHECK-NEXT:   %3 = struct $Int32 (%2)
+// CHECK-NEXT:   return %3
+// CHECK-NEXT: }
+
+// CHECK:      sil shared [transparent] @$sSo13constexpr_ints5Int32Vvg : $@convention(thin) () -> Int32 {
+// CHECK-NEXT: bb0:
+// CHECK-NEXT:   %0 = integer_literal $Builtin.Int32, 42
+// CHECK-NEXT:   %1 = struct $Int32 (%0)
+// CHECK-NEXT:   return %1
+// CHECK-NEXT: }
+
+// CHECK:      sil shared [transparent] @$sSo20static_constexpr_ints5Int32Vvg : $@convention(thin) () -> Int32 {
+// CHECK-NEXT: bb0:
+// CHECK-NEXT:   %0 = integer_literal $Builtin.Int32, 42
+// CHECK-NEXT:   %1 = struct $Int32 (%0)
+// CHECK-NEXT:   return %1
+// CHECK-NEXT: }
+
+// CHECK:      sil shared [transparent] @$sSo7MyClassV22class_static_const_ints5Int32VvgZ : $@convention(method) (@thin MyClass.Type) -> Int32 {
+// CHECK-NEXT: // %0 "self"
+// CHECK-NEXT: bb0(%0 : $@thin MyClass.Type):
+// CHECK-NEXT:   debug_value %0, let, name "self", argno 1
+// CHECK-NEXT:   %2 = integer_literal $Builtin.Int32, 42
+// CHECK-NEXT:   %3 = struct $Int32 (%2)
+// CHECK-NEXT:   return %3
+// CHECK-NEXT: }