Merge pull request #8953 from devincoughlin/tsan-inout-robustify-test

swift-ci · web-flow · commit 463c6e48bb7e · 2017-04-23T13:30:22.000-07:00
diff --git a/test/Sanitizers/Inputs/tsan-uninstrumented.swift b/test/Sanitizers/Inputs/tsan-uninstrumented.swift
@@ -60,3 +60,5 @@ public var computedGlobalInUninstrumentedModule2: Int {
   get { return 0 }
   set { }
 }
+
+public func uninstrumentedBlackHole<T>(_ p: T) { }
diff --git a/test/Sanitizers/tsan-inout.swift b/test/Sanitizers/tsan-inout.swift
@@ -159,7 +159,7 @@ testRace(name: "InoutAccessToStoredGlobalInUninstrumentedModule",
 // the read from the global is IRGen'd to a memcpy().
 testRace(name: "ReadAndWriteToStoredGlobalInUninstrumentedModule",
         thread: { storedGlobalInUninstrumentedModule2 = 7 },
-        thread: { _ = storedGlobalInUninstrumentedModule2 } )
+        thread: { uninstrumentedBlackHole(storedGlobalInUninstrumentedModule2) } )
 // CHECK-INTERCEPTORS-ACCESSES-LABEL: Running ReadAndWriteToStoredGlobalInUninstrumentedModule
 // CHECK-INTERCEPTORS-ACCESSES: ThreadSanitizer: data race
 // CHECK-INTERCEPTORS-ACCESSES: Location is global

Original file line number	Diff line number	Diff line change
`@@ -60,3 +60,5 @@ public var computedGlobalInUninstrumentedModule2: Int {`
`60`	`60`	`get { return 0 }`
`61`	`61`	`set { }`
`62`	`62`	`}`
	`63`	`+`
	`64`	`+public func uninstrumentedBlackHole<T>(_ p: T) { }`