Address comments

Author: hlopko

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

@@ -1,4 +1,4 @@
-int counter = 0;
+int counter = 12;
 
 int getCounterFromCxx() {
   return counter;
@@ -9,7 +9,7 @@ void setCounterFromCxx(int c) {
 }
 
 namespace Namespaced {
-  int counter = 0;
+  int counter = 12;
 
   int getCounterFromCxx() {
     return counter;

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

@@ -1,51 +1,50 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-build-swift %s -I %S/Inputs -emit-ir -o %t/extern-var.ir -Xfrontend -enable-cxx-interop
-// RUN: %FileCheck < %t/extern-var.ir %s
+// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop -o %t/output.ir
+// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
 
 import ExternVar
 
-func getCounter() -> CInt {
+public func getCounter() -> CInt {
   return counter
 }
 
 // CHECK: @counter = external global i32, align 4
 
-// CHECK: define hidden swiftcc i32 @"$s4main10getCounters5Int32VyF"() #0
+// CHECK: define protected swiftcc i32 @"$s4main10getCounters5Int32VyF"() #0
 // CHECK: [[LOAD:%.*]] = load i32, i32* getelementptr inbounds (%Ts5Int32V, %Ts5Int32V* bitcast (i32* @counter to %Ts5Int32V*), i32 0, i32 0), align 4
 // CHECK: ret i32 [[LOAD]]
 
-func setCounter(_ c: CInt) {
+public func setCounter(_ c: CInt) {
   counter = c
 }
 
-// CHECK: define hidden swiftcc void @"$s4main10setCounteryys5Int32VF"(i32 %0) #0
+// CHECK: define protected 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
 
-func getNamespacedCounter() -> CInt {
+public func getNamespacedCounter() -> CInt {
   return Namespaced.counter
 }
 
-// CHECK: define hidden swiftcc i32 @"$s4main20getNamespacedCounters5Int32VyF"() #0
+// CHECK: define protected 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: ret i32 %1
 
-func setNamespacedCounter(_ c: CInt) {
+public func setNamespacedCounter(_ c: CInt) {
   Namespaced.counter = c
 }
 
-// CHECK: define hidden swiftcc void @"$s4main20setNamespacedCounteryys5Int32VF"(i32 %0) #0
+// CHECK: define protected 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
 
 func modifyInout(_ c: inout CInt) {
   c = 42
 }
 
-func passingVarAsInout() {
+public func passingVarAsInout() {
   modifyInout(&counter)
 }
 
-// CHECK: define hidden swiftcc void @"$s4main17passingVarAsInoutyyF"() #0
+// CHECK: define protected swiftcc void @"$s4main17passingVarAsInoutyyF"() #0
 // CHECK: call swiftcc void @"$s4main11modifyInoutyys5Int32VzF"(%Ts5Int32V* nocapture dereferenceable(4) bitcast (i32* @counter to %Ts5Int32V*))
 

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

@@ -1,6 +1,4 @@
-// RUN: %empty-directory(%t)
-// 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
+// RUN: %target-swift-emit-sil %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
 
 import ExternVar
 

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

@@ -11,11 +11,6 @@ import StdlibUnittest
 
 var ExternVarTestSuite = TestSuite("ExternVarTestSuite")
 
-ExternVarTestSuite.test("read") {
-  expectEqual(0, counter)
-  expectEqual(0, getCounterFromCxx())
-}
-
 ExternVarTestSuite.test("write-from-swift") {
   counter = 42
   expectEqual(42, counter)
@@ -28,12 +23,6 @@ ExternVarTestSuite.test("write-from-cxx") {
   expectEqual(84, getCounterFromCxx())
 }
 
-//FIXME mangle non-top-level var names to prevent name collisions
-// ExternVarTestSuite.test("namespaced-read") {
-//   expectEqual(0, Namespaced.counter)
-//   expectEqual(0, Namespaced.getCounterFromCxx())
-// }
-
 //FIXME mangle non-top-level var names to prevent name collisions
 // ExternVarTestSuite.test("namespaced-write-from-swift") {
 //   Namespaced.counter = 42