Productionalize

Author: scentini

lib/IRGen/GenClangDecl.cpp

@@ -61,8 +61,8 @@ clang::Decl *getDeclWithExecutableCode(clang::Decl *decl) {
       return initializingDecl;
     }
   } else if (auto rd = dyn_cast<clang::CXXRecordDecl>(decl)) {
-    if(rd->getBraceRange().isValid()) {
-      return rd;
+    if(rd->hasDefinition()) {
+      return rd->getDefinition();
     }
   }
 

test/Interop/Cxx/members/Inputs/emit-called-constructor.h renamed to test/Interop/Cxx/members/Inputs/call-constructor copy.h

@@ -1,5 +1,7 @@
-#ifndef TEST_INTEROP_CXX_MEMBERS_INPUTS_EMIT_CALLED_CONSTRUCTOR_H
-#define TEST_INTEROP_CXX_MEMBERS_INPUTS_EMIT_CALLED_CONSTRUCTOR_H
+#ifndef TEST_INTEROP_CXX_MEMBERS_INPUTS_CALL_CONSTRUCTOR_H
+#define TEST_INTEROP_CXX_MEMBERS_INPUTS_CALL_CONSTRUCTOR_H
+
+struct Incrementor;
 
 inline int increment(int t) {
   return t + 1;
@@ -14,4 +16,4 @@ inline int useIncrementor() {
   return Incrementor(41).incrementee;
 }
 
-#endif // TEST_INTEROP_CXX_MEMBERS_INPUTS_EMIT_CALLED_CONSTRUCTOR_H
+#endif // TEST_INTEROP_CXX_MEMBERS_INPUTS_CALL_CONSTRUCTOR_H

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

@@ -0,0 +1,18 @@
+#ifndef TEST_INTEROP_CXX_MEMBERS_INPUTS_CALL_CONSTRUCTOR_H
+#define TEST_INTEROP_CXX_MEMBERS_INPUTS_CALL_CONSTRUCTOR_H
+//struct Incrementor;
+
+inline int increment(int t) {
+  return t + 1;
+}
+
+struct Incrementor {
+  int incrementee;
+  Incrementor(int value) : incrementee(increment(value)) {}
+};
+
+inline int useIncrementor() {
+  return Incrementor(41).incrementee;
+}
+
+#endif // TEST_INTEROP_CXX_MEMBERS_INPUTS_CALL_CONSTRUCTOR_H

test/Interop/Cxx/members/Inputs/emit-called-method.h renamed to test/Interop/Cxx/members/Inputs/call-method.h

@@ -1,5 +1,5 @@
-#ifndef TEST_INTEROP_CXX_MEMBERS_INPUTS_EMIT_CALLED_METHOD_H
-#define TEST_INTEROP_CXX_MEMBERS_INPUTS_EMIT_CALLED_METHOD_H
+#ifndef TEST_INTEROP_CXX_MEMBERS_INPUTS_CALL_METHOD_H
+#define TEST_INTEROP_CXX_MEMBERS_INPUTS_CALL_METHOD_H
 
 inline int increment(int t) {
   return t + 1;
@@ -17,4 +17,4 @@ inline int callMethod() {
   return Incrementor(41).callIncrement();
 }
 
-#endif // TEST_INTEROP_CXX_MEMBERS_INPUTS_EMIT_CALLED_METHOD_H
+#endif // TEST_INTEROP_CXX_MEMBERS_INPUTS_CALL_METHOD_H

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

@@ -1,3 +1,7 @@
-module ConstructorsInvokingFunctions {
-  header "constructors-invoking-functions.h"
-}
+module CallConstructor {
+  header "call-constructor.h"
+}
+
+module  CallMethod {
+  header "call-method.h"
+}

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

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

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

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

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

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

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

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