Correctly handle Field decls

Author: scentini

lib/IRGen/GenClangDecl.cpp

@@ -33,12 +33,19 @@ class ClangDeclFinder
   explicit ClangDeclFinder(Fn fn) : callback(fn) {}
 
   bool VisitDeclRefExpr(clang::DeclRefExpr *DRE) {
-    callback(DRE->getDecl());
+    if (isa<clang::FunctionDecl>(DRE->getDecl()) ||
+        isa<clang::VarDecl>(DRE->getDecl())) {
+      callback(DRE->getDecl());
+    }
     return true;
   }
 
   bool VisitMemberExpr(clang::MemberExpr *ME) {
-    callback(ME->getMemberDecl());
+    if (isa<clang::FunctionDecl>(ME->getMemberDecl()) ||
+        isa<clang::VarDecl>(ME->getMemberDecl()) || 
+        isa<clang::FieldDecl>(ME->getMemberDecl())) {
+      callback(ME->getMemberDecl());
+    }
     return true;
   }
 
@@ -64,6 +71,10 @@ clang::Decl *getDeclWithExecutableCode(clang::Decl *decl) {
     if (initializingDecl) {
       return initializingDecl;
     }
+  } else if (auto fd = dyn_cast<clang::FieldDecl>(decl)) {
+    if(fd->hasInClassInitializer()) {
+      return fd;
+    }
   }
   return nullptr;
 }
@@ -116,7 +127,7 @@ void IRGenModule::emitClangDecl(const clang::Decl *decl) {
     if (auto var = dyn_cast<clang::VarDecl>(next))
       if (!var->isFileVarDecl())
         continue;
-    if (auto fieldDecl = dyn_cast<clang::FieldDecl>(next)) {
+    if (isa<clang::FieldDecl>(next)) {
       continue;
     }
     ClangCodeGen->HandleTopLevelDecl(clang::DeclGroupRef(next));

test/Interop/Cxx/members/Inputs/field-init-calls-function.h

@@ -0,0 +1,12 @@
+#ifndef TEST_INTEROP_CXX_MEMBERS_INPUTS_FIELD_INIT_CALLS_FUNCTION_H
+#define TEST_INTEROP_CXX_MEMBERS_INPUTS_FIELD_INIT_CALLS_FUNCTION_H
+
+inline int increment(int t) { return t + 1; }
+
+struct Incrementor {
+  int incrementee = increment(41);
+};
+
+inline int initializeField() { return Incrementor().incrementee; }
+
+#endif // TEST_INTEROP_CXX_MEMBERS_INPUTS_FIELD_INIT_CALLS_FUNCTION_H

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

@@ -2,10 +2,18 @@ module ConstructorCallsFunction {
   header "constructor-calls-function.h"
 }
 
+module ConstructorCallsFunctionFromNestedStruct {
+  header "constructor-calls-function-from-nested-struct.h"
+}
+
 module ConstructorCallsMethod {
   header "constructor-calls-method.h"
 }
 
+module FieldInitCallsFunction {
+  header "field-init-calls-function.h"
+}
+
 module MethodCallsFunction {
   header "method-calls-function.h"
 }
@@ -18,6 +26,6 @@ module MethodCallsMethodFromNestedStruct {
   header "method-calls-method-from-nested-struct.h"
 }
 
-module ConstructorCallsFunctionFromNestedStruct {
-  header "constructor-calls-function-from-nested-struct.h"
+module StaticVarInitCallsFunction {
+  header "static-var-init-calls-function.h"
 }

test/Interop/Cxx/members/Inputs/static-var-init-calls-function.h

@@ -0,0 +1,16 @@
+#ifndef TEST_INTEROP_CXX_MEMBERS_INPUTS_STATIC_VAR_INIT_CALLS_FUNCTION_H
+#define TEST_INTEROP_CXX_MEMBERS_INPUTS_STATIC_VAR_INIT_CALLS_FUNCTION_H
+
+inline int increment(int t) { return t + 1; }
+
+struct Incrementor {
+  static int incrementee;
+};
+
+int Incrementor::incrementee = increment(41);
+
+inline int initializeStaticVar() {
+  return Incrementor::incrementee;
+}
+
+#endif // TEST_INTEROP_CXX_MEMBERS_INPUTS_STATIC_VAR_INIT_CALLS_FUNCTION_H

test/Interop/Cxx/members/emit-function-from-default-field-init-irgen.swift

@@ -0,0 +1,9 @@
+// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
+
+import FieldInitCallsFunction
+
+public func getInitializedField() -> CInt {
+  return initializeField()
+}
+
+// CHECK: define linkonce_odr{{( dso_local)?}} i32 @{{_Z9incrementi|"\?increment@@YAHH@Z"}}(i32 %t)

test/Interop/Cxx/members/emit-function-from-default-field-init.swift

@@ -0,0 +1,14 @@
+// RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-cxx-interop)
+//
+// REQUIRES: executable_test
+
+import FieldInitCallsFunction
+import StdlibUnittest
+
+var MembersTestSuite = TestSuite("MembersTestSuite")
+
+MembersTestSuite.test("emit-function-from-field-init") {
+  expectEqual(42, initializeField())
+}
+
+runAllTests()

test/Interop/Cxx/members/emit-function-from-static-var-init-irgen.swift

@@ -0,0 +1,11 @@
+// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop -validate-tbd-against-ir=none | %FileCheck %s
+
+// TODO: See why -validate-tbd-against-ir=none is needed here
+
+import StaticVarInitCallsFunction
+
+public func getInitializedStaticVar() -> CInt {
+  return initializeStaticVar()
+}
+
+// CHECK: define linkonce_odr{{( dso_local)?}} i32 @{{_Z9incrementi|"\?increment@@YAHH@Z"}}(i32 %t)

test/Interop/Cxx/members/emit-function-from-static-var-init.swift

@@ -0,0 +1,16 @@
+// RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-cxx-interop -Xfrontend -validate-tbd-against-ir=none)
+//
+// REQUIRES: executable_test
+
+// TODO: See why -validate-tbd-against-ir=none is needed here
+
+import StaticVarInitCallsFunction
+import StdlibUnittest
+
+var MembersTestSuite = TestSuite("MembersTestSuite")
+
+MembersTestSuite.test("emit-function-from-static-var-init") {
+  expectEqual(42, initializeStaticVar())
+}
+
+runAllTests()