Add more tests

Author: scentini

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

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

test/Interop/Cxx/members/Inputs/method-calls-method-from-nested-struct.h

@@ -0,0 +1,15 @@
+#ifndef TEST_INTEROP_CXX_MEMBERS_INPUTS_METHOD_CALLS_METHOD_FROM_NESTED_STRUCT_H
+#define TEST_INTEROP_CXX_MEMBERS_INPUTS_METHOD_CALLS_METHOD_FROM_NESTED_STRUCT_H
+
+struct IncrementUser {
+  struct Incrementor {
+    int increment(int t) { return t + 1; }
+  };
+  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_FROM_NESTED_STRUCT_H

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

@@ -2,7 +2,7 @@ module ConstructorCallsFunction {
   header "constructor-calls-function.h"
 }
 
-module ConstructorCalls {
+module ConstructorCallsMethod {
   header "constructor-calls-method.h"
 }
 
@@ -13,3 +13,7 @@ module MethodCallsFunction {
 module MethodCallsMethod {
   header "method-calls-method.h"
 }
+
+module MethodCallsMethodFromNestedStruct {
+  header "method-calls-method-from-nested-struct.h"
+}

test/Interop/Cxx/members/emit-code-for-nested-struct-irgen.swift

@@ -0,0 +1,9 @@
+// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
+
+import MethodCallsMethodFromNestedStruct
+
+public func getValueFromMethod() -> CInt {
+  return callMethod(41)
+}
+
+// CHECK: define linkonce_odr i32 @_ZN13IncrementUser11Incrementor9incrementEi(%"struct.IncrementUser::Incrementor"* %this, i32 %t)

test/Interop/Cxx/members/emit-code-for-nested-struct.swift

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

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

@@ -0,0 +1,9 @@
+// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
+
+import ConstructorCallsMethod
+
+public func getIncrementorValue() -> CInt {
+  return callConstructor(41)
+}
+
+// CHECK: define linkonce_odr i32 @_ZN11Incrementor9incrementEi(%struct.Incrementor* %this, i32 %t)

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

@@ -0,0 +1,9 @@
+// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
+
+import MethodCallsMethod
+
+public func getValueFromMethod() -> CInt {
+  return callMethod(41)
+}
+
+// CHECK: define linkonce_odr i32 @_ZN11Incrementor9incrementEi(%struct.Incrementor* %this, i32 %t)