Add more tests

Author: scentini

lib/IRGen/GenClangDecl.cpp

@@ -65,7 +65,6 @@ clang::Decl *getDeclWithExecutableCode(clang::Decl *decl) {
       return rd->getDefinition();
     }
   }
-
   return nullptr;
 }
 
@@ -98,6 +97,9 @@ void IRGenModule::emitClangDecl(const clang::Decl *decl) {
       if (DC->isFileContext())
         break;
       D = cast<const clang::Decl>(DC);
+      if (DC->isRecord()) {
+        break;
+      }
     }
     if (!GlobalClangDecls.insert(D->getCanonicalDecl()).second)
       return;

test/Interop/Cxx/members/Inputs/call-constructor copy.h

@@ -0,0 +1,13 @@
+#ifndef TEST_INTEROP_CXX_MEMBERS_INPUTS_CONSTRUCTOR_CALLS_FUNCTION_H
+#define TEST_INTEROP_CXX_MEMBERS_INPUTS_CONSTRUCTOR_CALLS_FUNCTION_H
+
+inline int increment(int t) { return t + 1; }
+
+struct Incrementor {
+  int incrementee;
+  Incrementor(int value) : incrementee(increment(value)) {}
+};
+
+inline int callConstructor(int value) { return Incrementor(value).incrementee; }
+
+#endif // TEST_INTEROP_CXX_MEMBERS_INPUTS_CONSTRUCTOR_CALLS_FUNCTION_H

test/Interop/Cxx/members/Inputs/call-constructor.h

@@ -0,0 +1,15 @@
+#ifndef TEST_INTEROP_CXX_MEMBERS_INPUTS_CONSTRUCTOR_CALLS_METHOD_H
+#define TEST_INTEROP_CXX_MEMBERS_INPUTS_CONSTRUCTOR_CALLS_METHOD_H
+
+struct Increment {
+  int increment(int t) { return t + 1; }
+};
+
+struct IncrementUser {
+  int incrementee;
+  IncrementUser(int value) { incrementee = Increment().increment(value); }
+};
+
+inline int callConstructor(int value) { return IncrementUser(value).incrementee; }
+
+#endif // TEST_INTEROP_CXX_MEMBERS_INPUTS_CONSTRUCTOR_CALLS_METHOD_H

test/Interop/Cxx/members/Inputs/call-method.h

@@ -0,0 +1,12 @@
+#ifndef TEST_INTEROP_CXX_MEMBERS_INPUTS_METHOD_CALLS_FUNCTION_H
+#define TEST_INTEROP_CXX_MEMBERS_INPUTS_METHOD_CALLS_FUNCTION_H
+
+inline int increment(int t) { return t + 1; }
+
+struct Incrementor {
+  int callIncrement(int value) { return increment(value); }
+};
+
+inline int callMethod(int value) { return Incrementor().callIncrement(value); }
+
+#endif // TEST_INTEROP_CXX_MEMBERS_INPUTS_METHOD_CALLS_FUNCTION_H

test/Interop/Cxx/members/Inputs/constructor-calls-function.h

@@ -0,0 +1,16 @@
+#ifndef TEST_INTEROP_CXX_MEMBERS_INPUTS_METHOD_CALLS_METHOD_H
+#define TEST_INTEROP_CXX_MEMBERS_INPUTS_METHOD_CALLS_METHOD_H
+
+struct Incrementor {
+  int increment(int t) { return t + 1; }
+};
+
+struct IncrementUser {
+  int callIncrement(int value) { return Incrementor().increment(value); }
+};
+
+inline int callMethod(int value) {
+  return IncrementUser().callIncrement(value);
+}
+
+#endif // TEST_INTEROP_CXX_MEMBERS_INPUTS_METHOD_CALLS_METHOD_H

test/Interop/Cxx/members/Inputs/constructor-calls-method.h

@@ -1,7 +1,15 @@
-module CallConstructor {
-  header "call-constructor.h"
+module ConstructorCallsFunction {
+  header "constructor-calls-function.h"
 }
 
-module  CallMethod {
-  header "call-method.h"
+module ConstructorCalls {
+  header "constructor-calls-method.h"
+}
+
+module MethodCallsFunction {
+  header "method-calls-function.h"
+}
+
+module MethodCallsMethod {
+  header "method-calls-method.h"
 }

test/Interop/Cxx/members/Inputs/method-calls-function.h

@@ -1,9 +1,9 @@
 // RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
 
-import CallConstructor
+import ConstructorCallsFunction
 
 public func getIncrementorValue() -> CInt {
-  return useIncrementor()
+  return callConstructor(41)
 }
 
 // CHECK: define linkonce_odr i32 @_Z9incrementi(i32 %t)

test/Interop/Cxx/members/Inputs/method-calls-method.h

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

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

@@ -1,9 +1,9 @@
 // RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
 
-import CallMethod
+import MethodCallsFunction
 
 public func getValueFromMethod() -> CInt {
-  return callMethod()
+  return callMethod(41)
 }
 
 // CHECK: define linkonce_odr i32 @_Z9incrementi(i32 %t)

test/Interop/Cxx/members/emit-from-called-constructor-irgen.swift renamed to test/Interop/Cxx/members/emit-function-from-called-constructor-irgen.swift

@@ -2,13 +2,13 @@
 //
 // REQUIRES: executable_test
 
-import CallConstructor
+import MethodCallsFunction
 import StdlibUnittest
 
 var MembersTestSuite = TestSuite("MembersTestSuite")
 
-MembersTestSuite.test("emit-from-called-constructor") {
-  expectEqual(42, useIncrementor())
+MembersTestSuite.test("emit-function-from-called-method") {
+  expectEqual(42, callMethod(41))
 }
 
 runAllTests()

test/Interop/Cxx/members/emit-function-from-called-constructor.swift

@@ -0,0 +1,14 @@
+// RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-cxx-interop)
+//
+// REQUIRES: executable_test
+
+import ConstructorCallsMethod
+import StdlibUnittest
+
+var MembersTestSuite = TestSuite("MembersTestSuite")
+
+MembersTestSuite.test("emit-method-from-called-constructor") {
+  expectEqual(42, callConstructor(41))
+}
+
+runAllTests()

test/Interop/Cxx/members/emit-from-called-method-irgen.swift renamed to test/Interop/Cxx/members/emit-function-from-called-method-irgen.swift

@@ -2,13 +2,13 @@
 //
 // REQUIRES: executable_test
 
-import CallMethod
+import MethodCallsMethod
 import StdlibUnittest
 
 var MembersTestSuite = TestSuite("MembersTestSuite")
 
-MembersTestSuite.test("emit-from-called-method") {
-  expectEqual(42, callMethod())
+MembersTestSuite.test("emit-method-from-called-method") {
+  expectEqual(42, callMethod(41))
 }
 
 runAllTests()