Add more tests

Author: hlopko

test/Interop/Cxx/extern-var/Inputs/extern-var.cc

@@ -1,13 +1,21 @@
 int counter = 0;
 
-int count() {
-  return ++counter;
+int getCounterFromCxx() {
+  return counter;
+}
+
+void setCounterFromCxx(int c) {
+  counter = c;
 }
 
 namespace Namespaced {
   int counter = 0;
 
-  int count() {
-    return ++counter;
+  int getCounterFromCxx() {
+    return counter;
+  }
+
+  void setCounterFromCxx(int c) {
+    counter = c;
   }
 }

test/Interop/Cxx/extern-var/Inputs/extern-var.h

@@ -1,9 +1,11 @@
 extern int counter;
 
-int count();
+int getCounterFromCxx();
+void setCounterFromCxx(int);
 
 namespace Namespaced {
   extern int counter;
 
-  int count();
+  int getCounterFromCxx();
+  void setCounterFromCxx(int);
 }

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

@@ -3,15 +3,34 @@
 // RUN: %FileCheck < %t/extern-var.ir %s
 
 // CHECK: @counter = external global i32, align 4
-//FIXME mangle non-top-level var names to prevent name collisions
-// and check @_ZN10Namespaced7counterE = external global i32, align 4
+
+// CHECK: define hidden swiftcc i32 @"$s4main10getCounters5Int32VyF"() #0
+// CHECK: load i32, i32* getelementptr inbounds (%Ts5Int32V, %Ts5Int32V* bitcast (i32* @counter to %Ts5Int32V*), i32 0, i32 0), align 4
+
+// CHECK: define hidden swiftcc void @"$s4main10setCounteryys5Int32VF"(i32 %0) #0
+// CHECK: store i32 %0, i32* getelementptr inbounds (%Ts5Int32V, %Ts5Int32V* bitcast (i32* @counter to %Ts5Int32V*), i32 0, i32 0), align 4
+
+// CHECK: define hidden swiftcc i32 @"$s4main20getNamespacedCounters5Int32VyF"() #0
+//FIXME mangle non-top-level var names to prevent name collisions and check:
+// load i32, i32* getelementptr inbounds (%Ts5Int32V, %Ts5Int32V* bitcast (i32* @Namespaced.counter to %Ts5Int32V*), i32 0, i32 0), align 4
+// CHECK: define hidden swiftcc void @"$s4main20setNamespacedCounteryys5Int32VF"(i32 %0) #0
+//FIXME mangle non-top-level var names to prevent name collisions and check:
+// store i32 %0, i32* getelementptr inbounds (%Ts5Int32V, %Ts5Int32V* bitcast (i32* @Namespaced.counter to %Ts5Int32V*), i32 0, i32 0), align 4
 
 import ExternVar
 
 func getCounter() -> CInt {
   return counter
 }
 
+func setCounter(_ c: CInt) {
+  counter = c
+}
+
 func getNamespacedCounter() -> CInt {
   return Namespaced.counter
 }
+
+func setNamespacedCounter(_ c: CInt) {
+  Namespaced.counter = c
+}

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

@@ -4,16 +4,40 @@
 // RUN: %target-build-swift %s -I %S/Inputs -emit-sil -o %t/extern-var.sil -Xfrontend -enable-cxx-interop
 // RUN: %FileCheck < %t/extern-var.sil %s
 
+// CHECK: sil_global @counter : $Int32
+
+// CHECK: sil hidden @$s4main10getCounters5Int32VyF : $@convention(thin) () -> Int32
 // CHECK: %0 = global_addr @counter : $*Int32
+// CHECK: begin_access [read] [dynamic] %0 : $*Int32
+
+// CHECK: sil hidden @$s4main10setCounteryys5Int32VF : $@convention(thin) (Int32) -> ()
+// CHECK: %1 = global_addr @counter : $*Int32
+// CHECK: %3 = begin_access [modify] [dynamic] %1 : $*Int32
+
+// sil hidden @$s4main20getNamespacedCounters5Int32VyF : $@convention(thin) () -> Int32
+//FIXME mangle non-top-level var names to prevent name collisions
+// %0 = global_addr @Namespaced.counter : $*Int32
+// CHECK: begin_access [read] [dynamic] %0 : $*Int32
+
+// CHECK: sil hidden @$s4main20setNamespacedCounteryys5Int32VF : $@convention(thin) (Int32) -> ()
 //FIXME mangle non-top-level var names to prevent name collisions
-// and check %0 = global_addr @_ZN10Namespaced7counterE : $*Int32
+// %1 = global_addr @Namespaced.counter : $*Int32
+// CHECK: %4 = begin_access [modify] [dynamic] %1 : $*Int32
 
 import ExternVar
 
 func getCounter() -> CInt {
   return counter
 }
 
+func setCounter(_ c: CInt) {
+  counter = c
+}
+
 func getNamespacedCounter() -> CInt {
   return Namespaced.counter
 }
+
+func setNamespacedCounter(_ c: CInt) {
+  Namespaced.counter = c
+}

test/Interop/Cxx/extern-var/extern-var.swift

@@ -13,27 +13,45 @@ import StdlibUnittest
 
 var StaticsTestSuite = TestSuite("extern-var")
 
-StaticsTestSuite.test("extern-var") {
+StaticsTestSuite.test("read") {
   expectEqual(counter, 0)
-  expectEqual(count(), 1)
-  expectEqual(counter, 1)
+  expectEqual(getCounterFromCxx(), 0)
+}
+
+StaticsTestSuite.test("write-from-swift") {
   counter = 42
   expectEqual(counter, 42)
-  expectEqual(count(), 43)
+  expectEqual(getCounterFromCxx(), 42)
+}
+
+StaticsTestSuite.test("write-from-cxx") {
+  setCounterFromCxx(84)
+  expectEqual(counter, 84)
+  expectEqual(getCounterFromCxx(), 84)
 }
 
 //FIXME mangle non-top-level var names to prevent name collisions
-// StaticsTestSuite.test("namespaced-extern-var") {
+// StaticsTestSuite.test("namespaced-read") {
 //   expectEqual(Namespaced.counter, 0)
-//   expectEqual(Namespaced.count(), 1)
-//   expectEqual(Namespaced.counter, 1)
+//   expectEqual(Namespaced.getCounterFromCxx(), 0)
+// }
+
+//FIXME mangle non-top-level var names to prevent name collisions
+// StaticsTestSuite.test("namespaced-write-from-swift") {
 //   Namespaced.counter = 42
 //   expectEqual(Namespaced.counter, 42)
-//   expectEqual(Namespaced.count(), 43)
+//   expectEqual(Namespaced.getCounterFromCxx(), 42)
+// }
+
+//FIXME mangle non-top-level var names to prevent name collisions
+// StaticsTestSuite.test("namespaced-write-from-cxx") {
+//   Namespaced.setCounterFromCxx(84)
+//   expectEqual(Namespaced.counter, 84)
+//   expectEqual(Namespaced.getCounterFromCxx(), 84)
 // }
 
 //FIXME mangle non-top-level var names to prevent name collisions
-// StaticsTestSuite.test("non-colliding-extern-vars") {
+// StaticsTestSuite.test("no-collisions") {
 //   counter = 12
 //   Namespaced.counter = 42
 //   expectEqual(counter, 12)