Create RuntimeUnittest library for C++ runtime unit tests from lit.

Create a new RuntimeUnittest library alongside the other stdlib unit
tests so we can write C++ runtime unit tests callable from lit.

Move runtime exclusivity tests into the stdlib unittest library and
create lit tests so we can verify that the runtime crashes with an
error message.

Author: atrick

stdlib/private/CMakeLists.txt

@@ -5,6 +5,7 @@ endif()
 if(SWIFT_BUILD_SDK_OVERLAY)
   # SwiftPrivatePthreadExtras makes use of Darwin/Glibc, which is part of the
   # SDK overlay. It can't be built separately from the SDK overlay.
+  add_subdirectory(RuntimeUnittest)
   add_subdirectory(StdlibUnittest)
   add_subdirectory(StdlibUnicodeUnittest)
   add_subdirectory(StdlibCollectionUnittest)

stdlib/private/RuntimeUnittest/CMakeLists.txt

@@ -0,0 +1,18 @@
+set(swift_stdlib_unittest_compile_flags)
+
+add_swift_library(swiftRuntimeUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
+  # This file should be listed the first.  Module name is inferred from the
+  # filename.
+  RuntimeUnittest.swift
+
+  ExclusivityTests.cpp
+
+  SWIFT_MODULE_DEPENDS StdlibUnittest
+  SWIFT_MODULE_DEPENDS_LINUX Glibc
+  SWIFT_MODULE_DEPENDS_FREEBSD Glibc
+  SWIFT_MODULE_DEPENDS_CYGWIN Glibc
+  SWIFT_MODULE_DEPENDS_HAIKU Glibc
+  SWIFT_COMPILE_FLAGS ${swift_stdlib_unittest_compile_flags}
+  TARGET_SDKS ALL_POSIX_PLATFORMS
+  INSTALL_IN_COMPONENT stdlib-experimental)
+

unittests/runtime/Exclusivity.cpp renamed to stdlib/private/RuntimeUnittest/ExclusivityTests.cpp

@@ -1,75 +1,59 @@
-//===--- Exclusivity.cpp --------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
 #include "swift/Runtime/Exclusivity.h"
 #include "swift/Runtime/Metadata.h"
-#include "gtest/gtest.h"
 
 using namespace swift;
 
-#ifndef NDEBUG
-TEST(TestExclusivity, testNullPC) {
+SWIFT_CC(swift) SWIFT_RUNTIME_LIBRARY_VISIBILITY extern "C"
+void testExclusivityNullPC() {
   ValueBuffer scratch, scratch2;
   long var;
   swift_beginAccess(&var, &scratch,
-                    ExclusivityFlags::WarningOnly | ExclusivityFlags::Read,
+                    ExclusivityFlags::Read | ExclusivityFlags::Tracking,
                     /*pc=*/0);
-  swift_beginAccess(&var, &scratch2,
-                    ExclusivityFlags::WarningOnly | ExclusivityFlags::Modify,
+  swift_beginAccess(&var, &scratch2, ExclusivityFlags::Modify,
                     /*pc=*/0);
   swift_endAccess(&scratch2);
   swift_endAccess(&scratch);
 }
-#endif
 
-#ifndef NDEBUG
-TEST(TestExclusivity, testPCOne) {
+SWIFT_CC(swift) SWIFT_RUNTIME_LIBRARY_VISIBILITY extern "C"
+void testExclusivityPCOne() {
   ValueBuffer scratch, scratch2;
   long var;
   swift_beginAccess(&var, &scratch,
-                    ExclusivityFlags::WarningOnly | ExclusivityFlags::Read,
+                    ExclusivityFlags::Read | ExclusivityFlags::Tracking,
                     /*pc=*/(void *)1);
-  swift_beginAccess(&var, &scratch2,
-                    ExclusivityFlags::WarningOnly | ExclusivityFlags::Modify,
+  swift_beginAccess(&var, &scratch2, ExclusivityFlags::Modify,
                     /*pc=*/(void *)1);
   swift_endAccess(&scratch2);
   swift_endAccess(&scratch);
 }
-#endif
 
-#ifndef NDEBUG
-TEST(TestExclusivity, testBogusPC) {
+SWIFT_CC(swift) SWIFT_RUNTIME_LIBRARY_VISIBILITY extern "C"
+void testExclusivityBogusPC() {
   ValueBuffer scratch, scratch2;
   long var;
   swift_beginAccess(&var, &scratch,
-                    ExclusivityFlags::WarningOnly | ExclusivityFlags::Read,
+                    ExclusivityFlags::Read | ExclusivityFlags::Tracking,
                     /*pc=*/(void *)0xdeadbeefdeadbeefULL);
-  swift_beginAccess(&var, &scratch2,
-                    ExclusivityFlags::WarningOnly | ExclusivityFlags::Modify,
+  swift_beginAccess(&var, &scratch2, ExclusivityFlags::Modify,
                     /*pc=*/(void *)0xdeadbeefdeadbeefULL);
   swift_endAccess(&scratch2);
   swift_endAccess(&scratch);
 }
-#endif
+
 
 // rdar://32866493
-TEST(TestExclusivity, testNonNested) {
+SWIFT_CC(swift) SWIFT_RUNTIME_LIBRARY_VISIBILITY extern "C"
+void testExclusivityNonNested() {
   const int N = 5;
   ValueBuffer scratches[N];
   long vars[N];
 
   auto begin = [&](unsigned i) {
     assert(i < N);
-    swift_beginAccess(&vars[i], &scratches[i], ExclusivityFlags::Modify, 0);
+    swift_beginAccess(&vars[i], &scratches[i],
+                      ExclusivityFlags::Modify | ExclusivityFlags::Tracking, 0);
   };
   auto end = [&](unsigned i) {
     assert(i < N);

stdlib/private/RuntimeUnittest/RuntimeUnittest.swift

@@ -0,0 +1,44 @@
+//===--- RuntimeUnittest.swift ---------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+// Make runtime unit tests available to the stdlib unit test harness.
+//
+//===----------------------------------------------------------------------===//
+
+// namespace
+public enum SwiftRuntimeUnitTest {
+  @_silgen_name("testExclusivityNullPC")
+  private static func _testExclusivityNullPC()
+
+  public static func testExclusivityNullPC() {
+    _testExclusivityNullPC()
+  }
+
+  @_silgen_name("testExclusivityPCOne")
+  private static func _testExclusivityPCOne()
+
+  public static func testExclusivityPCOne() {
+    _testExclusivityPCOne()
+  }
+
+  @_silgen_name("testExclusivityBogusPC")
+  private static func _testExclusivityBogusPC()
+
+  public static func testExclusivityBogusPC() {
+    _testExclusivityBogusPC()
+  }
+
+  @_silgen_name("testExclusivityNonNested")
+  private static func _testExclusivityNonNestedPC()
+
+  public static func testExclusivityNonNestedPC() {
+    _testExclusivityNonNestedPC()
+  }
+}

unittests/runtime/CMakeLists.txt

@@ -36,7 +36,6 @@ if(("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SDK}") AND
     Array.cpp
     CompatibilityOverride.cpp
     Concurrent.cpp
-    Exclusivity.cpp
     Metadata.cpp
     Mutex.cpp
     Enum.cpp

validation-test/Runtime/ExclusivityTest.swift

@@ -0,0 +1,31 @@
+// RUN: %target-run-simple-swift
+// REQUIRES: executable_test
+
+import StdlibUnittest
+import RuntimeUnittest
+
+var ExclusivityTestSuite = TestSuite("Exclusivity")
+
+ExclusivityTestSuite.test("testExclusivityNullPC") {
+  expectCrash(withMessage: "Simultaneous accesses") {
+      SwiftRuntimeUnitTest.testExclusivityNullPC()
+  }
+}
+
+ExclusivityTestSuite.test("testExclusivityPCOne") {
+  expectCrash(withMessage: "Simultaneous accesses") {
+    SwiftRuntimeUnitTest.testExclusivityPCOne()
+  }
+}
+
+ExclusivityTestSuite.test("testExclusivityBogusPC") {
+  expectCrash(withMessage: "Simultaneous accesses") {
+    SwiftRuntimeUnitTest.testExclusivityBogusPC()
+  }
+}
+
+ExclusivityTestSuite.test("testExclusivityNonNestedPC") {
+  SwiftRuntimeUnitTest.testExclusivityNonNestedPC()
+}
+
+runAllTests()