[ClangImporter] Skip value importing on partial/dependent C++ decls, adjust C++ lit tests

Author: kubamracek

lib/ClangImporter/ImportDecl.cpp

@@ -4593,10 +4593,23 @@ namespace {
 
       ValueDecl *result = nullptr;
 
+      bool initIsEvaluatable = false;
+      if (auto init = decl->getInit()) {
+        // Don't import values for partial specializations. TODO: Should we stop
+        // importing partially specialized variables completely?
+        bool partial = isa<clang::VarTemplatePartialSpecializationDecl>(decl);
+
+        // Don't import values when type-dependent or value-dependent.
+        bool typeDependent = decl->getType()->isDependentType();
+        bool valueDependent = init->isValueDependent();
+
+        initIsEvaluatable = !partial && !typeDependent && !valueDependent;
+      }
+
       // If the variable is const (we're importing it as a let), and has an
       // initializer, then ask Clang for its constant value and synthesize a
       // getter with that value.
-      if (introducer == VarDecl::Introducer::Let && decl->hasInit()) {
+      if (introducer == VarDecl::Introducer::Let && initIsEvaluatable) {
         auto val = decl->evaluateValue();
         // For now, only import integer and float constants. If in the future
         // SwiftDeclSynthesizer::createConstant becomes able to import more

test/ClangImporter/const_values_cxx.swift

@@ -33,6 +33,12 @@ class OtherClass {
   static constexpr int class_static_constexpr_int = 42;
 };
 
+template <int N, int M>
+inline const int template_gcd = template_gcd<M, N % M>;
+
+template <int N>
+inline const int template_gcd<N, 0> = N;
+
 
 //--- main.swift
 func foo() {
@@ -49,6 +55,9 @@ func foo() {
 
   print(MyClass().class_const_int)
   print(MyClass.class_static_const_int)
+
+  // TODO: This seems to be incorrectly imported, this test here is just to check that the compiler doesn't crash.
+  print(template_gcd)
 }
 
 // Only imported as external declarations:

test/Interop/Cxx/class/access/access-inversion-module-interface.swift

@@ -9,7 +9,7 @@
 // CHECK:     public init()
 // CHECK:     private init()
 // CHECK:     public func privateRecMethod()
-// CHECK:     public static let PRIVATE_REC_CONST: Bool
+// CHECK:     public static var PRIVATE_REC_CONST: Bool { get }
 // CHECK:   }
 
 // CHECK:   private struct PrivateEnum : Hashable, Equatable, RawRepresentable {
@@ -26,7 +26,7 @@
 // CHECK:     case privateEnumClassMember
 // CHECK:   }
 
-// CHECK:   private static let PRIVATE_CONST: Bool
+// CHECK:   private static var PRIVATE_CONST: Bool { get }
 
 // CHECK:   private static var privateAliasVal: Leaky.PrivateAlias
 // CHECK:   private static var privateRecVal: Leaky.PrivateRec

test/Interop/Cxx/namespace/templates-with-forward-decl-module-interface.swift

@@ -12,7 +12,7 @@
 // CHECK-NEXT:     init(fwd: NS1.ForwardDeclared<CInt>)
 // CHECK-NEXT:     typealias MyInt = Int32
 // CHECK-NEXT:     var fwd: NS1.ForwardDeclared<CInt>
-// CHECK-NEXT:     static let intValue: NS1.Decl<CInt>.MyInt
+// CHECK-NEXT:     static var intValue: NS1.Decl<CInt>.MyInt { get }
 // CHECK-NEXT:   }
 // CHECK-NEXT:   @available(*, unavailable, message: "Un-specialized class templates are not currently supported. Please use a specialization of this type.")
 // CHECK-NEXT:   struct Decl<T> {

test/Interop/Cxx/static/static-member-var-irgen.swift

@@ -45,8 +45,8 @@ public func readDefinedConstMember() -> CInt {
 }
 
 // CHECK: define {{(protected |dllexport )?}}swiftcc i32 @"$s4main22readDefinedConstMembers5Int32VyF"() #0
-// CHECK: [[VALUE:%.*]] = load i32, ptr @{{_ZN21WithConstStaticMember7definedE|"\?defined@WithConstStaticMember@@2HB"}}, align 4
-// CHECK: ret i32 [[VALUE]]
+// CHECK: ret i32 48
+
 public func readDefinedOutOfLineConstMember() -> CInt {
   return WithConstStaticMember.definedOutOfLine
 }

test/Interop/Cxx/static/static-member-var-silgen.swift

@@ -56,9 +56,10 @@ func readDefinedConstMember() -> CInt {
 }
 
 // CHECK: sil hidden @$s4main22readDefinedConstMembers5Int32VyF : $@convention(thin) () -> Int32
-// CHECK: [[ADDR:%.*]] = global_addr @{{_ZN21WithConstStaticMember7definedE|\?defined@WithConstStaticMember@@2HB}} : $*Int32
-// CHECK: [[VALUE:%.*]] = load [[ADDR]] : $*Int32
-// CHECK: return [[VALUE]] : $Int32
+// CHECK: [[VALUE:%.*]] = integer_literal $Builtin.Int32, 48
+// CHECK: [[STRUCT:%.*]] = struct $Int32 ([[VALUE]] : $Builtin.Int32)
+// CHECK: return [[STRUCT]] : $Int32
+
 func readDefinedOutOfLineConstMember() -> CInt {
   return WithConstStaticMember.definedOutOfLine
 }

test/Interop/Cxx/static/static-var-irgen.swift

@@ -10,7 +10,6 @@ public func initStaticVars() -> CInt {
 // CHECK: @{{_ZL9staticVar|staticVar}} = internal global i32 2, align 4
 // CHECK: @{{_ZL13staticVarInit|staticVarInit}} = internal global i32 0, align 4
 // CHECK: @{{_ZL19staticVarInlineInit|staticVarInlineInit}} = internal global i32 0, align 4
-// CHECK: @{{_ZL11staticConst|staticConst}} = internal constant i32 4, align 4
 // CHECK: @{{_ZL15staticConstInit|staticConstInit}} = internal global i32 0, align 4
 // CHECK: @{{_ZL21staticConstInlineInit|staticConstInlineInit}} = internal global i32 0, align 4
 // CHECK: @{{_ZL16staticNonTrivial|staticNonTrivial}} = internal global %class.NonTrivial zeroinitializer, align 4

test/Interop/Cxx/static/static-var-silgen.swift

@@ -13,8 +13,6 @@ func initStaticVars() -> CInt {
 // CHECK: sil_global public_external @staticVarInit : $Int32
 // CHECK: // clang name: staticVarInlineInit
 // CHECK: sil_global public_external @staticVarInlineInit : $Int32
-// CHECK: // clang name: staticConst
-// CHECK: sil_global public_external [let] @staticConst : $Int32
 // CHECK: // clang name: staticConstInit
 // CHECK: sil_global public_external [let] @staticConstInit : $Int32
 // CHECK: // clang name: staticConstInlineInit
@@ -24,6 +22,14 @@ func initStaticVars() -> CInt {
 // CHECK: // clang name: staticConstNonTrivial
 // CHECK: sil_global public_external [let] @staticConstNonTrivial : $NonTrivial
 
+// CHECK: // staticConst.getter
+// CHECK: sil shared [transparent] @$sSo11staticConsts5Int32Vvg : $@convention(thin) () -> Int32 {
+// CHECK: bb0:
+// CHECK:   %0 = integer_literal $Builtin.Int32, 4
+// CHECK:   %1 = struct $Int32 (%0 : $Builtin.Int32)
+// CHECK:   return %1 : $Int32
+// CHECK: }
+
 func readStaticVar() -> CInt {
   return staticVar
 }

test/Interop/Cxx/templates/explicit-class-specialization-module-interface.swift

@@ -5,5 +5,5 @@
 // CHECK: }
 
 // CHECK: struct HasEmptySpecializationAndStaticDateMember<CChar> {
-// CHECK:   static let value: Bool
+// CHECK:   static var value: Bool { get }
 // CHECK: }

test/SILOptimizer/access_marker_verify.swift

@@ -618,11 +618,15 @@ func testShims() -> UInt32 {
 }
 // CHECK-LABEL: sil hidden [ossa] @$s20access_marker_verify9testShimss6UInt32VyF : $@convention(thin) () -> UInt32 {
 // CHECK: bb0:
-// CHECK:   [[GA:%.*]] = global_addr @_SwiftKeyPathBufferHeader_SizeMask : $*UInt32
-// CHECK-NOT: begin_access
-// CHECK:   load [trivial] [[GA]] : $*UInt32
-// CHECK:   return
+// CHECK:   [[FR:%.*]] = function_ref @$sSo34_SwiftKeyPathBufferHeader_SizeMasks6UInt32Vvg : $@convention(thin) () -> UInt32
+// CHECK:   [[AP:%.*]] = apply [[FR]]() : $@convention(thin) () -> UInt32
+// CHECK:   return [[AP]]
 // CHECK-LABEL: } // end sil function '$s20access_marker_verify9testShimss6UInt32VyF'
+// CHECK: sil shared [transparent] [serialized] [ossa] @$sSo34_SwiftKeyPathBufferHeader_SizeMasks6UInt32Vvg : $@convention(thin) () -> UInt32 {
+// CHECK: bb0:
+// CHECK:   integer_literal $Builtin.IntLiteral, 16777215
+// CHECK: } // end sil function '$sSo34_SwiftKeyPathBufferHeader_SizeMasks6UInt32Vvg'
+
 
 // --- global variable initialization.
 var globalString1 = "⓪" // start non-empty